forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get rid of gl3n dependency

This commit is contained in:
Vadim Lopatin 2015-12-22 12:25:33 +03:00
parent 01d04ad99f
commit f35bb6eda6
8 changed files with 182 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dub.json
View File

@ -47,8 +47,7 @@
"versions-windows": ["Unicode"], "versions-windows": ["Unicode"],
"dependencies": { "dependencies": {
"derelict-gl3": "~>1.0.16", "derelict-gl3": "~>1.0.16",
"derelict-ft": "~>1.0.2", "derelict-ft": "~>1.0.2"
"gl3n": "~>1.2.0"
}, },
"dependencies-posix": { "dependencies-posix": {
"derelict-sdl2": "~>1.9.7" "derelict-sdl2": "~>1.9.7"
@ -65,9 +64,6 @@
"versions": ["EmbedStandardResources", "ForceLogs"], "versions": ["EmbedStandardResources", "ForceLogs"],
"versions-posix": ["USE_SDL", "USE_FREETYPE", "USE_OPENGL"], "versions-posix": ["USE_SDL", "USE_FREETYPE", "USE_OPENGL"],
"versions-windows": ["Unicode"], "versions-windows": ["Unicode"],
"dependencies": {
"gl3n": "~>1.2.0",
},
"dependencies-posix": { "dependencies-posix": {
"derelict-gl3": "~>1.0.16", "derelict-gl3": "~>1.0.16",
"derelict-sdl2": "~>1.9.7", "derelict-sdl2": "~>1.9.7",
@ -81,8 +77,7 @@
"dependencies": { "dependencies": {
"derelict-gl3": "~>1.0.16", "derelict-gl3": "~>1.0.16",
"derelict-ft": "~>1.0.2", "derelict-ft": "~>1.0.2",
"derelict-sdl2": "~>1.9.7", "derelict-sdl2": "~>1.9.7"
"gl3n": "~>1.2.0"
}, },
"copyFiles-windows-x86_64": [ "copyFiles-windows-x86_64": [
"libs/windows/x86_64/libfreetype-6.dll", "libs/windows/x86_64/libfreetype-6.dll",
@ -100,7 +95,6 @@
"dependencies": { "dependencies": {
"derelict-gl3": "~>1.0.16", "derelict-gl3": "~>1.0.16",
"derelict-ft": "~>1.0.2", "derelict-ft": "~>1.0.2",
"gl3n": "~>1.2.0",
"x11": "~>1.0.9" "x11": "~>1.0.9"
} }
}, },
@ -111,7 +105,6 @@
"dependencies": { "dependencies": {
"derelict-gl3": "~>1.0.16", "derelict-gl3": "~>1.0.16",
"derelict-ft": "~>1.0.2", "derelict-ft": "~>1.0.2",
"gl3n": "~>1.2.0",
"dsfml": "~>2.1.0" "dsfml": "~>2.1.0"
}, },
"copyFiles-windows-x86_64": [ "copyFiles-windows-x86_64": [

9
examples/opengl/src/openglexample.d
View File

@ -251,11 +251,11 @@ static if (ENABLE_OPENGL) {
//import gl3n.linalg; //import gl3n.linalg;
glSupport.setPerspectiveProjection(windowRect, rc, 45.0f, 0.5f, 100.0f); glSupport.setPerspectiveProjection(windowRect, rc, 45.0f, 0.5f, 100.0f);
//mat4 projectionMatrix = glSupport.projectionMatrix; //mat4.perspective(rc.width, rc.height, 90.0f, 0.5f, 100.0f); //mat4 projectionMatrix = glSupport.projectionMatrix; //mat4.perspective(rc.width, rc.height, 90.0f, 0.5f, 100.0f);
mat4 projectionMatrix; mat4 projectionMatrix = glSupport.projectionMatrix;
float aspectRatio = cast(float)rc.width / cast(float)rc.height; float aspectRatio = cast(float)rc.width / cast(float)rc.height;
projectionMatrix.setPerspective(45.0f, aspectRatio, 0.5f, 100.0f); projectionMatrix.setPerspective(45.0f, aspectRatio, 0.5f, 100.0f);
mat4 viewMatrix = 1.0f; mat4 viewMatrix = 1.0f;
viewMatrix.lookAt(vec3(10, 10, 0), vec3(0, 0, 0), vec3(1, -1, 0));//translation(0.0f, 0.0f, 4.0f).rotatez(angle); viewMatrix.lookAt(vec3(-10, 0, 0), vec3(0, 0, 0), vec3(0, 1, 0));//translation(0.0f, 0.0f, 4.0f).rotatez(angle);
mat4 modelMatrix = mat4.identity; mat4 modelMatrix = mat4.identity;
mat4 m = projectionMatrix * viewMatrix * modelMatrix; mat4 m = projectionMatrix * viewMatrix * modelMatrix;
@ -267,13 +267,14 @@ static if (ENABLE_OPENGL) {
Log.d("projectionViewModelMatrix qt: ", glSupport.projectionMatrix); Log.d("projectionViewModelMatrix qt: ", glSupport.projectionMatrix);
Log.d("projectionViewModelMatrix: ", cast(float[16])m.m); Log.d("projectionViewModelMatrix: ", cast(float[16])m.m);
//Log.d("(-1,-1,-1) * matrix: ", m * vec4(-1, -1, -1, 1)); Log.d("(-1,-1,-1) * matrix: ", (m * vec3(-1, -1, -1)).vec);
Log.d("(1,1,1) * matrix: ", (m * vec3(1, 1, 1)).vec);
//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("(0,1,0) * matrix: ", m * vec4(0, 1, 0, 1));
//Log.d("(1,0,0) * matrix: ", m * vec4(1, 0, 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)); //Log.d("(0,0,0) * matrix: ", m * vec4(0, 0, 0, 1));
_program.execute(vertices, colors, texcoords, _tx.texture, true, m); _program.execute(vertices, colors, texcoords, _tx.texture, true, m.m);
} }
/// returns true is widget is being animated - need to call animate() and redraw /// returns true is widget is being animated - need to call animate() and redraw
@property override bool animating() { return true; } @property override bool animating() { return true; }

209
src/dlangui/core/math3d.d
View File

@ -12,7 +12,6 @@ struct vec3 {
float z; float z;
} }
} }
alias vec this;
//@property ref float x() { return vec[0]; } //@property ref float x() { return vec[0]; }
//@property ref float y() { return vec[1]; } //@property ref float y() { return vec[1]; }
//@property ref float z() { return vec[2]; } //@property ref float z() { return vec[2]; }
@ -22,7 +21,7 @@ struct vec3 {
this(float[3] v) { this(float[3] v) {
vec = v; vec = v;
} }
this(vec3 v) { this(const vec3 v) {
vec = v.vec; vec = v.vec;
} }
this(float x, float y, float z) { this(float x, float y, float z) {
@ -79,30 +78,30 @@ struct vec3 {
} }
/// add components of another vector to corresponding components of this vector /// add components of another vector to corresponding components of this vector
ref vec3 add(vec3 v) { ref vec3 add(vec3 v) {
vec[0] += v[0]; vec[0] += v.vec[0];
vec[1] += v[1]; vec[1] += v.vec[1];
vec[2] += v[2]; vec[2] += v.vec[2];
return this; return this;
} }
/// multiply components of this vector by corresponding components of another vector /// multiply components of this vector by corresponding components of another vector
ref vec3 mul(vec3 v) { ref vec3 mul(vec3 v) {
vec[0] *= v[0]; vec[0] *= v.vec[0];
vec[1] *= v[1]; vec[1] *= v.vec[1];
vec[2] *= v[2]; vec[2] *= v.vec[2];
return this; return this;
} }
/// subtract components of another vector from corresponding components of this vector /// subtract components of another vector from corresponding components of this vector
ref vec3 sub(vec3 v) { ref vec3 sub(vec3 v) {
vec[0] -= v[0]; vec[0] -= v.vec[0];
vec[1] -= v[1]; vec[1] -= v.vec[1];
vec[2] -= v[2]; vec[2] -= v.vec[2];
return this; return this;
} }
/// divide components of this vector by corresponding components of another vector /// divide components of this vector by corresponding components of another vector
ref vec3 div(vec3 v) { ref vec3 div(vec3 v) {
vec[0] /= v[0]; vec[0] /= v.vec[0];
vec[1] /= v[1]; vec[1] /= v.vec[1];
vec[2] /= v[2]; vec[2] /= v.vec[2];
return this; return this;
} }
@ -231,9 +230,9 @@ struct vec3 {
/// returns vector with all components which are negative of components for this vector /// returns vector with all components which are negative of components for this vector
vec3 opUnary(string op : "-")() const { vec3 opUnary(string op : "-")() const {
vec3 ret = this; vec3 ret = this;
ret[0] = vec[0]; ret.vec[0] = vec[0];
ret[1] = vec[1]; ret.vec[1] = vec[1];
ret[2] = vec[2]; ret.vec[2] = vec[2];
return ret; return ret;
} }
@ -268,16 +267,46 @@ struct vec3 {
v1.z * v2.x - v1.x * v2.z, v1.z * v2.x - v1.x * v2.z,
v1.x * v2.y - v1.y * v2.x); v1.x * v2.y - v1.y * v2.x);
} }
/// multiply vector by matrix
vec3 opBinary(string op : "*")(const ref mat4 matrix) const
{
float x, y, z, w;
x = x * matrix.m[0*4 + 0] +
y * matrix.m[0*4 + 1] +
z * matrix.m[0*4 + 2] +
matrix.m[0*4 + 3];
y = x * matrix.m[1*4 + 0] +
y * matrix.m[1*4 + 1] +
z * matrix.m[1*4 + 2] +
matrix.m[1*4 + 3];
z = x * matrix.m[2*4 + 0] +
y * matrix.m[2*4 + 1] +
z * matrix.m[2*4 + 2] +
matrix.m[2*4 + 3];
w = x * matrix.m[3*4 + 0] +
y * matrix.m[3*4 + 1] +
z * matrix.m[3*4 + 2] +
matrix.m[3*4 + 3];
if (w == 1.0f)
return vec3(x, y, z);
else
return vec3(x / w, y / w, z / w);
}
} }
/// 4 component vector /// 4 component vector
struct vec4 { struct vec4 {
float[4] vec; union {
alias vec this; float[4] vec;
@property ref float x() { return vec[0]; } struct {
@property ref float y() { return vec[1]; } float x;
@property ref float z() { return vec[2]; } float y;
@property ref float w() { return vec[3]; } float z;
float w;
}
}
alias r = x; alias r = x;
alias g = y; alias g = y;
alias b = z; alias b = z;
@ -295,9 +324,9 @@ struct vec4 {
vec[3] = w; vec[3] = w;
} }
this(vec3 v) { this(vec3 v) {
vec[0] = v[0]; vec[0] = v.vec[0];
vec[1] = v[1]; vec[1] = v.vec[1];
vec[2] = v[2]; vec[2] = v.vec[2];
vec[3] = 1.0f; vec[3] = 1.0f;
} }
ref vec4 opAssign(const float[4] v) { ref vec4 opAssign(const float[4] v) {
@ -316,9 +345,9 @@ struct vec4 {
return this; return this;
} }
ref vec4 opAssign(const vec3 v) { ref vec4 opAssign(const vec3 v) {
vec[0] = v[0]; vec[0] = v.vec[0];
vec[1] = v[1]; vec[1] = v.vec[1];
vec[2] = v[2]; vec[2] = v.vec[2];
vec[3] = 1.0f; vec[3] = 1.0f;
return this; return this;
} }
@ -363,34 +392,34 @@ struct vec4 {
} }
/// add components of another vector to corresponding components of this vector /// add components of another vector to corresponding components of this vector
ref vec4 add(const vec4 v) { ref vec4 add(const vec4 v) {
vec[0] += v[0]; vec[0] += v.vec[0];
vec[1] += v[1]; vec[1] += v.vec[1];
vec[2] += v[2]; vec[2] += v.vec[2];
vec[3] += v[3]; vec[3] += v.vec[3];
return this; return this;
} }
/// multiply components of this vector by corresponding components of another vector /// multiply components of this vector by corresponding components of another vector
ref vec4 mul(vec4 v) { ref vec4 mul(vec4 v) {
vec[0] *= v[0]; vec[0] *= v.vec[0];
vec[1] *= v[1]; vec[1] *= v.vec[1];
vec[2] *= v[2]; vec[2] *= v.vec[2];
vec[3] *= v[3]; vec[3] *= v.vec[3];
return this; return this;
} }
/// subtract components of another vector from corresponding components of this vector /// subtract components of another vector from corresponding components of this vector
ref vec4 sub(vec4 v) { ref vec4 sub(vec4 v) {
vec[0] -= v[0]; vec[0] -= v.vec[0];
vec[1] -= v[1]; vec[1] -= v.vec[1];
vec[2] -= v[2]; vec[2] -= v.vec[2];
vec[3] -= v[3]; vec[3] -= v.vec[3];
return this; return this;
} }
/// divide components of this vector by corresponding components of another vector /// divide components of this vector by corresponding components of another vector
ref vec4 div(vec4 v) { ref vec4 div(vec4 v) {
vec[0] /= v[0]; vec[0] /= v.vec[0];
vec[1] /= v[1]; vec[1] /= v.vec[1];
vec[2] /= v[2]; vec[2] /= v.vec[2];
vec[3] /= v[3]; vec[3] /= v.vec[3];
return this; return this;
} }
@ -573,7 +602,7 @@ struct vec4 {
struct mat4 { struct mat4 {
float[16] m; float[16] m;
alias m this; //alias m this;
this(float v) { this(float v) {
setDiagonal(v); setDiagonal(v);
@ -782,6 +811,57 @@ struct mat4 {
return m; return m;
} }
vec3 opBinary(string op : "*")(const vec3 vector) const
{
float x, y, z, w;
x = vector.x * m[0*4 + 0] +
vector.y * m[1*4 + 0] +
vector.z * m[2*4 + 0] +
m[3*4 + 0];
y = vector.x * m[0*4 + 1] +
vector.y * m[1*4 + 1] +
vector.z * m[2*4 + 1] +
m[3*4 + 1];
z = vector.x * m[0*4 + 2] +
vector.y * m[1*4 + 2] +
vector.z * m[2*4 + 2] +
m[3*4 + 2];
w = vector.x * m[0*4 + 3] +
vector.y * m[1*4 + 3] +
vector.z * m[2*4 + 3] +
m[3*4 + 3];
if (w == 1.0f)
return vec3(x, y, z);
else
return vec3(x / w, y / w, z / w);
}
vec4 opBinary(string op : "*")(const vec4 vector) const
{
// TODO
float x, y, z, w;
x = vector.x * m[0*4 + 0] +
vector.y * m[1*4 + 0] +
vector.z * m[2*4 + 0] +
m[3*4 + 0];
y = vector.x * m[0*4 + 1] +
vector.y * m[1*4 + 1] +
vector.z * m[2*4 + 1] +
m[3*4 + 1];
z = vector.x * m[0*4 + 2] +
vector.y * m[1*4 + 2] +
vector.z * m[2*4 + 2] +
m[3*4 + 2];
w = vector.x * m[0*4 + 3] +
vector.y * m[1*4 + 3] +
vector.z * m[2*4 + 3] +
m[3*4 + 3];
if (w == 1.0f)
return vec4(x, y, z, 1);
else
return vec4(x / w, y / w, z / w, 1);
}
/// 2d index by row, col /// 2d index by row, col
ref float opIndex(int y, int x) { ref float opIndex(int y, int x) {
return m[y*4 + x]; return m[y*4 + x];
@ -867,10 +947,40 @@ struct mat4 {
return this; return this;
} }
ref mat4 rotate(float angle, const vec3 axis) {
// TODO
return this;
}
ref mat4 rotateX(float angle) {
// TODO
return this;
}
ref mat4 rotateY(float angle) {
// TODO
return this;
}
ref mat4 rotateZ(float angle) {
// TODO
return this;
}
ref mat4 scale(float x, float y, float z) {
// TODO
return this;
}
static mat4 translation(float x, float y, float z) {
// TODO
mat4 res = 1;
return res;
}
} }
unittest { unittest {
vec3 a, b, c; vec3 a, b, c;
a.clear(5); a.clear(5);
@ -932,4 +1042,9 @@ unittest {
m /= 3; m /= 3;
m.translate(vec3(2, 3, 4)); m.translate(vec3(2, 3, 4));
m.setLookAt(vec3(5, 5, 5), vec3(0, 0, 0), vec3(-1, 1, 1)); m.setLookAt(vec3(5, 5, 5), vec3(0, 0, 0), vec3(-1, 1, 1));
vec3 vv1 = vec3(1,2,3);
auto p1 = m * vv1;
vec3 vv2 = vec3(3,4,5);
auto p2 = vv2 * m;
} }

8
src/dlangui/graphics/glsupport.d
View File

@ -279,7 +279,7 @@ class SolidFillProgram : GLProgram {
checkgl!glDisable(GL_CULL_FACE); checkgl!glDisable(GL_CULL_FACE);
checkgl!glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); checkgl!glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
bind(); bind();
checkgl!glUniformMatrix4fv(matrixLocation, 1, false, glSupport.projectionMatrix.ptr); checkgl!glUniformMatrix4fv(matrixLocation, 1, false, glSupport.projectionMatrix.m.ptr);
} }
void afterExecute() { void afterExecute() {
@ -844,7 +844,7 @@ class GLSupport {
//private float[16] matrix; //private float[16] matrix;
private mat4 _projectionMatrix; private mat4 _projectionMatrix;
@property float[16] projectionMatrix() { @property ref mat4 projectionMatrix() {
return _projectionMatrix; return _projectionMatrix;
} }
@ -860,7 +860,7 @@ class GLSupport {
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
//checkgl!glPushMatrix(); //checkgl!glPushMatrix();
//glLoadIdentity(); //glLoadIdentity();
glLoadMatrixf(_projectionMatrix.ptr); glLoadMatrixf(_projectionMatrix.m.ptr);
//glOrthof(0, _dx, 0, _dy, -1.0f, 1.0f); //glOrthof(0, _dx, 0, _dy, -1.0f, 1.0f);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
//checkgl!glPushMatrix(); //checkgl!glPushMatrix();
@ -880,7 +880,7 @@ class GLSupport {
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
//checkgl!glPushMatrix(); //checkgl!glPushMatrix();
//glLoadIdentity(); //glLoadIdentity();
glLoadMatrixf(_projectionMatrix.ptr); glLoadMatrixf(_projectionMatrix.m.ptr);
//glOrthof(0, _dx, 0, _dy, -1.0f, 1.0f); //glOrthof(0, _dx, 0, _dy, -1.0f, 1.0f);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
//checkgl!glPushMatrix(); //checkgl!glPushMatrix();

7
src/dlangui/graphics/scene/camera.d
View File

@ -2,8 +2,7 @@ module dlangui.graphics.scene.camera;
import dlangui.graphics.scene.node; import dlangui.graphics.scene.node;
import gl3n.linalg; import dlangui.core.math3d;
import gl3n.math;
/// Camera /// Camera
class Camera : Node3d { class Camera : Node3d {
@ -51,13 +50,13 @@ class Camera : Node3d {
/// set orthographic projection /// set orthographic projection
void setOrtho(float left, float right, float bottom, float top, float near, float far) { void setOrtho(float left, float right, float bottom, float top, float near, float far) {
_projectionMatrix = mat4.orthographic(left, right, bottom, top, near, far); _projectionMatrix.setOrtho(left, right, bottom, top, near, far);
_dirtyViewProjection = true; _dirtyViewProjection = true;
} }
/// set perspective projection /// set perspective projection
void setPerspective(float width, float height, float fov, float near, float far) { void setPerspective(float width, float height, float fov, float near, float far) {
_projectionMatrix = mat4.perspective(width, height, fov, near, far); _projectionMatrix.setPerspective(fov, width / height, near, far);
_dirtyViewProjection = true; _dirtyViewProjection = true;
} }

3
src/dlangui/graphics/scene/node.d
View File

@ -1,7 +1,6 @@
module dlangui.graphics.scene.node; module dlangui.graphics.scene.node;
import gl3n.linalg; import dlangui.core.math3d;
import gl3n.math;
import dlangui.graphics.scene.transform; import dlangui.graphics.scene.transform;
import dlangui.core.collections; import dlangui.core.collections;

3
src/dlangui/graphics/scene/scene3d.d
View File

@ -3,8 +3,7 @@ module dlangui.graphics.scene.scene3d;
import dlangui.graphics.scene.node; import dlangui.graphics.scene.node;
import dlangui.graphics.scene.camera; import dlangui.graphics.scene.camera;
import gl3n.linalg; import dlangui.core.math3d;
import gl3n.math;
/// 3D scene /// 3D scene
class Scene3d : Node3d { class Scene3d : Node3d {

9
src/dlangui/graphics/scene/transform.d
View File

@ -1,7 +1,6 @@
module dlangui.graphics.scene.transform; module dlangui.graphics.scene.transform;
import gl3n.linalg; import dlangui.core.math3d;
import gl3n.math;
/// 3d transform: scale + translation + rotation /// 3d transform: scale + translation + rotation
class Transform { class Transform {
@ -77,11 +76,11 @@ class Transform {
public void scaleZ(float value) { _scale.z *= value; _dirtyTransform = true; } public void scaleZ(float value) { _scale.z *= value; _dirtyTransform = true; }
/// rotate around X axis /// rotate around X axis
public void rotateX(float angle) { _rotation.rotatex(angle); _dirtyTransform = true; } public void rotateX(float angle) { _rotation.rotateX(angle); _dirtyTransform = true; }
/// rotate around Y axis /// rotate around Y axis
public void rotateY(float angle) { _rotation.rotatey(angle); _dirtyTransform = true; } public void rotateY(float angle) { _rotation.rotateY(angle); _dirtyTransform = true; }
/// rotate around Z axis /// rotate around Z axis
public void rotateZ(float angle) { _rotation.rotatez(angle); _dirtyTransform = true; } public void rotateZ(float angle) { _rotation.rotateZ(angle); _dirtyTransform = true; }
/// rotate around custom axis /// rotate around custom axis
public void rotate(float angle, const ref vec3 axis) { _rotation.rotate(angle, axis); _dirtyTransform = true; } public void rotate(float angle, const ref vec3 axis) { _rotation.rotate(angle, axis); _dirtyTransform = true; }