ShibaGit/khaotic-engine-Reborn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

feat: nouveau plane

Browse Source 
feat:
+ Ajout d'un nouveau plane, l'ancien etait casse
+ "Ajout" des colisions avec les planes, les planes sont traites comme des cubes
This commit is contained in:
StratiX0 2024-04-25 10:33:29 +02:00
parent 9dd129b7bc
commit daa9aa7023
5 changed files with 19 additions and 3759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
enginecustom/applicationclass.cpp
View File

@ -1291,7 +1291,7 @@ void ApplicationClass::GenerateTerrain()
scaleMatrix = XMMatrixScaling(scaleX, scaleY, scaleZ); scaleMatrix = XMMatrixScaling(scaleX, scaleY, scaleZ);
// Set the file name of the model. // Set the file name of the model.
strcpy_s(modelFilename, "cube.txt"); strcpy_s(modelFilename, "plane.txt");
strcpy_s(textureFilename, "stone01.tga"); strcpy_s(textureFilename, "stone01.tga");
strcpy_s(textureFilename2, "moss01.tga"); strcpy_s(textureFilename2, "moss01.tga");
strcpy_s(textureFilename3, "alpha01.tga"); strcpy_s(textureFilename3, "alpha01.tga");

12
enginecustom/enginecustom.vcxproj.filters
View File

@ -129,9 +129,6 @@
<ClCompile Include="alphamapshaderclass.cpp"> <ClCompile Include="alphamapshaderclass.cpp">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="normalmapshaderclass.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="specmapshaderclass.cpp"> <ClCompile Include="specmapshaderclass.cpp">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
@ -159,6 +156,9 @@
<ClCompile Include="physics.cpp"> <ClCompile Include="physics.cpp">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="normalmapshaderclass.cpp">
<Filter>Assets</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="systemclass.h"> <ClInclude Include="systemclass.h">
@ -402,11 +402,11 @@
<Text Include="sphere.txt"> <Text Include="sphere.txt">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Text> </Text>
<Text Include="plane.txt">
<Filter>Assets</Filter>
</Text>
<Text Include="square.txt"> <Text Include="square.txt">
<Filter>assets</Filter> <Filter>assets</Filter>
</Text> </Text>
<Text Include="plane.txt">
<Filter>Assets</Filter>
</Text>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
enginecustom/imgui.ini
View File

@ -11,6 +11,6 @@ Pos=7,299
Size=492,353 Size=492,353
[Window][Terrain] [Window][Terrain]
Pos=692,768 Pos=691,769
Size=418,94 Size=418,94

4
enginecustom/physics.cpp
View File

@ -83,6 +83,10 @@ bool Physics::IsColliding(Object* object1, Object* object2)
std::string type1 = object1->GetName(); std::string type1 = object1->GetName();
std::string type2 = object2->GetName(); std::string type2 = object2->GetName();
// Treat "plane" objects as "cube"
if (type1 == "plane") type1 = "cube";
if (type2 == "plane") type2 = "cube";
if (type1 == "cube" && type2 == "cube") if (type1 == "cube" && type2 == "cube")
{ {
return CubesOverlap(object1, object2); return CubesOverlap(object1, object2);

3758
enginecustom/plane.txt
View File

File diff suppressed because it is too large Load Diff