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

Patch update - Texture fix + Exe fix

Browse Source 
[FIX] :

~ Modification des textures bath et water
~ Ajouts des fichier pour le exe
This commit is contained in:
CatChow0 2024-04-26 14:03:53 +02:00
parent b284fb1805
commit 3bb1f095c1
4 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
enginecustom/applicationclass.cpp
View File

@ -267,7 +267,8 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
// Set the file names of the bath model. // Set the file names of the bath model.
strcpy_s(modelFilename, "bath.txt"); strcpy_s(modelFilename, "bath.txt");
Filename.push_back("marble01.tga"); // replace first element with the new filename
Filename[0] = "marble01.tga";
// Create and initialize the bath model object. // Create and initialize the bath model object.
m_BathModel = new ModelClass; m_BathModel = new ModelClass;
@ -281,7 +282,8 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
// Set the file names of the water model. // Set the file names of the water model.
strcpy_s(modelFilename, "water.txt"); strcpy_s(modelFilename, "water.txt");
Filename.push_back("water01.tga"); // replace first element with the new filename
Filename[0] = "water01.tga";
// Create and initialize the water model object. // Create and initialize the water model object.
m_WaterModel = new ModelClass; m_WaterModel = new ModelClass;

23
enginecustom/enginecustom.vcxproj
View File

@ -151,7 +151,9 @@
<CopyFileToFolders Include="normalmap.vs"> <CopyFileToFolders Include="normalmap.vs">
<FileType>Document</FileType> <FileType>Document</FileType>
</CopyFileToFolders> </CopyFileToFolders>
<None Include="..\KhaoticDemo\water.ps" /> <CopyFileToFolders Include="..\KhaoticDemo\water.ps">
<FileType>Document</FileType>
</CopyFileToFolders>
<None Include="packages.config" /> <None Include="packages.config" />
<CopyFileToFolders Include="reflection.ps"> <CopyFileToFolders Include="reflection.ps">
<FileType>Document</FileType> <FileType>Document</FileType>
@ -177,9 +179,15 @@
<CopyFileToFolders Include="transparent.vs"> <CopyFileToFolders Include="transparent.vs">
<FileType>Document</FileType> <FileType>Document</FileType>
</CopyFileToFolders> </CopyFileToFolders>
<None Include="refraction.ps" /> <CopyFileToFolders Include="refraction.ps">
<None Include="refraction.vs" /> <FileType>Document</FileType>
<None Include="water.vs" /> </CopyFileToFolders>
<CopyFileToFolders Include="refraction.vs">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="water.vs">
<FileType>Document</FileType>
</CopyFileToFolders>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CopyFileToFolders Include="Color.ps"> <CopyFileToFolders Include="Color.ps">
@ -205,6 +213,7 @@
<CopyFileToFolders Include="light01.tga" /> <CopyFileToFolders Include="light01.tga" />
<CopyFileToFolders Include="moss01.tga" /> <CopyFileToFolders Include="moss01.tga" />
<CopyFileToFolders Include="normal01.tga" /> <CopyFileToFolders Include="normal01.tga" />
<CopyFileToFolders Include="marble01.tga" />
<Image Include="papier.tga" /> <Image Include="papier.tga" />
<CopyFileToFolders Include="spec02.tga" /> <CopyFileToFolders Include="spec02.tga" />
<CopyFileToFolders Include="sprite01.tga" /> <CopyFileToFolders Include="sprite01.tga" />
@ -212,17 +221,19 @@
<CopyFileToFolders Include="sprite03.tga" /> <CopyFileToFolders Include="sprite03.tga" />
<CopyFileToFolders Include="sprite04.tga" /> <CopyFileToFolders Include="sprite04.tga" />
<CopyFileToFolders Include="stone01.tga" /> <CopyFileToFolders Include="stone01.tga" />
<Image Include="wall.tga" /> <CopyFileToFolders Include="wall.tga" />
<Image Include="water01.tga" /> <CopyFileToFolders Include="water01.tga" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CopyFileToFolders Include="cube.txt" /> <CopyFileToFolders Include="cube.txt" />
<CopyFileToFolders Include="font01.txt" /> <CopyFileToFolders Include="font01.txt" />
<CopyFileToFolders Include="plane.txt" /> <CopyFileToFolders Include="plane.txt" />
<CopyFileToFolders Include="bath.txt" />
<Text Include="chunk.txt" /> <Text Include="chunk.txt" />
<Text Include="sphere.txt" /> <Text Include="sphere.txt" />
<CopyFileToFolders Include="sprite_data_01.txt" /> <CopyFileToFolders Include="sprite_data_01.txt" />
<Text Include="square.txt" /> <Text Include="square.txt" />
<CopyFileToFolders Include="water.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CopyFileToFolders Include="translate.ps"> <CopyFileToFolders Include="translate.ps">

45
enginecustom/enginecustom.vcxproj.filters
View File

@ -319,9 +319,6 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="wall.tga">
<Filter>assets</Filter>
</Image>
<Image Include="papier.tga"> <Image Include="papier.tga">
<Filter>assets</Filter> <Filter>assets</Filter>
</Image> </Image>
@ -331,24 +328,9 @@
<Image Include="KhaoticIcon.ico"> <Image Include="KhaoticIcon.ico">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
<Image Include="water01.tga">
<Filter>Assets</Filter>
</Image>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="refraction.ps">
<Filter>shader</Filter>
</None>
<None Include="refraction.vs">
<Filter>shader</Filter>
</None>
<None Include="..\KhaoticDemo\water.ps">
<Filter>shader</Filter>
</None>
<None Include="water.vs">
<Filter>shader</Filter>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="sphere.txt"> <Text Include="sphere.txt">
@ -484,5 +466,32 @@
<CopyFileToFolders Include="alphamap.ps"> <CopyFileToFolders Include="alphamap.ps">
<Filter>Texture</Filter> <Filter>Texture</Filter>
</CopyFileToFolders> </CopyFileToFolders>
<CopyFileToFolders Include="refraction.ps">
<Filter>shader</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="refraction.vs">
<Filter>shader</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="..\KhaoticDemo\water.ps">
<Filter>shader</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="water.vs">
<Filter>shader</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="wall.tga">
<Filter>assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="water01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="bath.txt">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="marble01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="water.txt">
<Filter>Assets</Filter>
</CopyFileToFolders>
</ItemGroup> </ItemGroup>
</Project> </Project>

6
enginecustom/modelclass.cpp
View File

@ -271,7 +271,7 @@ void ModelClass::ReleaseTextures()
bool ModelClass::LoadModel(char* filename) bool ModelClass::LoadModel(char* filename)
{ {
Logger::Get().Log("Loading model", __FILE__, __LINE__); Logger::Get().Log("Loading model: " + std::string(filename), __FILE__, __LINE__);
ifstream fin; ifstream fin;
char input; char input;
@ -324,7 +324,7 @@ bool ModelClass::LoadModel(char* filename)
// Close the model file. // Close the model file.
fin.close(); fin.close();
Logger::Get().Log("Model loaded", __FILE__, __LINE__); Logger::Get().Log("Model loaded "+ std::string(filename), __FILE__, __LINE__);
return true; return true;
} }
@ -489,7 +489,7 @@ bool ModelClass::ChangeTexture(ID3D11Device* device, ID3D11DeviceContext* device
return false; return false;
} }
Logger::Get().Log("Texture changed", __FILE__, __LINE__); Logger::Get().Log("Texture changed", __FILE__, __LINE__, Logger::LogLevel::Debug);
return true; return true;
} }