CX-games update

Update README with single cx . command to run games.
Moved files in games directories so single cx . command can run games.
Removed MakeFile from few games directories
Fixed code for gltext.printf() function
Fixed code for BrickBreaker game. Game runs, but there are issues with controls and visuals

Author: archerixx

2DFWork/draw/text.cx

@@ -99,5 +99,5 @@ func EntityAttachedText(x f32, y f32, offsetX f32, offsetY f32, s str) {
 // x & y are offsets 
 func printTextWithColor (s str, x f32, y f32, color i32, alpha f32) {
 	SetColorAndAlpha(color, alpha)
-	gltext.Printf("Roboto100", f32.i32(x), f32.i32(y), s)
+	gltext.Printf("Roboto100", x, y, s)
 }

2DFWork/menu/draw.cx

@@ -77,8 +77,8 @@ func texts () {
 
 		gltext.Printf(
 			Items[m][i].FontId, 
-			f32.i32(Items[m][i].Left), 
-			f32.i32(Items[m][i].Top), 
+			Items[m][i].Left, 
+			Items[m][i].Top, 
 			Items[m][i].Text)
 	}
 }

2DFWork/mesh/draw.cx

@@ -66,8 +66,8 @@ func DrawEditor () {
 		draw.SetColor(draw.COLOR_CYAN)
 		gltext.Printf(
 			"Roboto58",
-			space.ViewWidInPixels - w,
-			0,
+			i32.f32(space.ViewWidInPixels - w),
+			0.0,
 			name)
 	}
 }

CXtris/Makefile

@@ -116,15 +116,15 @@ func drawKeyCapTexts () {
 		// primary set 
 		gltext.Printf(
 			keySetPri[i].FontId, 
-			f32.i32(keySetPri[i].Left), 
-			f32.i32(keySetPri[i].Top),
+			keySetPri[i].Left, 
+			keySetPri[i].Top,
 			keySetPri[i].Text)
 
 		// secondary set 
 		gltext.Printf(
 			keySetSec[i].FontId, 
-			f32.i32(keySetSec[i].Left), 
-			f32.i32(keySetSec[i].Top - psSpan + keySetSec[i].Hei),
+			keySetSec[i].Left, 
+			keySetSec[i].Top - psSpan + keySetSec[i].Hei,
 			keySetSec[i].Text)
 	}
 }

CXtris/README-OLD.md

@@ -97,5 +97,5 @@ func scoreText () {
 	var sY f32 = i32.f32(93) //app.START_HEIGHT)
 	gl.LoadIdentity()
 	gl.Color3f(1.0, 1.0, 1.0)
-	gltext.Printf("Roboto28", f32.i32(sX), f32.i32(sY), shape.PlayerScoreTxt)
+	gltext.Printf("Roboto28", sX, sY, shape.PlayerScoreTxt)
 }

CXtris/README.md

@@ -56,8 +56,8 @@ func NewCraftingFrontScreen(screen_width i32, screen_height i32) (screen screen_
         button_pkg.newButton(
             "craft-button",
             0.0, -0.75, 240, 70,
-            "static/texture/btn/select-button-inactive.png",
-            "static/texture/btn/select-button-active.png"))
+            "./static/texture/btn/select-button-inactive.png",
+            "./static/texture/btn/select-button-active.png"))
 
     screen = screen.addLayer(crafting_layer)
 }

CXtris/draw/controls.cx

@@ -10,12 +10,17 @@ type TriangleGeometry struct {
 	material Material
 }
 
-func newTriangleGeometry(vertice1 Vector3f, vertice2 Vector3f, vertice3 Vector3f, material Material) (tg) {
-	tg = TriangleGeometry{
-		position:newVector3f(0.0, 0.0, 0.0),
-		vertices:[3]Vector3f{vertice1, vertice2, vertice3},
-		rotation:newVector3f(0.0, 0.0, 0.0),
-		material:material}
+func newTriangleGeometry(vertice1 Vector3f, vertice2 Vector3f, vertice3 Vector3f, material Material) (tg TriangleGeometry) {
+	var vec [3]Vector3f
+	vec[0] = vertice1
+	vec[1] = vertice2
+	vec[2] = vertice3
+	
+	tg.position = newVector3f(0.0, 0.0, 0.0)
+	tg.vertices = vec
+	tg.rotation = newVector3f(0.0, 0.0, 0.0)
+	tg.material = material
+
 	return tg
 }
 
@@ -28,7 +33,7 @@ func (tg TriangleGeometry) render () {
 
 
 	// TODO fix texture mapping
-	if pg.material.textured {
+	if tg.material.textured {
 		gl.BindTexture(gl.TEXTURE_2D, tg.material.texture)
 
 		gl.Begin(gl.QUADS);

CXtris/draw/text.cx

@@ -10,12 +10,17 @@ type TriangleGeometry struct {
 	material Material
 }
 
-func newTriangleGeometry(vertice1 Vector3f, vertice2 Vector3f, vertice3 Vector3f, material Material) (tg) {
-	tg = TriangleGeometry{
-		position:newVector3f(0.0, 0.0, 0.0),
-		vertices:[3]Vector3f{vertice1, vertice2, vertice3},
-		rotation:newVector3f(0.0, 0.0, 0.0),
-		material:material}
+func newTriangleGeometry(vertice1 Vector3f, vertice2 Vector3f, vertice3 Vector3f, material Material) (tg TriangleGeometry) {
+	var vec [3]Vector3f
+	vec[0] = vertice1
+	vec[1] = vertice2
+	vec[2] = vertice3
+	
+	tg.position = newVector3f(0.0, 0.0, 0.0)
+	tg.vertices = vec
+	tg.rotation = newVector3f(0.0, 0.0, 0.0)
+	tg.material = material
+
 	return tg
 }
 
@@ -28,7 +33,7 @@ func (tg TriangleGeometry) render () {
 
 
 	// TODO fix texture mapping
-	if pg.material.textured {
+	if tg.material.textured {
 		gl.BindTexture(gl.TEXTURE_2D, tg.material.texture)
 
 		gl.Begin(gl.QUADS);