treesummaryrefslogcommitdiff
diff options
context:
space:
mode:
authorPatrick Schönberger2021-01-20 12:53:28 +0100
committerPatrick Schönberger2021-01-20 12:53:28 +0100
commit524432970b5aaee6e6dbc6162111dbe1e9fd0749 (patch)
tree4a8ccb340391ed35d19b4fae59d96992c5d5b8c5
parent8107e994b24112c5bce75a8ae57d0680e5f9161a (diff)
downloadsubsurface_scattering-524432970b5aaee6e6dbc6162111dbe1e9fd0749.tar.gz
subsurface_scattering-524432970b5aaee6e6dbc6162111dbe1e9fd0749.zip
fix build.sh
-rwxr-xr-x[-rw-r--r--]build.sh3
-rw-r--r--src/main.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 3c921c8..a065433 100644..100755
--- 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 1440f04..b95cc97 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -389,7 +389,7 @@ int main() {
ImGui::Begin("Options");
ImGui::Checkbox("Wireframe", &options.wireframe);
- ImGui::Checkbox("Free Cam (F)", &options.freecam);
+ ImGui::Checkbox("Free Cam", &options.freecam);
if (options.freecam) {
ImGui::LabelText("Position", "%f %f %f", freeCam.pos.x, freeCam.pos.y, freeCam.pos.z);
ImGui::LabelText("Rotation", "%f %f", freeCam.rot.x, freeCam.rot.y);
@@ -413,4 +413,4 @@ int main() {
}
return 0;
-} \ No newline at end of file
+}