Working so hard like a soldiermain

Can't afford a thing on TV

3 files changed, 61 insertions, 85 deletions

diff --git a/src/gunner/controller.c b/src/gunner/controller.c
index 4e56a27..1ac76ff 100644
--- a/src/gunner/controller.c
+++ b/src/gunner/controller.c
@@ -1,86 +1,14 @@
-// Keyboard things
-
-b32 is_key_pressed(i32 btn)
-{
-	return IsKeyPressed(btn);
-}
-
-b32 is_key_held(i32 btn)
-{
-	return IsKeyDown(btn);
-}
-
-b32 is_key_released(i32 btn)
-{
-	return IsKeyReleased(btn);
-}
-
-// Mouse things
-
-b32 is_mouse_pressed(i32 btn)
-{
-	return IsMouseButtonPressed(btn);
-}
-
-b32 is_mouse_held(i32 btn)
-{
-	return IsMouseButtonDown(btn);
-}
-
-b32 is_mouse_released(i32 btn)
-{
-	return IsMouseButtonReleased(btn);
-}
-
-void set_mouse_scale(f32 x, f32 y)
-{
-	SetMouseScale(x, y);
-}
-
-vec2 get_mouse_pos(void)
-{
-	Vector2 pos = GetMousePosition();
-	return (vec2){FP_TO_FIXED(pos.x), FP_TO_FIXED(pos.y)};
-}
-
-fx32 get_wheel_movement(void)
-{
-	return FP_TO_FIXED(GetMouseWheelMove());
-}
-
-// Gamepad things
-
-b32 is_button_pressed(i32 btn)
-{
-	return IsGamepadButtonPressed(0, btn);
-}
-
-b32 is_button_held(i32 btn)
-{
-	return IsGamepadButtonDown(0, btn);
-}
-
-b32 is_button_released(i32 btn)
-{
-	return IsGamepadButtonReleased(0, btn);
-}
-
-i32 last_button_press(void)
-{
-	return GetGamepadButtonPressed();
-}
-
 // Movement things
 
-vec2 get_dir_input(void)
+Vector2 get_dir_input(void)
 {
-	fx32 cont_x = FP_TO_FIXED(GetGamepadAxisMovement(0, 0));
-	fx32 cont_y = FP_TO_FIXED(GetGamepadAxisMovement(0, 1));
+	f32 cont_x = GetGamepadAxisMovement(0, 0);
+	f32 cont_y = GetGamepadAxisMovement(0, 1);
 	
-	fx32 key_w = IsKeyDown(KEY_W) ? FIXED_POINT_ONE : 0;
-	fx32 key_s = IsKeyDown(KEY_S) ? FIXED_POINT_ONE : 0;
-	fx32 key_a = IsKeyDown(KEY_A) ? FIXED_POINT_ONE : 0;
-	fx32 key_d = IsKeyDown(KEY_D) ? FIXED_POINT_ONE : 0;
+	f32 key_w = IsKeyDown(KEY_W) ? 1.f: 0.f;
+	f32 key_s = IsKeyDown(KEY_S) ? 1.f: 0.f;
+	f32 key_a = IsKeyDown(KEY_A) ? 1.f: 0.f;
+	f32 key_d = IsKeyDown(KEY_D) ? 1.f: 0.f;
 	
 	// Either Gamepad or Keyboard control, not both!
 	if(key_w != 0 || key_s != 0 || key_a != 0 || key_d != 0){
@@ -88,5 +16,5 @@ vec2 get_dir_input(void)
 		cont_y = key_s - key_w;
 	}
 	
-	return (vec2){cont_x, cont_y};
+	return (Vector2){cont_x, cont_y};
 }
diff --git a/src/gunner/text.c b/src/gunner/text.c
index 0812ff1..d7f1e23 100644
--- a/src/gunner/text.c
+++ b/src/gunner/text.c
@@ -94,10 +94,18 @@ i32 load_font(const char* path)
     return current_idx;
 }
 
-void draw_text_font(i32 idx, const char* text, vec2 pos, i32 size, Color col)
+void draw_text_font(i32 idx, const char* text, Vector2 pos, f32 size, Color col)
 {
-	Vector2 position = (Vector2){FROM_FIXED(pos.x), FROM_FIXED(pos.y)};
-	DrawTextEx(font_slots[idx], text, position, (f32)size, 1.0f, col);
+	DrawTextEx(font_slots[idx], text, pos, size, 0.5f, col);
+}
+
+void draw_text_font_centered(i32 idx, const char* text, f32 y_offset, f32 size, Color col)
+{
+	Vector2 vec = MeasureTextEx(font_slots[idx], text, size, 0.5f);
+	Vector2 final_pos = (Vector2){(320.0f - vec.x) / 2.f, y_offset};
+	
+	DrawTextEx(font_slots[idx], text, final_pos, size, 0.5f, col);
+	DrawLineV((Vector2){final_pos.x, y_offset + vec.y - 2.f}, (Vector2){final_pos.x + vec.x, y_offset + vec.y - 2.f}, col);
 }
 
 void unload_font(i32 idx)
diff --git a/src/main.c b/src/main.c
index 7c6ee95..87209f9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,5 @@
 #include <raylib.h>
+#include <rlgl.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -33,7 +34,28 @@ int main()
 	init_tex_sys();
 	init_shader_sys();
 	
-	i32 idx = load_font("assets/berry-rotunda.ttf");
+	i32 idx = load_font("assets/fonts/berry-rotunda.fnt");
+	
+	//load_music("assets/wicked_glee.ogg");
+	//set_music_loop_point(15.73f);
+	
+	//play_music();
+	
+	Model amanita = LoadModel("assets/models/amanita.m3d");
+	
+	
+	RenderTexture2D tex = LoadRenderTexture(320, 240);
+	
+	Camera camera = { 0 };
+    camera.position = (Vector3){ 0.5f, .5f, 1.5f }; // Camera position
+    camera.target = (Vector3){ 0.0f, .5f, 0.0f };     // Camera looking at point
+    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
+    camera.fovy = 45.0f;                                // Camera field-of-view Y
+    camera.projection = CAMERA_PERSPECTIVE;                   // Camera mode type
+	
+	Shader psx = LoadShader("assets/shaders/ps1vert.vs", "assets/shaders/ps1frag.fs");
+	
+	amanita.materials[1].shader = psx;
 	
 	while(!WindowShouldClose()){
 		float dt = GetFrameTime();
@@ -46,12 +68,30 @@ int main()
 		
 		ClearBackground(WHITE);
 		BeginDrawing();
+			BeginTextureMode(tex);
+				ClearBackground(WHITE);
+				
+				BeginMode3D(camera);
+					
+					rlDisableBackfaceCulling();
+					DrawModel(amanita, (Vector3){0.f, 0.f, 0.f}, 1.0f, WHITE);
+					rlEnableBackfaceCulling();
+				EndMode3D();
+				
+				draw_text_font_centered(idx, "Amanita", 4.f, 18, BLACK);
+			EndTextureMode();
 		
-			draw_text_font(idx, "Uneven Prankster Presents", (vec2){TO_FIXED(4), TO_FIXED(4)}, 16, BLACK);
+			DrawTexturePro(tex.texture, (Rectangle){0, 0, 320, -240}, (Rectangle){0, 0, 640, 480}, (Vector2){0, 0}, 0.f, WHITE);
 		
 		EndDrawing();
 	}
 	
+	UnloadRenderTexture(tex);
+	
+	UnloadShader(psx);
+	
+	UnloadModel(amanita);
+	
 	unload_all_fonts();
 	unload_active_audio();
 	unload_current_music();