Various compilation warning and error fixes.

doc/tutorial/07_input.cpp

@@ -127,13 +127,13 @@ public:
         {
             if (m_controller->IsKeyPressed(KEY_DRAG_MESH))
             {
-                InputDevice::CaptureMouse(true);
+                input::get()->mouse_capture(true);
                 m_pitch_angle -= m_controller->GetAxisValue(AXIS_DRAG_PITCH) * seconds * 0.1f;
                 m_yaw_angle += m_controller->GetAxisValue(AXIS_DRAG_YAW) * seconds * 0.1f;
             }
             else
             {
-                InputDevice::CaptureMouse(false);
+                input::get()->mouse_capture(false);
                 if (m_autorot)
                     m_yaw_angle += seconds * 0.2f;
             }

src/easymesh/easymeshrender.cpp

@@ -79,8 +79,8 @@ GpuShaderData::GpuShaderData()
 
 //-----------------------------------------------------------------------------
 GpuShaderData::GpuShaderData(uint16_t vert_decl_flags, std::shared_ptr<Shader> shader, DebugRenderMode render_mode)
-  : m_render_mode(render_mode),
-    m_shader(shader),
+  : m_shader(shader),
+    m_render_mode(render_mode),
     m_vert_decl_flags(vert_decl_flags)
 {
 }

src/easymesh/easymeshrender.h

@@ -91,9 +91,9 @@ public:
     //--
 
 protected:
-    uint16_t m_vert_decl_flags;
     std::shared_ptr<Shader> m_shader;
     int m_render_mode;
+    uint16_t m_vert_decl_flags;
     array<std::string, ShaderUniform> m_shader_uniform;
     array<ShaderAttrib> m_shader_attrib;
 };

src/ui/gui.cpp

@@ -276,9 +276,9 @@ void gui::tick_draw(float seconds, Scene &scene)
     scene.AddPrimitiveRenderer(this, std::make_shared<primitive>());
 }
 
-void gui::primitive::Render(Scene& scene, std::shared_ptr<PrimitiveSource> primitive)
+void gui::primitive::Render(Scene& scene, std::shared_ptr<PrimitiveSource> prim)
 {
-    UNUSED(scene, primitive);
+    UNUSED(scene, prim);
 
     ImGui::Render();
     ImGui::EndFrame();

src/ui/input.h

@@ -59,7 +59,6 @@ private:
 const std::string g_name_mouse("Mouse");
 const std::string g_name_keyboard("Keyboard");
 
-static std::string g_name_joystick() { return "Joystick"; }
 static std::string g_name_joystick(const uint64_t num)
 {
     return format("Joystick%d", (int)num);