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 Merge branch 'main' of https://github.com/patrick-scho/sss into main --- 7a181bdf261b620adb266a4f6b485a0afd1ed306 diff --cc .vscode/launch.json index 0000000,0000000..0abb9ae new file mode 100644 --- /dev/null +++ b/.vscode/launch.json @@@ -1,0 -1,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 ++ } ++ ] ++} diff --cc .vscode/settings.json index 0000000,0000000..1a8d6c8 new file mode 100644 --- /dev/null +++ b/.vscode/settings.json @@@ -1,0 -1,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" ++ } ++} diff --cc assimp-vc142-mt.dll index 0000000,0000000..5aed174 new file mode 100644 Binary files differ diff --cc bin/imgui-SFML.obj index 0000000,0000000..1d7867b new file mode 100644 Binary files differ diff --cc bin/imgui.obj index 0000000,0000000..de0af0d new file mode 100644 Binary files differ diff --cc bin/imgui_demo.obj index 0000000,0000000..e47365d new file mode 100644 Binary files differ diff --cc bin/imgui_draw.obj index 0000000,0000000..f4899f6 new file mode 100644 Binary files differ diff --cc bin/imgui_widgets.obj index 0000000,0000000..4770f02 new file mode 100644 Binary files differ diff --cc build.sh index 3c921c8,a065433..a065433 mode 100644,100755..100644 --- a/build.sh +++ b/build.sh diff --cc glew32.dll index 0000000,0000000..04f9381 new file mode 100644 Binary files differ diff --cc imgui.ini index 0000000,0000000..cf5b5fe new file mode 100644 --- /dev/null +++ b/imgui.ini @@@ -1,0 -1,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 --cc main.exe index 0000000,0000000..feb0787 new file mode 100644 Binary files differ diff --cc main.ilk index 0000000,0000000..61cd5ff new file mode 100644 Binary files differ diff --cc main.obj index 0000000,0000000..f2350dd new file mode 100644 Binary files differ diff --cc main.pdb index 0000000,0000000..5aa106e new file mode 100644 Binary files differ diff --cc sfml-graphics-2.dll index 0000000,0000000..e6d3e1c new file mode 100644 Binary files differ diff --cc sfml-system-2.dll index 0000000,0000000..ef86fea new file mode 100644 Binary files differ diff --cc sfml-window-2.dll index 0000000,0000000..269822c new file mode 100644 Binary files differ diff --cc vc140.pdb index 0000000,0000000..5bcb5e5 new file mode 100644 Binary files differ