Skip to content

Commit 874eda5

Browse files
committed
Added animation support.
1 parent 8041462 commit 874eda5

File tree

125 files changed

+1675923
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1675923
-388
lines changed

NeonEngine/NeonEngine.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@
148148
<ClInclude Include="src\quad.h" />
149149
<ClInclude Include="src\opengl_utils.h" />
150150
<ClInclude Include="src\game_object.h" />
151-
<ClInclude Include="src\complex_model.h" />
151+
<ClInclude Include="src\model.h" />
152152
<ClInclude Include="src\cylinder.h" />
153153
<ClInclude Include="src\geometry.h" />
154154
<ClInclude Include="src\rendering.h" />
155155
<ClInclude Include="src\mesh.h" />
156-
<ClInclude Include="src\model.h" />
156+
<ClInclude Include="src\base_model.h" />
157157
<ClInclude Include="src\shader.h" />
158158
<ClInclude Include="src\camera.h" />
159159
<ClInclude Include="src\imgui_extension.h" />

NeonEngine/NeonEngine.vcxproj.filters

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<ClInclude Include="src\mesh.h">
6969
<Filter>Header Files</Filter>
7070
</ClInclude>
71-
<ClInclude Include="src\model.h">
71+
<ClInclude Include="src\base_model.h">
7272
<Filter>Header Files</Filter>
7373
</ClInclude>
7474
<ClInclude Include="src\shader.h">
@@ -83,7 +83,7 @@
8383
<ClInclude Include="src\cylinder.h">
8484
<Filter>Header Files</Filter>
8585
</ClInclude>
86-
<ClInclude Include="src\complex_model.h">
86+
<ClInclude Include="src\model.h">
8787
<Filter>Header Files</Filter>
8888
</ClInclude>
8989
<ClInclude Include="src\game_object.h">

NeonEngine/imgui.ini

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ Collapsed=0
2727

2828
[Window][Viewport]
2929
Pos=0,26
30-
Size=1388,772
30+
Size=1515,803
3131
Collapsed=0
3232
DockId=0x00000005,0
3333

3434
[Window][Details]
35-
Pos=1390,559
36-
Size=530,521
35+
Pos=1517,559
36+
Size=403,521
3737
Collapsed=0
3838
DockId=0x00000002,0
3939

4040
[Window][Outlier]
41-
Pos=1390,26
42-
Size=530,531
41+
Pos=1517,26
42+
Size=403,531
4343
Collapsed=0
4444
DockId=0x00000001,0
4545

4646
[Window][Content Browser]
47-
Pos=0,800
48-
Size=1388,280
47+
Pos=0,831
48+
Size=1515,249
4949
Collapsed=0
5050
DockId=0x00000006,0
5151

@@ -56,11 +56,11 @@ Size=1441,1038
5656
Collapsed=0
5757

5858
[Docking][Data]
59-
DockSpace ID=0x3BC79352 Window=0x4647B76E Pos=87,147 Size=1920,1054 Split=X Selected=0x13926F0B
60-
DockNode ID=0x00000003 Parent=0x3BC79352 SizeRef=1388,527 Split=Y Selected=0x13926F0B
61-
DockNode ID=0x00000005 Parent=0x00000003 SizeRef=1387,772 CentralNode=1 Selected=0x13926F0B
62-
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=1387,280 Selected=0xBF096F38
63-
DockNode ID=0x00000004 Parent=0x3BC79352 SizeRef=530,527 Split=Y Selected=0x79DBC900
59+
DockSpace ID=0x3BC79352 Window=0x4647B76E Pos=1114,322 Size=1920,1054 Split=X Selected=0x13926F0B
60+
DockNode ID=0x00000003 Parent=0x3BC79352 SizeRef=1515,527 Split=Y Selected=0x13926F0B
61+
DockNode ID=0x00000005 Parent=0x00000003 SizeRef=1387,803 CentralNode=1 Selected=0x13926F0B
62+
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=1387,249 Selected=0xBF096F38
63+
DockNode ID=0x00000004 Parent=0x3BC79352 SizeRef=403,527 Split=Y Selected=0x79DBC900
6464
DockNode ID=0x00000001 Parent=0x00000004 SizeRef=531,531 Selected=0x79DBC900
6565
DockNode ID=0x00000002 Parent=0x00000004 SizeRef=531,521 Selected=0xFC3EA205
6666

NeonEngine/models/blender_car/car.mtl

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Blender 3.4.1 MTL File: 'None'
2+
# www.blender.org
3+
4+
newmtl Mat
5+
Ns 319.999939
6+
Ka 1.000000 1.000000 1.000000
7+
Kd 0.210000 0.210000 0.210000
8+
Ks 0.500000 0.500000 0.500000
9+
Ke 0.000000 0.000000 0.000000
10+
Ni 1.450000
11+
d 1.000000
12+
illum 2
13+
14+
newmtl Mat.1
15+
Ns 319.999939
16+
Ka 1.000000 1.000000 1.000000
17+
Kd 0.340000 0.000000 0.000000
18+
Ks 0.500000 0.500000 0.500000
19+
Ke 0.000000 0.000000 0.000000
20+
Ni 1.450000
21+
d 1.000000
22+
illum 2
23+
24+
newmtl default
25+
Ns 200.000000
26+
Ka 1.000000 1.000000 1.000000
27+
Ke 0.000000 0.000000 0.000000
28+
Ni 1.450000
29+
d 1.000000
30+
illum 2
31+
map_Kd x_dbz_pink_flyerx_Albedo.jpg
32+
map_Ks x_dbz_pink_flyerx_Specular.jpg

0 commit comments

Comments
 (0)