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

#183 Scene3d: fix OBJ import

This commit is contained in:
Vadim Lopatin 2016-04-05 11:55:33 +03:00
parent ec25eb2104
commit 35ee4fbb99
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/d3d/src/d3d.d
View File

@ -121,8 +121,8 @@ class UiWidget : VerticalLayout, CellVisitor {
dirLightNode.translateX(2); dirLightNode.translateX(2);
dirLightNode.translateY(3); dirLightNode.translateY(3);
dirLightNode.translateZ(3); dirLightNode.translateZ(3);
dirLightNode.light = Light.createPoint(vec3(1, 0.5, 0.5), 15); //Light.createDirectional(vec3(1, 0.5, 0.5)); //dirLightNode.light = Light.createPoint(vec3(1, 0.5, 0.5), 15); //Light.createDirectional(vec3(1, 0.5, 0.5));
//dirLightNode.light = Light.createDirectional(vec3(11, 10.5, 10.5)); dirLightNode.light = Light.createDirectional(vec3(1, 0.5, 0.8));
dirLightNode.light.enabled = true; dirLightNode.light.enabled = true;
_scene.addChild(dirLightNode); _scene.addChild(dirLightNode);
@ -364,8 +364,8 @@ class UiWidget : VerticalLayout, CellVisitor {
//projectionViewModelMatrix.setIdentity(); //projectionViewModelMatrix.setIdentity();
//Log.d("matrix uniform: ", projectionViewModelMatrix.m); //Log.d("matrix uniform: ", projectionViewModelMatrix.m);
checkgl!glEnable(GL_CULL_FACE); //checkgl!glEnable(GL_CULL_FACE);
//checkgl!glDisable(GL_CULL_FACE); checkgl!glDisable(GL_CULL_FACE);
checkgl!glEnable(GL_DEPTH_TEST); checkgl!glEnable(GL_DEPTH_TEST);
checkgl!glCullFace(GL_BACK); checkgl!glCullFace(GL_BACK);

14
src/dlangui/graphics/scene/objimport.d
View File

@ -21,13 +21,19 @@ struct ObjModelImport {
protected float[] parseFloatList(Token[] tokens, int maxItems = 3, float padding = 0) { protected float[] parseFloatList(Token[] tokens, int maxItems = 3, float padding = 0) {
int i = 0; int i = 0;
int sgn = 1;
foreach(t; tokens) { foreach(t; tokens) {
if (i >= maxItems) if (i >= maxItems)
break; break;
if (t.type == TokenType.floating) if (t.type == TokenType.floating) {
_buf[i++] = cast(float)t.floatvalue; _buf[i++] = cast(float)(t.floatvalue * sgn);
else if (t.type == TokenType.integer) sgn = 1;
_buf[i++] = cast(float)t.intvalue; } else if (t.type == TokenType.integer) {
_buf[i++] = cast(float)(t.intvalue * sgn);
sgn = 1;
} else if (t.type == TokenType.minus) {
sgn = -1;
}
} }
while(i < maxItems) while(i < maxItems)
_buf[i++] = padding; _buf[i++] = padding;