fix build.sh

diff --git a/build.sh b/build.sh
old mode 100644 (file)
new mode 100755 (executable)
index 3c921c8..a065433
--- a/build.sh
+++ b/build.sh
@@ -1 +1,2 @@
-g++ src/main.cpp -o main -lsfml-system -lsfml-window -lGLEW -lGL -lassimp
+# g++ -c ~/cpp/libs/imgui/*.cpp ~/cpp/libs/imgui-sfml/*.cpp -I ~/cpp/libs/imgui -I ~/cpp/libs/imgui-sfml/
+g++ src/main.cpp ./*.o -o main -I ~/cpp/libs/imgui -I ~/cpp/libs/imgui-sfml -lsfml-system -lsfml-window -lsfml-graphics -lGLEW -lGL -lassimp

diff --git a/src/main.cpp b/src/main.cpp
index 1440f04b543b9cfb813f95a39b07034b14a97d1b..b95cc972121437ecb2a77ce573129ff41b72450b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -389,7 +389,7 @@ int main() {
 \r
     ImGui::Begin("Options");\r
     ImGui::Checkbox("Wireframe", &options.wireframe);\r
 \r
     ImGui::Begin("Options");\r
     ImGui::Checkbox("Wireframe", &options.wireframe);\r

-    ImGui::Checkbox("Free Cam (F)", &options.freecam);\r
+    ImGui::Checkbox("Free Cam", &options.freecam);\r

     if (options.freecam) {\r
       ImGui::LabelText("Position", "%f %f %f", freeCam.pos.x, freeCam.pos.y, freeCam.pos.z);\r
       ImGui::LabelText("Rotation", "%f %f", freeCam.rot.x, freeCam.rot.y);\r
     if (options.freecam) {\r
       ImGui::LabelText("Position", "%f %f %f", freeCam.pos.x, freeCam.pos.y, freeCam.pos.z);\r
       ImGui::LabelText("Rotation", "%f %f", freeCam.rot.x, freeCam.rot.y);\r


@@ -413,4 +413,4 @@ int main() {
   }\r
 \r
   return 0;\r
   }\r
 \r
   return 0;\r

-}
\ No newline at end of file
+}\r