Browse Source

Cleanup casting

Jeffery Myers 9 months ago
parent
commit
3284a421b8
3 changed files with 25 additions and 24 deletions
  1. 3 3
      examples/editor.cpp
  2. 4 2
      examples/imgui_style_example.cpp
  3. 18 19
      rlImGui.cpp

+ 3 - 3
examples/editor.cpp

@@ -71,7 +71,7 @@ public:
 	void Show() override
 	{
 		ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-		ImGui::SetNextWindowSizeConstraints(ImVec2(ScaleToDPIF(400.0f), ScaleToDPIF(400.0f)), ImVec2((float)GetScreenWidth(), (float)GetScreenHeight()));
+		ImGui::SetNextWindowSizeConstraints(ImVec2(ScaleToDPIF(400.0f), ScaleToDPIF(400.0f)), ImVec2(float(GetScreenWidth()), float(GetScreenHeight())));
 
 		Focused = false;
 
@@ -125,7 +125,7 @@ public:
 				ImGui::EndChild();
 			}
 
-			rlImGuiImageRect(&ViewTexture.texture, (int)size.x, (int)size.y, viewRect);	
+			rlImGuiImageRect(&ViewTexture.texture, int(size.x), int(size.y), viewRect);	
 		}
 		ImGui::End();
 		ImGui::PopStyleVar();
@@ -283,7 +283,7 @@ public:
 		float period = 10;
 		float magnitude = 25;
 
-		Camera.position.x = (float)(sinf((float)GetTime() / period) * magnitude);
+		Camera.position.x = sinf(float(GetTime() / period)) * magnitude;
 
 		BeginTextureMode(ViewTexture);
 		ClearBackground(SKYBLUE);

+ 4 - 2
examples/imgui_style_example.cpp

@@ -11,6 +11,8 @@
 #include "imgui_impl_raylib.h"
 #include "raylib.h"
 
+#include <cstdint>
+
 // DPI scaling functions
 // Use these to scale any hardcoded values to the native display resolution
 float ScaleToDPIF(float value)
@@ -119,7 +121,7 @@ int main(int, char**)
             ImGui::Checkbox("Another Window", &show_another_window);
 
             ImGui::SliderFloat("float", &f, 0.0f, 1.0f);            // Edit 1 float using a slider from 0.0f to 1.0f
-            ImGui::ColorEdit3("clear color", (float*)&clear_color); // Edit 3 floats representing a color
+            ImGui::ColorEdit3("clear color", &clear_color.x); // Edit 3 floats representing a color
 
             if (ImGui::Button("Button"))                            // Buttons return true when clicked (most widgets return true when edited/activated)
                 counter++;
@@ -143,7 +145,7 @@ int main(int, char**)
         // Rendering
         ImGui::Render();
         BeginDrawing();
-        ClearBackground(Color{ (unsigned char)(clear_color.x * 255), (unsigned char)(clear_color.y * 255),(unsigned char)(clear_color.z * 255),(unsigned char)(clear_color.w * 255) });
+        ClearBackground(Color{ uint8_t(clear_color.x * 255), uint8_t(clear_color.y * 255), uint8_t(clear_color.z * 255), uint8_t(clear_color.w * 255) });
         ImGui_ImplRaylib_RenderDrawData(ImGui::GetDrawData());
         EndDrawing();
 

+ 18 - 19
rlImGui.cpp

@@ -72,7 +72,7 @@ struct ImGui_ImplRaylib_Data
 
 ImGui_ImplRaylib_Data* ImGui_ImplRaylib_GetBackendData()
 {
-    return ImGui::GetCurrentContext() ? (ImGui_ImplRaylib_Data*)ImGui::GetPlatformIO().Renderer_RenderState : nullptr;
+    return ImGui::GetCurrentContext() ? static_cast<ImGui_ImplRaylib_Data*>(ImGui::GetPlatformIO().Renderer_RenderState) : nullptr;
 }
 
 void ImGui_ImplRaylib_CreateBackendData()
@@ -113,7 +113,7 @@ void ReloadFonts(void)
     }
     platData->FontTexture = LoadTextureFromImage(image);
     UnloadImage(image);
-    io.Fonts->TexID = (ImTextureID)(platData->FontTexture.id);
+    io.Fonts->TexID = static_cast<ImTextureID>(platData->FontTexture.id);
 }
 
 static const char* GetClipTextCallback(ImGuiContext*)
@@ -200,9 +200,8 @@ static void ImGuiNewFrame(float deltaTime)
 
 static void ImGuiTriangleVert(ImDrawVert& idx_vert)
 {
-    Color* c;
-    c = (Color*)&idx_vert.col;
-    rlColor4ub(c->r, c->g, c->b, c->a);
+    Color c = GetColor(idx_vert.col);
+    rlColor4ub(c.r, c.g, c.b, c.a);
     rlTexCoord2f(idx_vert.uv.x, idx_vert.uv.y);
     rlVertex2f(idx_vert.pos.x, idx_vert.pos.y);
 }
@@ -540,7 +539,7 @@ void rlImGuiImage(const Texture* image)
     if (GlobalContext)
         ImGui::SetCurrentContext(GlobalContext);
     
-    ImGui::Image((ImTextureID)image->id, ImVec2(float(image->width), float(image->height)));
+    ImGui::Image(ImTextureID(image->id), ImVec2(float(image->width), float(image->height)));
 }
 
 bool rlImGuiImageButton(const char* name, const Texture* image)
@@ -551,7 +550,7 @@ bool rlImGuiImageButton(const char* name, const Texture* image)
     if (GlobalContext)
         ImGui::SetCurrentContext(GlobalContext);
     
-    return ImGui::ImageButton(name, (ImTextureID)image->id, ImVec2(float(image->width), float(image->height)));
+    return ImGui::ImageButton(name, ImTextureID(image->id), ImVec2(float(image->width), float(image->height)));
 }
 
 bool rlImGuiImageButtonSize(const char* name, const Texture* image, Vector2 size)
@@ -562,7 +561,7 @@ bool rlImGuiImageButtonSize(const char* name, const Texture* image, Vector2 size
     if (GlobalContext)
         ImGui::SetCurrentContext(GlobalContext);
    
-    return ImGui::ImageButton(name, (ImTextureID)image->id, ImVec2(size.x, size.y));
+    return ImGui::ImageButton(name, ImTextureID(image->id), ImVec2(size.x, size.y));
 }
 
 void rlImGuiImageSize(const Texture* image, int width, int height)
@@ -573,7 +572,7 @@ void rlImGuiImageSize(const Texture* image, int width, int height)
     if (GlobalContext)
         ImGui::SetCurrentContext(GlobalContext);
     
-    ImGui::Image((ImTextureID)image->id, ImVec2(float(width), float(height)));
+    ImGui::Image(ImTextureID(image->id), ImVec2(float(width), float(height)));
 }
 
 void rlImGuiImageSizeV(const Texture* image, Vector2 size)
@@ -584,7 +583,7 @@ void rlImGuiImageSizeV(const Texture* image, Vector2 size)
     if (GlobalContext)
         ImGui::SetCurrentContext(GlobalContext);
     
-    ImGui::Image((ImTextureID)image->id, ImVec2(size.x, size.y));
+    ImGui::Image(ImTextureID(image->id), ImVec2(size.x, size.y));
 }
 
 void rlImGuiImageRect(const Texture* image, int destWidth, int destHeight, Rectangle sourceRect)
@@ -600,24 +599,24 @@ void rlImGuiImageRect(const Texture* image, int destWidth, int destHeight, Recta
 
     if (sourceRect.width < 0)
     {
-        uv0.x = -((float)sourceRect.x / image->width);
-        uv1.x = (uv0.x - (float)(fabs(sourceRect.width) / image->width));
+        uv0.x = -sourceRect.x / image->width;
+        uv1.x = (uv0.x - float(fabs(sourceRect.width) / image->width));
     }
     else
     {
-        uv0.x = (float)sourceRect.x / image->width;
-        uv1.x = uv0.x + (float)(sourceRect.width / image->width);
+        uv0.x = sourceRect.x / image->width;
+        uv1.x = uv0.x + float(sourceRect.width / image->width);
     }
 
     if (sourceRect.height < 0)
     {
-        uv0.y = -((float)sourceRect.y / image->height);
-        uv1.y = (uv0.y - (float)(fabs(sourceRect.height) / image->height));
+        uv0.y = -sourceRect.y / image->height;
+        uv1.y = (uv0.y - fabsf(sourceRect.height) / image->height);
     }
     else
     {
-        uv0.y = (float)sourceRect.y / image->height;
-        uv1.y = uv0.y + (float)(sourceRect.height / image->height);
+        uv0.y = sourceRect.y / image->height;
+        uv1.y = uv0.y + sourceRect.height / image->height;
     }
 
     ImGui::Image((ImTextureID)image->id, ImVec2(float(destWidth), float(destHeight)), uv0, uv1);
@@ -804,7 +803,7 @@ bool ImGui_ImplRaylib_ProcessEvents(void)
 
     if (!io.WantSetMousePos)
     {
-        io.AddMousePosEvent((float)GetMouseX(), (float)GetMouseY());
+        io.AddMousePosEvent(float(GetMouseX()), float(GetMouseY()));
     }
 
     auto setMouseEvent = [&io](int rayMouse, int imGuiMouse)