From 2900576f9fc095a309ee0a341557e336e49135ec Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Mon, 21 Dec 2015 16:58:29 +0300
Subject: [PATCH] opengl example; 3d math

---
 examples/opengl/src/openglexample.d | 15 ++++--
 src/dlangui/graphics/glsupport.d    | 74 +++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/examples/opengl/src/openglexample.d b/examples/opengl/src/openglexample.d
index 5b25abb7..db1ee0ed 100644
--- a/examples/opengl/src/openglexample.d
+++ b/examples/opengl/src/openglexample.d
@@ -249,18 +249,25 @@ static if (ENABLE_OPENGL) {
 			checkgl!glDisable(GL_DEPTH_TEST);
 
 			import gl3n.linalg;
-			mat4 projectionMatrix = mat4.perspective(rc.width, rc.height, 45.0f, 0.5f, 100.0f);
-			mat4 viewMatrix = mat4.look_at(vec3(-4, 0, 0), vec3(0, 0, 0), vec3(0, 1, 0));//translation(0.0f, 0.0f, 4.0f).rotatez(angle);
+			glSupport.setPerspectiveProjection(windowRect, rc, 90.0f, 0.5f, 100.0f);
+			mat4 projectionMatrix = mat4.perspective(rc.width, rc.height, 90.0f, 0.5f, 100.0f);
+			mat4 viewMatrix = mat4.look_at(vec3(10, 10, 0), vec3(0, 0, 0), vec3(1, -1, 0));//translation(0.0f, 0.0f, 4.0f).rotatez(angle);
 			mat4 modelMatrix = mat4.identity;
 			mat4 m = projectionMatrix * viewMatrix * modelMatrix;
 
 			float[16] matrix;
 			for (int y = 0; y < 4; y++)
 				for (int x = 0; x < 4; x++)
-					matrix[x * 4 + y] = m[y][x];
-			//matrix[y * 4 + x] = m[y][x];
+					matrix[y * 4 + x] = m[x][y];
+					//matrix[x * 4 + y] = m[y][x];
 
+			Log.d("projectionViewModelMatrix qt: ", glSupport.projectionMatrix);
 			Log.d("projectionViewModelMatrix: ", matrix);
+			Log.d("(-1,-1,-1) * matrix: ", m * vec4(-1, -1, -1, 1));
+			Log.d("(1,1,1) * matrix: ", m * vec4(1, 1, 1, 1));
+			Log.d("(0,1,0) * matrix: ", m * vec4(0, 1, 0, 1));
+			Log.d("(1,0,0) * matrix: ", m * vec4(1, 0, 0, 1));
+			Log.d("(0,0,0) * matrix: ", m * vec4(0, 0, 0, 1));
 
 			_program.execute(vertices, colors, texcoords, _tx.texture, true, matrix);
 		}
diff --git a/src/dlangui/graphics/glsupport.d b/src/dlangui/graphics/glsupport.d
index 171bcb50..6ed86704 100644
--- a/src/dlangui/graphics/glsupport.d
+++ b/src/dlangui/graphics/glsupport.d
@@ -957,6 +957,80 @@ class GLSupport {
     }
 }
 
+struct vec3 {
+	float[3] vec;
+	alias vec this;
+	@property float x() { return vec[0]; }
+	@property float y() { return vec[1]; }
+	@property float z() { return vec[2]; }
+	@property void x(float v) { vec[0] = v; }
+	@property void y(float v) { vec[1] = v; }
+	@property void z(float v) { vec[2] = v; }
+	this(float[3] v) {
+		vec = v;
+	}
+	this(float x, float y, float z) {
+		vec[0] = x;
+		vec[1] = y;
+		vec[2] = z;
+	}
+}
+
+struct vec4 {
+	float[4] vec;
+	alias vec this;
+	@property float x() { return vec[0]; }
+	@property float y() { return vec[1]; }
+	@property float z() { return vec[2]; }
+	@property float w() { return vec[3]; }
+	@property void x(float v) { vec[0] = v; }
+	@property void y(float v) { vec[1] = v; }
+	@property void z(float v) { vec[2] = v; }
+	@property void w(float v) { vec[3] = v; }
+	this(float[4] v) {
+		vec = v;
+	}
+	this(float x, float y, float z, float w) {
+		vec[0] = x;
+		vec[1] = y;
+		vec[2] = z;
+		vec[3] = w;
+	}
+	this(vec3 v) {
+		vec[0] = v[0];
+		vec[1] = v[1];
+		vec[2] = v[2];
+		vec[3] = 1.0f;
+	}
+}
+
+struct mat4 {
+	float[16] m;
+	ref mat4 setIdentity() {
+		for (int x = 0; x < 4; x++) {
+			for (int y = 0; y < 4; y++) {
+				if (x == y)
+					m[y * 4 + x] = 1.0f;
+				else
+					m[y * 4 + x] = 0.0f;
+			}
+		}
+		return this;
+	}
+	ref mat4 setZero() {
+		foreach(ref f; m)
+			f = 0.0f;
+		return this;
+	}
+	static mat4 identity() {
+		mat4 res;
+		return res.setIdentity();
+	}
+	static mat4 zero() {
+		mat4 res;
+		return res.setZero();
+	}
+}
 
 enum GLObjectTypes { Buffer, VertexArray, Texture, Framebuffer };
 class GLObject(GLObjectTypes type, GLuint target = 0) {