Fixed issues with heirarchical transformations, camera and absolute directions

src/game.c

@@ -64,16 +64,16 @@ void game_init(void)
 	input_map_create("Turn_Up", turn_up_keys, 1);
 	input_map_create("Turn_Down", turn_down_keys, 1);
 
-	int shader = shader_create("unshaded.vert", "unshaded.frag");
+	shader_create("unshaded.vert", "unshaded.frag");
 	struct Entity* player = scene_add_new("player", "None");
 	player_node = player->node;
 	vec3 viewer_pos = {0, 0, 10};
 	struct Transform* viewer_tran = entity_component_get(player, C_TRANSFORM);
 	transform_set_position(viewer_tran, &viewer_pos);
-	struct Entity* player_pitch = scene_add_as_child("player_pitch", NULL, player);
+	/* struct Entity* player_pitch = scene_add_as_child("player_pitch", NULL, player); */
-	player_pitch_node = player_pitch->node;
+	/* player_pitch_node = player_pitch->node; */
-	entity_component_add(player_pitch, C_CAMERA, 800, 600);
+	/* entity_component_add(player_pitch, C_CAMERA, 800, 600); */
-	/* struct Camera* camera = entity_component_add(player, C_CAMERA, 800, 600); */
+	entity_component_add(player, C_CAMERA, 800, 600);
 	
 	struct Entity* new_ent = scene_add_new("Model_Entity", NULL);
 	struct Transform* tran = entity_component_get(new_ent, C_TRANSFORM);
@@ -81,8 +81,6 @@ void game_init(void)
 	transform_translate(tran, &position, TS_WORLD);
 	entity_component_add(new_ent, C_MODEL, "default.pamesh");
 	struct Transform* model_tran = entity_component_get(new_ent, C_TRANSFORM);
-	//vec3 axis = {0.f, 1.f, 0.f};
-	//transform_rotate(model_tran, axis, (45.f), TS_WORLD);
 	vec3 scale = {1, 1, 2};
 	transform_scale(model_tran, &scale);
 
@@ -101,31 +99,13 @@ void game_init(void)
 	transform_set_position(ground_tran, &pos);
 	transform_scale(ground_tran, &scale_ground);
 
-	mat4 m1, m2, r1, r2, f1, f2;
-	mat4_identity(&m1);
-	mat4_identity(&m2);
-	mat4_identity(&r1);
-	mat4_identity(&r2);
-	mat4_identity(&f1);
-	mat4_identity(&f2);
-
-	mat4_rot_x(&m1, TO_RADIANS(25.f));
-	mat4_rot_x(&m2, TO_RADIANS(25.f));
-	mat4_rot_x(&f1, TO_RADIANS(5.f));
-	mat4_rot_x(&f2, TO_RADIANS(5.f));
-
-	mat4_mul(&r1, &f1, &m1);
-	mat4_mul(&r2, &m1, &f1);
-	
 	run();
 }
 
 void debug(float dt)
 {
 	struct Entity* entity = entity_get(player_node);
-	struct Entity* entity_pitch = entity_get(player_pitch_node);
 	struct Transform* transform = entity_component_get(entity, C_TRANSFORM);
-	struct Transform* pitch_transform = entity_component_get(entity_pitch, C_TRANSFORM);
 	float move_speed = 5.f, turn_speed = 50.f;
 	vec3 offset = {0, 0, 0};
 	float turn_up_down = 0.f;
@@ -171,14 +151,8 @@ void debug(float dt)
 		turn_up_down = 0.f;
 	}
 	
-	struct Entity* ground = scene_find("Ground");
-	struct Transform* ground_tran = entity_component_get(ground, C_TRANSFORM);
-	//transform = ground_tran;
-	//transform_rotate(ground_tran, rot_axis_left_right, 50.f * dt, TS_WORLD);
-	
 	if(turn_left_right != 0.f)
 	{
-		//transform_rotate(transform, rot_axis_left_right, turn_left_right, TS_WORLD);
 		transform_rotate(transform, &rot_axis_left_right, -turn_left_right, TS_WORLD);
 		vec3 up = {0.f, 0.f, 0.f};
 		vec3 forward = {0.f, 0.f, 0.f};
@@ -186,21 +160,20 @@ void debug(float dt)
 		transform_get_up(transform, &up);
 		transform_get_forward(transform, &forward);
 		transform_get_lookat(transform, &lookat);
-		log_message("Up : %s", tostr_vec3(&up));
+		/* log_message("Up : %s", tostr_vec3(&up)); */
-		log_message("FR : %s", tostr_vec3(&forward));
+		/* log_message("FR : %s", tostr_vec3(&forward)); */
 	}
 	if(turn_up_down != 0.f)
 	{
-		//transform_rotate(transform, &rot_axis_up_down, turn_up_down, TS_LOCAL);
+		transform_rotate(transform, &rot_axis_up_down, turn_up_down, TS_LOCAL);
-		transform_rotate(pitch_transform, &rot_axis_up_down, turn_up_down, TS_LOCAL);
 		vec3 up = {0.f, 0.f, 0.f};
 		vec3 forward = {0.f, 0.f, 0.f};
 		vec3 lookat = {0.f, 0.f, 0.f};
 		transform_get_up(transform, &up);
 		transform_get_forward(transform, &forward);
 		transform_get_lookat(transform, &lookat);
-		log_message("Up : %s", tostr_vec3(&up));
+		/* log_message("Up : %s", tostr_vec3(&up)); */
-		log_message("FR : %s", tostr_vec3(&forward));
+		/* log_message("FR : %s", tostr_vec3(&forward)); */
 	}
 	
 	/* Movement */

src/transform.c

@@ -97,8 +97,10 @@ void transform_get_lookat(struct Transform* transform, vec3* res)
 
 void transform_get_absolute_forward(struct Transform* transform, vec3* res)
 {
-	vec3_fill(res, 0.f, 0.f, -1.f);
+	quat abs_rot;
-	vec3_transform_norm(res, res, &transform->trans_mat);
+	quat_identity(&abs_rot);
+	transform_get_absolute_rot(transform, &abs_rot);
+	quat_get_forward_rh(res, &abs_rot);
 }
 
 void transform_get_absolute_lookat(struct Transform* transform, vec3* res)
@@ -117,10 +119,21 @@ void transform_get_up(struct Transform* transform, vec3* res)
 
 void transform_get_absolute_up(struct Transform* transform, vec3* res)
 {
-	vec3_fill(res, 0.f, 1.f, 0.f);
+	quat abs_rot;
-	vec3_transform_norm(res, res, &transform->trans_mat);
+	quat_identity(&abs_rot);
+	transform_get_absolute_rot(transform, &abs_rot);
+	quat_get_up(res, &abs_rot);
+}
+
+void transform_get_absolute_right(struct Transform* transform, vec3* res)
+{
+	quat abs_rot;
+	quat_identity(&abs_rot);
+	transform_get_absolute_rot(transform, &abs_rot);
+	quat_get_right(res, &abs_rot);
 }
 
+
 void transform_get_right(struct Transform* transform, vec3* res)
 {
 	vec3_fill(res, 1.f, 0.f, 0.f);
@@ -194,3 +207,16 @@ void transform_get_absolute_pos(struct Transform* transform, vec3* res)
 	}
 	vec3_add(res, res, &transform->position);
 }
+
+void transform_get_absolute_rot(struct Transform* transform, quat* res)
+{
+	struct Entity* entity = entity_get(transform->node);
+	struct Entity* parent = entity_get(entity->parent);
+	if(parent)
+	{
+		struct Transform* parent_tran = entity_component_get(parent, C_TRANSFORM);
+		transform_get_absolute_rot(parent_tran, res);
+	}
+	quat_mul(res, res, &transform->rotation);
+}
+

src/transform.h

@@ -34,5 +34,7 @@ void transform_update_transmat(struct Transform* transform);
 void transform_get_absolute_pos(struct Transform* transform, vec3* res);
 void transform_get_absolute_lookat(struct Transform* transform, vec3* res);
 void transform_get_absolute_up(struct Transform* transform, vec3* res);
+void transform_get_absolute_rot(struct Transform* transform, quat* res);
+void transform_get_absolute_right(struct Transform* transform, vec3* res);
 
 #endif