Changeset 4e0b82b in opengl-game
- Timestamp:
- May 3, 2018, 2:45:49 AM (6 years ago)
- Branches:
- feature/imgui-sdl, master, points-test
- Children:
- 54b6d6b
- Parents:
- 9f4986b
- Files:
-
- 15 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
r9f4986b r4e0b82b 5 5 6 6 gl.log 7 8 imgui.ini 7 9 8 10 # Visual Studio files -
NewOpenGLGame.vcxproj
r9f4986b r4e0b82b 125 125 </ItemDefinitionGroup> 126 126 <ItemGroup> 127 <ClCompile Include="gl3w.c" /> 128 <ClCompile Include="imgui.cpp" /> 129 <ClCompile Include="imgui_demo.cpp" /> 130 <ClCompile Include="imgui_draw.cpp" /> 131 <ClCompile Include="imgui_impl_glfw_gl3.cpp" /> 127 132 <ClCompile Include="logger.cpp" /> 128 133 <ClCompile Include="new-game.cpp" /> 134 <ClCompile Include="imgui_example.cpp" /> 135 <ClCompile Include="stb_image_write.h" /> 129 136 <ClCompile Include="stb_image.cpp" /> 130 137 </ItemGroup> 131 138 <ItemGroup> 139 <ClInclude Include="gl3w.h" /> 140 <ClInclude Include="glcorearb.h" /> 141 <ClInclude Include="imgui_internal.h" /> 142 <ClInclude Include="imgui_impl_glfw_gl3.h" /> 143 <ClInclude Include="imgui.h" /> 132 144 <ClInclude Include="logger.h" /> 133 145 <ClInclude Include="stb_image.h" /> 146 <ClInclude Include="stb_rect_pack.h" /> 147 <ClInclude Include="stb_textedit.h" /> 148 <ClInclude Include="stb_truetype.h" /> 134 149 </ItemGroup> 135 150 <ItemGroup> -
new-game.cpp
r9f4986b r4e0b82b 2 2 3 3 #include "stb_image.h" 4 5 // I think this was for the OpenGL 4 book font file tutorial 6 //#define STB_IMAGE_WRITE_IMPLEMENTATION 7 //#include "stb_image_write.h" 4 8 5 9 #define _USE_MATH_DEFINES … … 105 109 obj = &*it; 106 110 107 for ( int p_idx = 0; p_idx < it->points.size(); p_idx += 9) {111 for (unsigned int p_idx = 0; p_idx < it->points.size(); p_idx += 9) { 108 112 if (faceClicked({ 109 113 vec3(it->points[p_idx], it->points[p_idx + 1], it->points[p_idx + 2]), … … 131 135 } 132 136 133 int main(int argc, char* argv[]) {137 int realmain(int argc, char* argv[]) { 134 138 cout << "New OpenGL Game" << endl; 135 139 … … 537 541 538 542 // group scene objects by shader 539 for ( int i=0; i < objects.size(); i++) {543 for (unsigned int i=0; i < objects.size(); i++) { 540 544 if (objects[i].shader_program == shader_program) { 541 545 program1_objects.push_back(i);
Note:
See TracChangeset
for help on using the changeset viewer.