*misc

1 files changed, 61 insertions, 20 deletions

diff --git a/src/example/03_texture.c b/src/example/03_texture.c
index d4e08a4..b172b5c 100644
--- a/src/example/03_texture.c
+++ b/src/example/03_texture.c
@@ -1,4 +1,5 @@
 #include "example.h"
+#include "../extend/mesh.h"
 
 static int cube[] = {
 	0, 1, 2, 0, 2, 3,
@@ -20,32 +21,45 @@ static Vert verts[] = {
 	{7, {1, -1, -1}, {1, -1, -1}, zerovec3, {1, 1} , 0xffFAFF00},
 };
 
-extern Program ssr_built_in_shader_unlit;
+extern Program ssr_built_in_shader_default;
 
 static Vec3 light = {-1, -1, -1};
 
-static Texture* texture;
+static Texture* mech_albedo;
+static Texture* mech_normal;
+static Texture* mech_roughness;
+static Texture* mech_metalness;
+static Mesh* mech_mesh;
+
+static Texture* ground_albedo;
+static Mesh* ground_mesh;
+
+static Texture* yingham_albedo;
+static Mesh* yingham_mesh;
 
 void onloadtexture(void* data) {
 	ssr_matrixmode(MATRIX_PROJECTION);
 	ssr_loadidentity();
-	ssr_perspective(90, ssr_getaspect(), 0.1f, 10);
+	ssr_perspective(90, ssr_getaspect(), 0.1f, 1000);
 	//ssr_ortho(-5, 5, -4, 4, 0.1, 10);
-	ssr_matrixmode(MATRIX_VIEW);
-	ssr_loadidentity();
-	Vec3 p = { 0, 0, 0 }, target = { 0, 0, -1 };
-	ssr_lookat(&p, &target, &vec3up);
 
 	ssr_bindvertices(verts, 8, cube, 12);
-	ssr_useprogram(&ssr_built_in_shader_unlit);
-	ssr_enable(ENABLEMASK_BACKFACECULL);
-	ssr_enable(ENABLEMASK_DEPTHTEST);
-
-	texture = texture_loadfromfile("res/helmet/screenshot2.png");
-	ssr_setuniformtex(0, texture);
+	ssr_useprogram(&ssr_built_in_shader_default);
+	ssr_enable(ENABLEMASK_BACKFACECULL | ENABLEMASK_DEPTHTEST | ENABLEMASK_WRITEDEPTH);
 
 	ssr_setwrapmode(WRAPMODE_CLAMP);
 	ssr_setfiltermode(FILTERMODE_POINT);
+
+	mech_albedo = texture_loadfromfile("res/dieselpunk/mech_basecolor.tga");
+	mech_normal = texture_loadfromfile("res/dieselpunk/mech_normal.tga");
+	mech_roughness = texture_loadfromfile("res/dieselpunk/mech_roughness.tga");
+	mech_metalness = texture_loadfromfile("res/dieselpunk/mech_metalness.tga");
+	mech_mesh = mesh_loadfromobj("res/dieselpunk/mech.obj");
+	ground_albedo = texture_loadfromfile("res/dieselpunk/ground_basecolor.tga");
+	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) {
@@ -57,20 +71,47 @@ static Quat q;
 
 void onupdatetexture(void*data) {
 	uint dt = *(uint*)data;
+	_t += dt / 1000.f;
+
+	ssr_matrixmode(MATRIX_VIEW);
+	ssr_loadidentity();
+	//	Vec3 p = { 700 * sin(_t), 0,700 * cos(_t) }, target = { 0, 0, 0 };
+	Vec3 p = { 0, 0, 800}, target = { 0, 0, 0 };
+	ssr_lookat(&p, &target, &vec3up);
+
 	ssr_matrixmode(MATRIX_MODEL);
 	ssr_loadidentity();
-	ssr_translate(0, 0, -3);
-	ssr_rotate(_t -= dt / 50.f, 1, 0.3, 1);
+	//ssr_translate(0, 0, -700);
+	ssr_rotate(_t * 10, 0, 1, 0);
+	
+	Vec3 light = {1, 0, 0};
+	ssr_setuniformvec3(0, &light);
 
-	Vec3 rot = { 1,1,0 }; vec3_normalize(&rot, &rot);
-	quat_fromaxisangle(&rot, 10, &q);
-	quat_applytovec3(&q, &light, &light);
-	ssr_setuniformvec3(0, &light); /*set light direction*/
+	Mat4 world2object;
+	ssr_getm(&world2object);
+	mat4_invertgeneral3d(&world2object, &world2object);
+	mat4_transpose(&world2object, &world2object); // transpose it
+
+	ssr_setuniformmat4(0, &world2object);
 }
 
 void ondrawtexture(void*data) {
-	ssr_clearcolor(0xff303030);
+	ssr_clearcolor(0xff252525);
 	ssr_cleardepth();
 
+	ssr_setuniformtex(0, mech_albedo);
+	ssr_setuniformtex(1, mech_normal);
+	ssr_setuniformtex(2, mech_roughness);
+	ssr_setuniformtex(3, mech_metalness);
+	ssr_bindvertices(mech_mesh->vertices, mech_mesh->verts_count, mech_mesh->triangles, mech_mesh->tris_count);
 	ssr_draw(PRIMITIVE_TRIANGLE);
+
+	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_setuniformtex(0, yingham_albedo);
+	ssr_bindvertices(yingham_mesh->vertices, yingham_mesh->verts_count, yingham_mesh->triangles, yingham_mesh->tris_count);
+	ssr_draw(PRIMITIVE_TRIANGLE);
+
 }