rodeo bump

5 files changed, 65 insertions, 55 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a81e2e..50ffc18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ target_compile_options(${PROJECT_NAME} PRIVATE
 -Wextra
 -Wpedantic
 #-Werror
+-Wconversion
 )
 endif()
 
diff --git a/assets/orc.png b/assets/orc.png
new file mode 100644
index 0000000..c253379
--- /dev/null
+++ b/assets/orc.png
diff --git a/external/RodeoEngine b/external/RodeoEngine
-Subproject 2577adf913e292a4a515e7dfc4023e37e8177f4
+Subproject 4670ac42a773ea97157f71d78687f79d6ba3c1d
diff --git a/src/compile_flags.txt b/src/compile_flags.txt
index 671824b..fcb033f 100644
--- a/src/compile_flags.txt
+++ b/src/compile_flags.txt
@@ -1,4 +1,9 @@
 -I./
 -I../external/RodeoEngine/include
+-I../external/RodeoEngine/src
 -I../external/RodeoEngine/external/bgfx/include
 -I../external/RodeoEngine/external/bx/include
+-Wall
+-Wextra
+-Wpedantic
+-Wconversion
diff --git a/src/main.c b/src/main.c
index fc7f6a0..2a5efe1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,59 +5,52 @@
 rodeo_string_t renderer;
 float time_var;
 
-const uint32_t texture_memory[] = {
-	0xff00ffff,
-	0xff00ffff,
-	0xff00ffff,
-	0xff00ffff,
-};
-
-const uint8_t textureData[10 * 10 * 4] = {
-    0, 0, 255, 255, 25, 25, 225, 255, 51, 51, 204, 255, 76, 76, 178, 255, 102, 102, 153, 255,
-    127, 127, 127, 255, 153, 153, 102, 255, 178, 178, 76, 255, 204, 204, 51, 255, 225, 225, 25, 255,
-    255, 255, 0, 255, 255, 230, 0, 255, 255, 204, 0, 255, 255, 178, 0, 255, 255, 153, 0, 255,
-    255, 127, 0, 255, 255, 102, 0, 255, 255, 76, 0, 255, 255, 51, 0, 255, 255, 25, 0, 255,
+const uint8_t texture_memory[] = {
+	0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0x00, 0xff,
+	0xff, 0xff, 0xff, 0x99,
 };
 
 rodeo_texture_2d_t texture;
 
-const rodeo_RGBAFloat_t red =
+const rodeo_color_RGBAFloat_t red =
 { 
 	.red = 1.0f, .green = 0.0f, .blue = 0.0f,
 	.alpha = 1.0f
 };
-const rodeo_RGBAFloat_t green =
+const rodeo_color_RGBAFloat_t green =
 { 
 	.red = 0.0f, .green = 1.0f, .blue = 0.0f,
 	.alpha = 1.0f
 };
-const rodeo_RGBAFloat_t blue =
+const rodeo_color_RGBAFloat_t blue =
 { 
 	.red = 0.0f, .green = 0.0f, .blue = 1.0f,
 	.alpha = 1.0f
 };
-const rodeo_RGBAFloat_t pink =
+const rodeo_color_RGBAFloat_t pink =
 { 
 	.red = 1.0f, .green = 0.0f, .blue = 1.0f,
 	.alpha = 1.0f
 };
 
-const rodeo_RGBAFloat_t red_clear =
+const rodeo_color_RGBAFloat_t red_clear =
 { 
 	.red = 1.0f, .green = 0.0f, .blue = 0.0f,
 	.alpha = 0.5f
 };
-const rodeo_RGBAFloat_t green_clear =
+const rodeo_color_RGBAFloat_t green_clear =
 { 
 	.red = 0.0f, .green = 1.0f, .blue = 0.0f,
 	.alpha = 0.5f
 };
-const rodeo_RGBAFloat_t blue_clear =
+const rodeo_color_RGBAFloat_t blue_clear =
 { 
 	.red = 0.0f, .green = 0.0f, .blue = 1.0f,
 	.alpha = 0.5f
 };
-const rodeo_RGBAFloat_t pink_clear =
+const rodeo_color_RGBAFloat_t pink_clear =
 { 
 	.red = 1.0f, .green = 0.0f, .blue = 1.0f,
 	.alpha = 0.5f
@@ -68,55 +61,60 @@ main_loop(void)
 {
 	if(rodeo_frame_count_get() % 10 == 0)
 	{
-		time_var = rodeo_frame_persecond_get();
+		time_var = rodeo_frame_perSecond_get();
 	}
 	mrodeo_frame_do()
 	{
 		rodeo_rectangle_draw(
-			(rodeo_rectangle_t){ 100, 100, 50, 50 },
-			red
+			&(rodeo_rectangle_t){ 100, 100, 50, 50 },
+			&red
 		);
 	   rodeo_rectangle_draw(  
-	   		(rodeo_rectangle_t){ 100, 160, 50, 50 },
-	   		green
+	   		&(rodeo_rectangle_t){ 100, 160, 50, 50 },
+	   		&green
 	   );
 	   rodeo_rectangle_draw(  
-	   		(rodeo_rectangle_t){ 160, 100, 50, 50 },
-	   		blue
+	   		&(rodeo_rectangle_t){ 160, 100, 50, 50 },
+	   		&blue
 	   );
 	   rodeo_rectangle_draw(  
-	   		(rodeo_rectangle_t){ 160, 160, 50, 50 },
-	   		pink
+	   		&(rodeo_rectangle_t){ 160, 160, 50, 50 },
+	   		&pink
 	   );
 
 	   rodeo_rectangle_draw(  
-	   		(rodeo_rectangle_t){ 300, 300, 50, 50 },
-	   		red_clear
+	   		&(rodeo_rectangle_t){ 300, 300, 50, 50 },
+	   		&red_clear
 	   );
 	   rodeo_rectangle_draw(  
-	   		(rodeo_rectangle_t){ 310, 310, 50, 50 },
-	   		green_clear
+	   		&(rodeo_rectangle_t){ 310, 310, 50, 50 },
+	   		&green_clear
 	   );
 	   rodeo_rectangle_draw(  
-	   		(rodeo_rectangle_t){ 320, 320, 50, 50 },
-	   		blue_clear
+	   		&(rodeo_rectangle_t){ 320, 320, 50, 50 },
+	   		&blue_clear
 	   );
 	   rodeo_rectangle_draw(  
-	   		(rodeo_rectangle_t){ 330, 330, 50, 50 },
-	   		pink_clear
+	   		&(rodeo_rectangle_t){ 330, 330, 50, 50 },
+	   		&pink_clear
 	   );
 
+	   float orc_size[] = {13.0f * 2.0f, 19.0f * 2.0f};
 	   rodeo_texture_2d_draw(
-			(rodeo_rectangle_t){
-				0, 0,
-				1, 1,
+			&(rodeo_rectangle_t){
+				.x = (float)rodeo_input_mouse_x_get() - (orc_size[0] / 2.0f),
+				.y = (float)rodeo_input_mouse_y_get() - (orc_size[1] / 2.0f) ,
+				.width = orc_size[0],
+				.height = orc_size[1],
 			},
-			(rodeo_rectangle_t){
-				rodeo_input_mouse_x_get() - 25,
-				rodeo_input_mouse_y_get() - 25,
-				50, 50,
+			&(rodeo_rectangle_t){
+				.x = 5,
+				.y = 5,
+				.width = 13,
+				.height = 19
 			},
-			(rodeo_RGBAFloat_t){ .array = {1.0,1.0,1.0,1.0} },
+			//&(rodeo_color_RGBAFloat_t){ .array = {1.0,1.0,1.0,1.0} },
+			NULL,
 			&texture
 		);
 
@@ -146,33 +144,39 @@ main_loop(void)
 }
 
 int
-main()
+main(void)
 {
 	rodeo_log(
-		rodeo_loglevel_info,
+		rodeo_logLevel_info,
 		"Testing logging... It seems to work!"
 	);
 	rodeo_log(
-		rodeo_loglevel_warning,
+		rodeo_logLevel_warning,
 		"Testing warning log level... It seems to work!"
 	);
 	rodeo_log(
-		rodeo_loglevel_error,
+		rodeo_logLevel_error,
 		"Testing error log level... It seems to work!"
 	);
 	mrodeo_window_do(480, 640, "Rodeo Window")
 	{
 		renderer = rodeo_renderer_name_get();
 		rodeo_frame_limit_set(60);
-		texture = rodeo_texture_2d_create_from_RGBA8(
-			10,
-			10,
-			textureData
-		);
-		rodeo_mainloop_run(
+
+		//texture = rodeo_texture_2d_create_from_RGBA8(
+		//	2,
+		//	2,
+		//	texture_memory
+		//);
+
+		texture = rodeo_texture_2d_create_from_path(rodeo_string_create("assets/orc.png"));
+
+		rodeo_mainLoop_run(
 			main_loop
 		);
 
+		rodeo_texture_2d_destroy(&texture);
+
 	}
 	return 0;
 }