Merge pull request #77 from YGNI-RType/feat/prophunt

Lights and Animations
YGNI-RType · Nov 6, 2024 · 35ff7bf · 35ff7bf
2 parents 1ab8620 + 9863977
commit 35ff7bf
Show file tree

Hide file tree

Showing 227 changed files with 613,092 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,6 @@ Rtype
 *.slo
 *.lo
 *.o
-*.obj
 
 # Precompiled Headers
 *.gch

diff --git a/examples/POC_3D/assets/animations/player.json b/examples/POC_3D/assets/animations/player.json
@@ -0,0 +1,24 @@
+{
+  "idle": {
+    "frames": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+      21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+      39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49
+    ],
+    "looping": true
+  },
+  "walk": {
+    "frames": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+      21, 22, 23, 24
+    ],
+    "looping": true
+  },
+  "run": {
+    "frames": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+      21, 22, 23, 24
+    ],
+    "looping": true
+  }
+}
diff --git a/examples/POC_3D/assets/models/player/idle/01.mtl b/examples/POC_3D/assets/models/player/idle/01.mtl
@@ -0,0 +1,13 @@
+# Blender 4.1.1 MTL File: 'None'
+# www.blender.org
+
+newmtl Material_0
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.500000
+d 1.000000
+illum 2
+map_Kd ../../../textures/player_female.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ Rtype @@
     *.slo
     *.lo
     *.o
-    *.obj
     # Precompiled Headers
     *.gch
@@ Expand Down @@