Skip to content

Commit

Permalink
feat: main menu bar with ImGui
Browse files Browse the repository at this point in the history
  • Loading branch information
navaneet-rao committed Jun 30, 2024
1 parent a623c06 commit f320696
Show file tree
Hide file tree
Showing 7 changed files with 295 additions and 148 deletions.
14 changes: 12 additions & 2 deletions build/imgui.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,17 @@ Size=156,64
Collapsed=0

[Window][Control Panel]
Pos=110,97
Size=344,610
Pos=375,444
Size=436,348
Collapsed=0

[Window][Help]
Pos=300,127
Size=397,576
Collapsed=0

[Window][key Bindings]
Pos=36,63
Size=297,406
Collapsed=0

Binary file modified build/src/CMakeFiles/Conway.dir/GLScene.cpp.o
Binary file not shown.
3 changes: 1 addition & 2 deletions build/src/CMakeFiles/Conway.dir/compiler_depend.internal
Original file line number Diff line number Diff line change
Expand Up @@ -2135,7 +2135,7 @@ src/CMakeFiles/Conway.dir/main.cpp.o
/home/luke/code/Game-Of-Life-OpenGL/include/GLScene.h
/home/luke/code/Game-Of-Life-OpenGL/include/Life3d.h
/home/luke/code/Game-Of-Life-OpenGL/include/World3d.h
/home/luke/code/Game-Of-Life-OpenGL/include/SettingsMenu.h
/usr/include/c++/11/ctime
/usr/include/GL/gl.h
/usr/include/GL/glext.h
/usr/include/KHR/khrplatform.h
Expand All @@ -2151,5 +2151,4 @@ src/CMakeFiles/Conway.dir/main.cpp.o
/usr/include/assert.h
/home/luke/code/Game-Of-Life-OpenGL/include/imgui_impl_glut.h
/home/luke/code/Game-Of-Life-OpenGL/include/imgui_impl_opengl3.h
/usr/include/c++/11/ctime

7 changes: 2 additions & 5 deletions build/src/CMakeFiles/Conway.dir/compiler_depend.make
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,7 @@ src/CMakeFiles/Conway.dir/main.cpp.o: ../src/main.cpp \
../include/GLScene.h \
../include/Life3d.h \
../include/World3d.h \
../include/SettingsMenu.h \
/usr/include/c++/11/ctime \
/usr/include/GL/gl.h \
/usr/include/GL/glext.h \
/usr/include/KHR/khrplatform.h \
Expand All @@ -2136,8 +2136,7 @@ src/CMakeFiles/Conway.dir/main.cpp.o: ../src/main.cpp \
/usr/include/strings.h \
/usr/include/assert.h \
../include/imgui_impl_glut.h \
../include/imgui_impl_opengl3.h \
/usr/include/c++/11/ctime
../include/imgui_impl_opengl3.h


../src/main.cpp:
Expand Down Expand Up @@ -2420,8 +2419,6 @@ src/CMakeFiles/Conway.dir/main.cpp.o: ../src/main.cpp \

/usr/include/x86_64-linux-gnu/bits/time64.h:

../include/SettingsMenu.h:

/usr/include/c++/11/ctime:

/usr/include/x86_64-linux-gnu/bits/floatn-common.h:
Expand Down
Binary file modified build/src/Conway
Binary file not shown.
1 change: 1 addition & 0 deletions include/GLScene.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ void ReshapeGL(int w, int h);
void MouseGL(int button, int state, int x, int y);
void MouseMotionGL(int x, int y);

void MainMenuBar();
void DisplayImGui();

void render();
Expand Down
Loading

0 comments on commit f320696

Please sign in to comment.