]> gitweb.ps.run Git - subsurface_scattering/commitdiff
Merge branch 'main' of https://github.com/patrick-scho/sss into main
authorPatrick Schönberger <patrick.schoenberger@posteo.de>
Wed, 10 Feb 2021 10:56:14 +0000 (11:56 +0100)
committerPatrick Schönberger <patrick.schoenberger@posteo.de>
Wed, 10 Feb 2021 10:56:14 +0000 (11:56 +0100)
20 files changed:
1  2 
.vscode/launch.json
.vscode/settings.json
assimp-vc142-mt.dll
bin/imgui-SFML.obj
bin/imgui.obj
bin/imgui_demo.obj
bin/imgui_draw.obj
bin/imgui_widgets.obj
build.sh
glew32.dll
imgui.ini
main.exe
main.ilk
main.obj
main.pdb
sfml-graphics-2.dll
sfml-system-2.dll
sfml-window-2.dll
src/main.cpp
vc140.pdb

index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0abb9ae280c767c1bddcbd8392f1a01a5dbdc844
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,19 @@@
++{\r
++  // Use IntelliSense to learn about possible attributes.\r
++  // Hover to view descriptions of existing attributes.\r
++  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387\r
++  "version": "0.2.0",\r
++  "configurations": [\r
++    {\r
++      "name": "(Windows) Starten",\r
++      "type": "cppvsdbg",\r
++      "request": "launch",\r
++      "program": "${workspaceFolder}/main.exe",\r
++      "args": [],\r
++      "stopAtEntry": false,\r
++      "cwd": "${workspaceFolder}",\r
++      "environment": [],\r
++      "externalConsole": false\r
++    }\r
++  ]\r
++}
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..1a8d6c8ce24c8fc716a56630529ba97ed13dec88
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -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"
++  }
++}
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5aed1740e9bfbbff1d77a3c5c206582b39db51d4
new file mode 100644 (file)
Binary files differ
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..1d7867b88cf8aa9d012aae2a2ad2ea1d008d3510
new file mode 100644 (file)
Binary files differ
diff --cc bin/imgui.obj
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..de0af0d48b7bcce4ee32f5c6510ddcc0d4e16703
new file mode 100644 (file)
Binary files differ
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e47365d297f53aecdf0152144d7a3e8c61431560
new file mode 100644 (file)
Binary files differ
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f4899f64ba2e04fe0c0e452b7d0092aa5ec83d04
new file mode 100644 (file)
Binary files differ
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4770f02b9e5ea127be783fae489f17f21e64fd7e
new file mode 100644 (file)
Binary files differ
diff --cc build.sh
index 3c921c8cb87ed967041a7a00d8369085c6625da9,a0654330aa0a9f2b5561b03c1bbd19f89ef5f8c5..a0654330aa0a9f2b5561b03c1bbd19f89ef5f8c5
mode 100644,100755..100644
+++ b/build.sh
diff --cc glew32.dll
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..04f93819e9255d9f3ab0e504a836fb54032b8d5f
new file mode 100644 (file)
Binary files differ
diff --cc imgui.ini
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..cf5b5fe486fb0cc2dd9537b475f177d2df162066
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/imgui.ini
@@@ -1,0 -1,0 +1,15 @@@
++[Window][Debug##Default]\r
++Pos=60,60\r
++Size=400,400\r
++Collapsed=0\r
++\r
++[Window][w]\r
++Pos=60,60\r
++Size=447,349\r
++Collapsed=0\r
++\r
++[Window][Options]\r
++Pos=17,16\r
++Size=452,298\r
++Collapsed=0\r
++\r
diff --cc main.exe
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..feb07873ec06f6414daaf03120100d6ac755bc12
new file mode 100644 (file)
Binary files differ
diff --cc main.ilk
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..61cd5fffdec5c395bea041617b9771421b273446
new file mode 100644 (file)
Binary files differ
diff --cc main.obj
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f2350dd0978d5a6ff8ef7f86790d9b3a00a91231
new file mode 100644 (file)
Binary files differ
diff --cc main.pdb
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5aa106e84ee68ca453ca4c99a2dfa97ff6371b6d
new file mode 100644 (file)
Binary files differ
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e6d3e1ce2e1f8a9f21c492f52f82d0a25e16d652
new file mode 100644 (file)
Binary files differ
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ef86fea2d72354a69fc762058d61319288936456
new file mode 100644 (file)
Binary files differ
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..269822c868ffec51469a4cc7064027b5345f2861
new file mode 100644 (file)
Binary files differ
diff --cc src/main.cpp
Simple merge
diff --cc vc140.pdb
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5bcb5e523fedeab72d3aad5fe95f92cc1265a1e8
new file mode 100644 (file)
Binary files differ