Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add basic test texture

Browse Source
This commit is contained in:
erwin coumans
2014-01-17 22:19:12 -08:00
parent 1a507cca52
commit ec4292ad75
9 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
btgui/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -1563,8 +1563,8 @@ void GLInstancingRenderer::renderSceneInternal(int renderMode)
b3Assert(err==GL_NO_ERROR);
} else
{
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
glDisable(GL_CULL_FACE);
//glCullFace(GL_BACK);
}
static b3Vector3 lightPos = b3MakeVector3(-5.f,200,-40);//20,15,10);//-13,6,2);// = b3Vector3(0.5f,2,2);

35
btgui/OpenGLWindow/ShapeData.h
View File

@@ -161,6 +161,41 @@ static const float cube_vertices[] =
1.0f,1.0f, -1.0f, 1.0f, 0,1,0, 0,1,
};
///position xyz, unused w, normal, uv
static const float cube_vertices_textured[] =
{
-1.0f, -1.0f, 1.0f, 1.0f, 0,0,1, 0.75,0.25,//0//back
1.0f, -1.0f, 1.0f, 1.0f, 0,0,1, 1,0.25 ,//1
1.0f, 1.0f, 1.0f, 1.0f, 0,0,1, 1,0,//2
-1.0f, 1.0f, 1.0f, 1.0f, 0,0,1, 0.75,0,//3
-1.0f, -1.0f, -1.0f, 1.0f, 0,0,-1, 0.5,0.25,//4//front
1.0f, -1.0f, -1.0f, 1.0f, 0,0,-1, 0.25,0.25,//5
1.0f, 1.0f, -1.0f, 1.0f, 0,0,-1, 0.25,0,//6
-1.0f, 1.0f, -1.0f, 1.0f, 0,0,-1, 0.5,0,//7
-1.0f, -1.0f, -1.0f, 1.0f, -1,0,0, 0.5,0,//Right
-1.0f, 1.0f, -1.0f, 1.0f, -1,0,0, 0.75,0,
-1.0f, 1.0f, 1.0f, 1.0f, -1,0,0, 0.75,0.25,
-1.0f, -1.0f, 1.0f, 1.0f, -1,0,0, 0.5,0.25,
1.0f, -1.0f, -1.0f, 1.0f, 1,0,0, 0.25,0.5,//Left
1.0f, 1.0f, -1.0f, 1.0f, 1,0,0, 0.25,0.25,
1.0f, 1.0f, 1.0f, 1.0f, 1,0,0, 0.,.25,
1.0f, -1.0f, 1.0f, 1.0f, 1,0,0, 0,.5,
-1.0f, -1.0f, -1.0f, 1.0f, 0,-1,0, 0.25,0.5,//bottom
-1.0f, -1.0f, 1.0f, 1.0f, 0,-1,0, 0.25,0.25,
1.0f, -1.0f, 1.0f, 1.0f, 0,-1,0, 0.5,0.25,
1.0f,-1.0f, -1.0f, 1.0f, 0,-1,0, 0.5,0.5,
-1.0f, 1.0f, -1.0f, 1.0f, 0,1,0, 0,0,//top
-1.0f, 1.0f, 1.0f, 1.0f, 0,1,0, 0,0.25,
1.0f, 1.0f, 1.0f, 1.0f, 0,1,0, 0.25,0.25,
1.0f,1.0f, -1.0f, 1.0f, 0,1,0, 0.25,0,
};
///position xyz, unused w, normal, uv
static const float cube_vertices2[] =