From: Patrick Schönberger Date: Wed, 10 Feb 2021 10:56:14 +0000 (+0100) Subject: Merge branch 'main' of https://github.com/patrick-scho/sss into main X-Git-Url: https://gitweb.ps.run/subsurface_scattering/commitdiff_plain/7a181bdf261b620adb266a4f6b485a0afd1ed306?hp=e03792c2d5620ca07ac50717062df846927027c0 Merge branch 'main' of https://github.com/patrick-scho/sss into main --- diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..0abb9ae --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,19 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "(Windows) Starten", + "type": "cppvsdbg", + "request": "launch", + "program": "${workspaceFolder}/main.exe", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1a8d6c8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,24 @@ +{ + "C_Cpp.default.includePath": [ + "C:/prg/cpp/libs/glm", + "C:/prg/cpp/libs/glew-2.1.0/include", + "C:/prg/cpp/libs/SFML-2.5.1/include", + "C:/prg/cpp/libs/imgui", + "C:/prg/cpp/libs/imgui-sfml", + "C:/prg/cpp/libs/assimp-5.0.1/include", + "C:/prg/cpp/libs/assimp-5.0.1/build/include", + ], + "files.associations": { + "*.t": "lua", + "cmath": "cpp", + "istream": "cpp", + "array": "cpp", + "initializer_list": "cpp", + "type_traits": "cpp", + "vector": "cpp", + "xstring": "cpp", + "xtree": "cpp", + "xutility": "cpp", + "*.glsl": "c" + } +} \ No newline at end of file diff --git a/assimp-vc142-mt.dll b/assimp-vc142-mt.dll new file mode 100644 index 0000000..5aed174 Binary files /dev/null and b/assimp-vc142-mt.dll differ diff --git a/bin/imgui-SFML.obj b/bin/imgui-SFML.obj new file mode 100644 index 0000000..1d7867b Binary files /dev/null and b/bin/imgui-SFML.obj differ diff --git a/bin/imgui.obj b/bin/imgui.obj new file mode 100644 index 0000000..de0af0d Binary files /dev/null and b/bin/imgui.obj differ diff --git a/bin/imgui_demo.obj b/bin/imgui_demo.obj new file mode 100644 index 0000000..e47365d Binary files /dev/null and b/bin/imgui_demo.obj differ diff --git a/bin/imgui_draw.obj b/bin/imgui_draw.obj new file mode 100644 index 0000000..f4899f6 Binary files /dev/null and b/bin/imgui_draw.obj differ diff --git a/bin/imgui_widgets.obj b/bin/imgui_widgets.obj new file mode 100644 index 0000000..4770f02 Binary files /dev/null and b/bin/imgui_widgets.obj differ diff --git a/build.sh b/build.sh index 3c921c8..a065433 100644 --- 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/glew32.dll b/glew32.dll new file mode 100644 index 0000000..04f9381 Binary files /dev/null and b/glew32.dll differ diff --git a/imgui.ini b/imgui.ini new file mode 100644 index 0000000..cf5b5fe --- /dev/null +++ b/imgui.ini @@ -0,0 +1,15 @@ +[Window][Debug##Default] +Pos=60,60 +Size=400,400 +Collapsed=0 + +[Window][w] +Pos=60,60 +Size=447,349 +Collapsed=0 + +[Window][Options] +Pos=17,16 +Size=452,298 +Collapsed=0 + diff --git a/main.exe b/main.exe new file mode 100644 index 0000000..feb0787 Binary files /dev/null and b/main.exe differ diff --git a/main.ilk b/main.ilk new file mode 100644 index 0000000..61cd5ff Binary files /dev/null and b/main.ilk differ diff --git a/main.obj b/main.obj new file mode 100644 index 0000000..f2350dd Binary files /dev/null and b/main.obj differ diff --git a/main.pdb b/main.pdb new file mode 100644 index 0000000..5aa106e Binary files /dev/null and b/main.pdb differ diff --git a/sfml-graphics-2.dll b/sfml-graphics-2.dll new file mode 100644 index 0000000..e6d3e1c Binary files /dev/null and b/sfml-graphics-2.dll differ diff --git a/sfml-system-2.dll b/sfml-system-2.dll new file mode 100644 index 0000000..ef86fea Binary files /dev/null and b/sfml-system-2.dll differ diff --git a/sfml-window-2.dll b/sfml-window-2.dll new file mode 100644 index 0000000..269822c Binary files /dev/null and b/sfml-window-2.dll differ diff --git a/src/main.cpp b/src/main.cpp index ddba48c..dde29ec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -610,4 +610,4 @@ int main() { } return 0; -} \ No newline at end of file +} diff --git a/vc140.pdb b/vc140.pdb new file mode 100644 index 0000000..5bcb5e5 Binary files /dev/null and b/vc140.pdb differ