*misc

1 files changed, 11 insertions, 5 deletions

diff --git a/src/example/03_texture.c b/src/example/03_texture.c
index deea341..fbd442a 100644
--- a/src/example/03_texture.c
+++ b/src/example/03_texture.c
@@ -21,7 +21,7 @@ static Vert verts[] = {
 	{7, {1, -1, -1}, {1, -1, -1}, zerovec3, {1, 1} , 0xffFAFF00},
 };
 
-extern Program ssr_built_in_shader_default;
+extern Program ssr_built_in_shader_pbr;
 
 static Vec3 light = {-1, -1, -1};
 
@@ -37,6 +37,9 @@ static Mesh* ground_mesh;
 static Texture* yingham_albedo;
 static Mesh* yingham_mesh;
 
+static Texture* gun_albedo;
+static Mesh* gun_mesh;
+
 void onloadtexture(void* data) {
 	ssr_matrixmode(MATRIX_PROJECTION);
 	ssr_loadidentity();
@@ -44,7 +47,7 @@ void onloadtexture(void* data) {
 	//ssr_ortho(-5, 5, -4, 4, 0.1, 10);
 
 	ssr_bindvertices(verts, 8, cube, 12);
-	ssr_useprogram(&ssr_built_in_shader_default);
+	ssr_useprogram(&ssr_built_in_shader_pbr);
 	ssr_enable(ENABLE_BACKFACECULL | ENABLE_DEPTHTEST | ENABLE_WRITEDEPTH | ENABLE_BLEND);
 
 	ssr_setwrapmode(WRAPMODE_CLAMP);
@@ -61,7 +64,6 @@ void onloadtexture(void* data) {
 	ground_mesh = mesh_loadfromobj("res/dieselpunk/ground.obj");
 	yingham_albedo = texture_loadfromfile("res/dieselpunk/yingham_basecolor.tga");
 	yingham_mesh = mesh_loadfromobj("res/dieselpunk/yingham.obj");
-
 }
 
 void oneventtexture(void* data) {
@@ -77,7 +79,8 @@ void onupdatetexture(void*data) {
 
 	ssr_matrixmode(MATRIX_VIEW);
 	ssr_loadidentity();
-	Vec3 p = { 800 * sin(_t), 500,800 * cos(_t) }, target = { 0, 0, 0 };
+	float distance = 700;
+	Vec3 p = { distance * sin(_t), 300, distance * cos(_t) }, target = { 0, 0, 0 };
 	//Vec3 p = { 0, 0, 700}, target = { 0, 0, 0 };
 	ssr_lookat(&p, &target, &vec3up);
 
@@ -98,7 +101,7 @@ void onupdatetexture(void*data) {
 }
 
 void ondrawtexture(void*data) {
-	ssr_clearcolor(0xff252525);
+	ssr_clearcolor(0xff202020);
 	ssr_cleardepth();
 
 	ssr_setuniformtex(0, mech_albedo);
@@ -112,8 +115,11 @@ void ondrawtexture(void*data) {
 	ssr_bindvertices(yingham_mesh->vertices, yingham_mesh->verts_count, yingham_mesh->triangles, yingham_mesh->tris_count);
 	ssr_draw(PRIMITIVE_TRIANGLE);
 
+	ssr_disable(ENABLE_BACKFACECULL);
+
 	ssr_setuniformtex(0, ground_albedo);
 	ssr_bindvertices(ground_mesh->vertices, ground_mesh->verts_count, ground_mesh->triangles, ground_mesh->tris_count);
 	ssr_draw(PRIMITIVE_TRIANGLE);
 
+	ssr_enable(ENABLE_BACKFACECULL);
 }