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 (file)
index 0000000..0abb9ae
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,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
+}
\ No newline at end of file

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index 0000000..4770f02
Binary files /dev/null and b/bin/imgui_widgets.obj differ

diff --git a/build.sh b/build.sh
index 3c921c8cb87ed967041a7a00d8369085c6625da9..a0654330aa0a9f2b5561b03c1bbd19f89ef5f8c5 100644 (file)
--- 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 (file)
index 0000000..04f9381
Binary files /dev/null and b/glew32.dll differ

diff --git a/imgui.ini b/imgui.ini
new file mode 100644 (file)
index 0000000..cf5b5fe
--- /dev/null
+++ b/imgui.ini
@@ -0,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 --git a/main.exe b/main.exe
new file mode 100644 (file)
index 0000000..feb0787
Binary files /dev/null and b/main.exe differ

diff --git a/main.ilk b/main.ilk
new file mode 100644 (file)
index 0000000..61cd5ff
Binary files /dev/null and b/main.ilk differ

diff --git a/main.obj b/main.obj
new file mode 100644 (file)
index 0000000..f2350dd
Binary files /dev/null and b/main.obj differ

diff --git a/main.pdb b/main.pdb
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 ddba48c87381cb203419bd830178a1a36eebe285..dde29ec662014deda3e1e65e5b605902eeaa91eb 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -610,4 +610,4 @@ int main() {
   }\r
 \r
   return 0;\r
-}
\ No newline at end of file
+}\r

diff --git a/vc140.pdb b/vc140.pdb
new file mode 100644 (file)
index 0000000..5bcb5e5
Binary files /dev/null and b/vc140.pdb differ