Changeset 4e0b82b in opengl-game

Timestamp:

May 3, 2018, 2:45:49 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

54b6d6b

Parents:

9f4986b

Message:

Add an ImGui example project

Files:

• .gitignore (modified) (1 diff)
• NewOpenGLGame.vcxproj (modified) (1 diff)
• gl3w.c (added)
• gl3w.h (added)
• glcorearb.h (added)
• imgui.cpp (added)
• imgui.h (added)
• imgui_demo.cpp (added)
• imgui_draw.cpp (added)
• imgui_example.cpp (added)
• imgui_impl_glfw_gl3.cpp (added)
• imgui_impl_glfw_gl3.h (added)
• imgui_internal.h (added)
• new-game.cpp (modified) (4 diffs)
• stb_image_write.h (added)
• stb_rect_pack.h (added)
• stb_textedit.h (added)
• stb_truetype.h (added)

.gitignore

@@ -5 +5 @@
 
 gl.log
+
+imgui.ini
 
 # Visual Studio files

NewOpenGLGame.vcxproj

@@ -125 +125 @@
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="gl3w.c" />
+    <ClCompile Include="imgui.cpp" />
+    <ClCompile Include="imgui_demo.cpp" />
+    <ClCompile Include="imgui_draw.cpp" />
+    <ClCompile Include="imgui_impl_glfw_gl3.cpp" />
     <ClCompile Include="logger.cpp" />
     <ClCompile Include="new-game.cpp" />
+    <ClCompile Include="imgui_example.cpp" />
+    <ClCompile Include="stb_image_write.h" />
     <ClCompile Include="stb_image.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="gl3w.h" />
+    <ClInclude Include="glcorearb.h" />
+    <ClInclude Include="imgui_internal.h" />
+    <ClInclude Include="imgui_impl_glfw_gl3.h" />
+    <ClInclude Include="imgui.h" />
     <ClInclude Include="logger.h" />
     <ClInclude Include="stb_image.h" />
+    <ClInclude Include="stb_rect_pack.h" />
+    <ClInclude Include="stb_textedit.h" />
+    <ClInclude Include="stb_truetype.h" />
   </ItemGroup>
   <ItemGroup>

new-game.cpp

@@ -2 +2 @@
 
 #include "stb_image.h"
+
+// I think this was for the OpenGL 4 book font file tutorial
+//#define STB_IMAGE_WRITE_IMPLEMENTATION
+//#include "stb_image_write.h"
 
 #define _USE_MATH_DEFINES
@@ -105 +109 @@
          obj = &*it;
 
-         for (int p_idx = 0; p_idx < it->points.size(); p_idx += 9) {
+         for (unsigned int p_idx = 0; p_idx < it->points.size(); p_idx += 9) {
             if (faceClicked({
                vec3(it->points[p_idx], it->points[p_idx + 1], it->points[p_idx + 2]),
@@ -131 +135 @@
 }
 
-int main(int argc, char* argv[]) {
+int realmain(int argc, char* argv[]) {
    cout << "New OpenGL Game" << endl;
 
@@ -537 +541 @@
 
       // group scene objects by shader
-      for (int i=0; i < objects.size(); i++) {
+      for (unsigned int i=0; i < objects.size(); i++) {
          if (objects[i].shader_program == shader_program) {
             program1_objects.push_back(i);