Skip to content

Commit c242cd2

Browse files
TurtleMan64TurtleMan64
committed
Add cosmic wall pyramid objects (VULCAN)
1 parent 8e0db8e commit c242cd2

File tree

9 files changed

+601
-8
lines changed

9 files changed

+601
-8
lines changed

‎SA2LevelEditor/SA2LevelEditor.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8080
<LibraryPath>../Libraries/Lib64;$(LibraryPath)</LibraryPath>
8181
<OutDir>$(SolutionDir)SA2LevelEditor\</OutDir>
82+
<TargetName>SA2 Level Editor Debug</TargetName>
8283
</PropertyGroup>
8384
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8485
<LibraryPath>../Libraries/Lib64;$(LibraryPath)</LibraryPath>
@@ -209,6 +210,7 @@
209210
<ClCompile Include="src\entities\GlobalObjects\STOPLOCKON.cpp" />
210211
<ClCompile Include="src\entities\GlobalObjects\TJUMPDAI.cpp" />
211212
<ClCompile Include="src\entities\LevelSpecific\CosmicWall\CW_STAGE.cpp" />
213+
<ClCompile Include="src\entities\LevelSpecific\CosmicWall\VULCAN.cpp" />
212214
<ClCompile Include="src\entities\LevelSpecific\PyramidCave\SNAKESTATUE.cpp" />
213215
<ClCompile Include="src\entities\LevelSpecific\PyramidCave\SNEAKRAIL.cpp" />
214216
<ClCompile Include="src\entities\LevelSpecific\PyramidCave\SPIDERWEB.cpp" />
@@ -312,6 +314,7 @@
312314
<ClInclude Include="src\entities\GlobalObjects\stoplockon.h" />
313315
<ClInclude Include="src\entities\GlobalObjects\tjumpdai.h" />
314316
<ClInclude Include="src\entities\LevelSpecific\CosmicWall\cw_stage.h" />
317+
<ClInclude Include="src\entities\LevelSpecific\CosmicWall\vulcan.h" />
315318
<ClInclude Include="src\entities\LevelSpecific\PyramidCave\SNAKESTATUE.h" />
316319
<ClInclude Include="src\entities\LevelSpecific\PyramidCave\sneakrail.h" />
317320
<ClInclude Include="src\entities\LevelSpecific\PyramidCave\spiderweb.h" />

‎SA2LevelEditor/SA2LevelEditor.vcxproj.filters‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<Filter Include="Source Files\entities\GlobalObjects\Badniks">
5252
<UniqueIdentifier>{beac9baa-5e69-42a4-ace2-47e72dfdbf22}</UniqueIdentifier>
5353
</Filter>
54+
<Filter Include="Source Files\entities\LevelSpecific\CosmicWall">
55+
<UniqueIdentifier>{a28b2123-fac5-4962-996a-57b3fb5e13be}</UniqueIdentifier>
56+
</Filter>
5457
</ItemGroup>
5558
<ItemGroup>
5659
<ClCompile Include="src\glad.c">
@@ -344,6 +347,18 @@
344347
<ClCompile Include="src\entities\LevelSpecific\PyramidCave\TORCHCUP.cpp">
345348
<Filter>Source Files\entities\LevelSpecific\PyramidCave</Filter>
346349
</ClCompile>
350+
<ClCompile Include="src\entities\LevelSpecific\PyramidCave\SNAKESTATUE.cpp">
351+
<Filter>Source Files\entities\LevelSpecific\PyramidCave</Filter>
352+
</ClCompile>
353+
<ClCompile Include="src\entities\LevelSpecific\PyramidCave\SNEAKRAIL.cpp">
354+
<Filter>Source Files\entities\LevelSpecific\PyramidCave</Filter>
355+
</ClCompile>
356+
<ClCompile Include="src\entities\LevelSpecific\CosmicWall\CW_STAGE.cpp">
357+
<Filter>Source Files\entities\LevelSpecific\CosmicWall</Filter>
358+
</ClCompile>
359+
<ClCompile Include="src\entities\LevelSpecific\CosmicWall\VULCAN.cpp">
360+
<Filter>Source Files\entities\LevelSpecific\CosmicWall</Filter>
361+
</ClCompile>
347362
</ItemGroup>
348363
<ItemGroup>
349364
<ClInclude Include="src\main\main.h">
@@ -635,6 +650,18 @@
635650
<Filter>Source Files\entities\LevelSpecific\PyramidCave</Filter>
636651
</ClInclude>
637652
<ClInclude Include="resource.h" />
653+
<ClInclude Include="src\entities\LevelSpecific\PyramidCave\SNAKESTATUE.h">
654+
<Filter>Source Files\entities\LevelSpecific\PyramidCave</Filter>
655+
</ClInclude>
656+
<ClInclude Include="src\entities\LevelSpecific\PyramidCave\sneakrail.h">
657+
<Filter>Source Files\entities\LevelSpecific\PyramidCave</Filter>
658+
</ClInclude>
659+
<ClInclude Include="src\entities\LevelSpecific\CosmicWall\cw_stage.h">
660+
<Filter>Source Files\entities\LevelSpecific\CosmicWall</Filter>
661+
</ClInclude>
662+
<ClInclude Include="src\entities\LevelSpecific\CosmicWall\vulcan.h">
663+
<Filter>Source Files\entities\LevelSpecific\CosmicWall</Filter>
664+
</ClInclude>
638665
</ItemGroup>
639666
<ItemGroup>
640667
<ResourceCompile Include="SA2LevelEditor.rc">

‎SA2LevelEditor/res/Models/LevelObjects/CosmicWall/VULCAN.mtl‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Blender MTL File: 'None'
2+
# Material Count: 1
3+
4+
newmtl material_0
5+
Ns 20
6+
Ka 1.000000 1.000000 1.000000
7+
Kd 0.800000 0.800000 0.800000
8+
Ks 0.500000 0.500000 0.500000
9+
Ke 0.000000 0.000000 0.000000
10+
Ni 0.02
11+
d 1.000000
12+
illum 2
13+
map_Kd Collision.png

‎SA2LevelEditor/res/Models/LevelObjects/CosmicWall/VULCAN.obj‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Blender v2.79 (sub 0) OBJ File: ''
2+
# www.blender.org
3+
mtllib VULCAN.mtl
4+
v 45.000000 0.000007 -45.000000
5+
v -45.000000 0.000007 -45.000000
6+
v 45.000000 16.999992 45.000004
7+
v -45.000000 16.999992 45.000004
8+
v -45.000000 17.000008 -44.999996
9+
v -45.000000 17.000008 -44.999996
10+
v -45.000000 -0.000007 45.000000
11+
v -45.000000 16.999992 45.000004
12+
v 45.000000 -0.000007 45.000000
13+
v 45.000000 16.999992 45.000004
14+
v -45.000000 0.000007 -45.000000
15+
v -45.000000 -0.000007 45.000000
16+
v -45.000000 17.000008 -44.999996
17+
v -45.000000 16.999992 45.000004
18+
v -45.000000 17.000008 -44.999996
19+
v 45.000000 0.000007 -45.000000
20+
v 45.000000 17.000008 -44.999996
21+
v 45.000000 -0.000007 45.000000
22+
v 45.000000 17.000008 -44.999996
23+
v 45.000000 16.999992 45.000004
24+
v 0.000000 80.000000 0.000013
25+
v 45.000000 17.000008 -44.999996
26+
v 45.000000 16.999992 45.000004
27+
v 0.000000 80.000000 0.000013
28+
v 45.000000 17.000008 -44.999996
29+
v 0.000000 80.000000 0.000013
30+
v -45.000000 16.999992 45.000004
31+
v 0.000000 80.000000 0.000013
32+
vt 0.000000 0.000000
33+
vt 1.000000 0.000000
34+
vt 1.000000 1.000000
35+
vt 0.000000 0.000000
36+
vt 1.000000 0.000000
37+
vt 1.000000 1.000000
38+
vt 1.000000 0.000000
39+
vt 1.000000 1.000000
40+
vt 0.000000 0.000000
41+
vt 1.000000 0.000000
42+
vt 1.000000 1.000000
43+
vt 1.000000 0.000000
44+
vt 1.000000 1.000000
45+
vt 0.000000 0.000000
46+
vt 1.000000 0.000000
47+
vt 1.000000 1.000000
48+
vt 1.000000 0.000000
49+
vt 1.000000 1.000000
50+
vt 0.000000 0.000000
51+
vt 1.000000 0.000000
52+
vt 1.000000 1.000000
53+
vt 0.000000 0.000000
54+
vt 1.000000 0.000000
55+
vt 1.000000 1.000000
56+
vt 0.000000 0.000000
57+
vt 1.000000 0.000000
58+
vt 1.000000 1.000000
59+
vt 0.000000 0.000000
60+
vt 1.000000 0.000000
61+
vt 1.000000 1.000000
62+
vt 1.000000 0.000000
63+
vt 1.000000 1.000000
64+
vn -1.0000 0.0000 0.0000
65+
vn 0.0000 0.0000 -1.0000
66+
vn 1.0000 -0.0000 0.0000
67+
vn 0.0000 0.5812 0.8137
68+
vn 0.0000 0.5812 -0.8137
69+
vn 0.8137 0.5812 0.0000
70+
vn -0.8137 0.5812 0.0000
71+
vn 0.0000 -0.0000 1.0000
72+
usemtl material_0
73+
s 1
74+
f 12/1/1 13/2/1 11/3/1
75+
f 2/4/2 17/5/2 16/6/2
76+
f 2/4/2 15/7/2 17/8/2
77+
f 1/9/3 20/10/3 18/11/3
78+
f 1/9/3 19/12/3 20/13/3
79+
f 4/14/4 3/15/4 21/16/4
80+
f 12/1/1 14/17/1 13/18/1
81+
f 6/19/5 26/20/5 25/21/5
82+
f 23/22/6 22/23/6 24/24/6
83+
f 27/25/7 28/26/7 5/27/7
84+
f 9/28/8 8/29/8 7/30/8
85+
f 9/28/8 10/31/8 8/32/8

‎SA2LevelEditor/src/entities/LevelSpecific/CosmicWall/CW_STAGE.cpp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void CW_STAGE::loadStaticModels()
169169
void CW_STAGE::deleteStaticModels()
170170
{
171171
#ifdef DEV_MODE
172-
std::fprintf(stdout, "Deleting SNAKESTATUE static models...\n");
172+
std::fprintf(stdout, "Deleting CW_STAGE static models...\n");
173173
#endif
174174

175175
Entity::deleteModels(&CW_STAGE::models);
@@ -424,22 +424,19 @@ void CW_STAGE::fillData(char data[32])
424424
data[18] = (char)(*(ptr + 1));
425425
data[19] = (char)(*(ptr + 0));
426426

427-
float var1 = scaleX - 1.0f;
428-
ptr = (char*)(&var1);
427+
ptr = (char*)(&scaleX);
429428
data[20] = (char)(*(ptr + 3));
430429
data[21] = (char)(*(ptr + 2));
431430
data[22] = (char)(*(ptr + 1));
432431
data[23] = (char)(*(ptr + 0));
433432

434-
float var2 = scaleY - 1.0f;
435-
ptr = (char*)(&var2);
433+
ptr = (char*)(&scaleY);
436434
data[24] = (char)(*(ptr + 3));
437435
data[25] = (char)(*(ptr + 2));
438436
data[26] = (char)(*(ptr + 1));
439437
data[27] = (char)(*(ptr + 0));
440438

441-
float var3 = scaleZ - 1.0f;
442-
ptr = (char*)(&var3);
439+
ptr = (char*)(&scaleZ);
443440
data[28] = (char)(*(ptr + 3));
444441
data[29] = (char)(*(ptr + 2));
445442
data[30] = (char)(*(ptr + 1));

0 commit comments

Comments
 (0)