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

Major Update - Texture Change

Browse Source
This commit is contained in:
CatChow0 2024-09-29 13:57:26 +02:00
parent bbbea117c3
commit 68e460c5df
30 changed files with 105 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
enginecustom/alpha01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 128 KiB

BIN
enginecustom/alpha01.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 MiB

56
enginecustom/applicationclass.cpp
View File

@ -175,12 +175,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
// Charger les textures // Charger les textures
std::vector<std::wstring> textureFilenames = { std::vector<std::wstring> textureFilenames = {
L"stone01.tga", L"stone01.png",
L"normal01.tga", L"normal01.png",
L"spec02.tga", L"spec02.png",
L"alpha01.tga", L"alpha01.png",
L"light01.tga", L"light01.png",
L"moss01.tga" L"moss01.png"
}; };
for (const auto& textureFilename : textureFilenames) for (const auto& textureFilename : textureFilenames)
@ -282,12 +282,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
strcpy_s(modelFilename, "bath.txt"); strcpy_s(modelFilename, "bath.txt");
// Charger les textures initiales pour m_BathModel // Charger les textures initiales pour m_BathModel
std::vector<std::wstring> bathTextures = { std::vector<std::wstring> bathTextures = {
L"marble01.tga", L"marble01.png",
L"normal01.tga", L"normal01.png",
L"spec02.tga", L"spec02.png",
L"alpha01.tga", L"alpha01.png",
L"light01.tga", L"light01.png",
L"moss01.tga" L"moss01.png"
}; };
textures.clear(); textures.clear();
@ -320,12 +320,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
strcpy_s(modelFilename, "water.txt"); strcpy_s(modelFilename, "water.txt");
// replace first element with the new filename // replace first element with the new filename
std::vector<std::wstring> waterTextures = { std::vector<std::wstring> waterTextures = {
L"water01.tga", L"water01.png",
L"normal01.tga", L"normal01.png",
L"spec02.tga", L"spec02.png",
L"alpha01.tga", L"alpha01.png",
L"light01.tga", L"light01.png",
L"moss01.tga" L"moss01.png"
}; };
textures.clear(); textures.clear();
@ -1676,11 +1676,11 @@ void ApplicationClass::AddKobject(WCHAR* filepath)
/// Liste des fichiers de texture /// Liste des fichiers de texture
std::vector<std::wstring> kobjTexture = { std::vector<std::wstring> kobjTexture = {
L"moss01.tga", L"moss01.png",
L"normal01.tga", L"normal01.png",
L"spec02.tga", L"spec02.png",
L"alpha01.tga", L"alpha01.png",
L"light01.tga" L"light01.png"
}; };
@ -1723,11 +1723,11 @@ void ApplicationClass::AddCube()
// Liste des fichiers de texture // Liste des fichiers de texture
std::vector<std::wstring> cubeTexture = { std::vector<std::wstring> cubeTexture = {
L"moss01.tga", L"moss01.png",
L"normal01.tga", L"normal01.png",
L"spec02.tga", L"spec02.png",
L"alpha01.tga", L"alpha01.png",
L"light01.tga" L"light01.png"
}; };

BIN
enginecustom/dirt01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 588 KiB

BIN
enginecustom/dirt01.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 MiB

29
enginecustom/enginecustom.vcxproj
View File

@ -224,24 +224,31 @@
</CopyFileToFolders> </CopyFileToFolders>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CopyFileToFolders Include="alpha01.tga" />
<CopyFileToFolders Include="C:\Users\Bacon\Downloads\BricksDragfacedRunning008\Bricks2K.png" /> <CopyFileToFolders Include="C:\Users\Bacon\Downloads\BricksDragfacedRunning008\Bricks2K.png" />
<Image Include="dirt01.tga" />
<CopyFileToFolders Include="font01.tga" /> <CopyFileToFolders Include="font01.tga" />
<Image Include="alpha01.png" />
<Image Include="dirt01.png" />
<Image Include="font01.png" />
<Image Include="ground01.png" />
<Image Include="KhaoticIcon.ico" /> <Image Include="KhaoticIcon.ico" />
<CopyFileToFolders Include="light01.tga" />
<CopyFileToFolders Include="moss01.tga" />
<CopyFileToFolders Include="normal01.tga" />
<CopyFileToFolders Include="marble01.tga" />
<Image Include="papier.tga" />
<CopyFileToFolders Include="spec02.tga" />
<CopyFileToFolders Include="sprite01.tga" /> <CopyFileToFolders Include="sprite01.tga" />
<CopyFileToFolders Include="sprite02.tga" /> <CopyFileToFolders Include="sprite02.tga" />
<CopyFileToFolders Include="sprite03.tga" /> <CopyFileToFolders Include="sprite03.tga" />
<CopyFileToFolders Include="sprite04.tga" /> <CopyFileToFolders Include="sprite04.tga" />
<CopyFileToFolders Include="stone01.tga" /> <Image Include="light01.png" />
<CopyFileToFolders Include="wall.tga" /> <Image Include="marble01.png" />
<CopyFileToFolders Include="water01.tga" /> <Image Include="moss01.png" />
<Image Include="normal01.png" />
<Image Include="spec02.png" />
<Image Include="sprite01.png" />
<Image Include="sprite02.png" />
<Image Include="sprite03.png" />
<Image Include="sprite04.png" />
<Image Include="stone01.png" />
<Image Include="stone01.tga" />
<Image Include="wall.png" />
<Image Include="wall01.png" />
<Image Include="water01.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CopyFileToFolders Include="cube.txt" /> <CopyFileToFolders Include="cube.txt" />

92
enginecustom/enginecustom.vcxproj.filters
View File

@ -37,6 +37,9 @@
<Filter Include="Fichiers d%27en-tête\DirectX Tool Kit"> <Filter Include="Fichiers d%27en-tête\DirectX Tool Kit">
<UniqueIdentifier>{d710c862-b37d-4ad5-aa92-2456f9745881}</UniqueIdentifier> <UniqueIdentifier>{d710c862-b37d-4ad5-aa92-2456f9745881}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Assets\Texture">
<UniqueIdentifier>{4873a73d-d11c-4d40-b847-b6d7fef4b23d}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Main.cpp"> <ClCompile Include="Main.cpp">
@ -361,15 +364,63 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="papier.tga">
<Filter>assets</Filter>
</Image>
<Image Include="dirt01.tga">
<Filter>assets</Filter>
</Image>
<Image Include="KhaoticIcon.ico"> <Image Include="KhaoticIcon.ico">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
<Image Include="alpha01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="dirt01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="font01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="ground01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="light01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="marble01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="moss01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="normal01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="spec02.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="sprite01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="sprite02.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="sprite03.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="sprite04.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="stone01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="wall.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="wall01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="water01.png">
<Filter>Assets\Texture</Filter>
</Image>
<Image Include="stone01.tga">
<Filter>Assets\Texture</Filter>
</Image>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
@ -409,30 +460,12 @@
<CopyFileToFolders Include="font01.tga"> <CopyFileToFolders Include="font01.tga">
<Filter>fonts</Filter> <Filter>fonts</Filter>
</CopyFileToFolders> </CopyFileToFolders>
<CopyFileToFolders Include="stone01.tga">
<Filter>assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="cube.txt"> <CopyFileToFolders Include="cube.txt">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</CopyFileToFolders> </CopyFileToFolders>
<CopyFileToFolders Include="plane.txt"> <CopyFileToFolders Include="plane.txt">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</CopyFileToFolders> </CopyFileToFolders>
<CopyFileToFolders Include="alpha01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="light01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="moss01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="normal01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="spec02.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="sprite01.tga"> <CopyFileToFolders Include="sprite01.tga">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</CopyFileToFolders> </CopyFileToFolders>
@ -520,18 +553,9 @@
<CopyFileToFolders Include="water.vs"> <CopyFileToFolders Include="water.vs">
<Filter>shader</Filter> <Filter>shader</Filter>
</CopyFileToFolders> </CopyFileToFolders>
<CopyFileToFolders Include="wall.tga">
<Filter>assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="water01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="bath.txt"> <CopyFileToFolders Include="bath.txt">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</CopyFileToFolders> </CopyFileToFolders>
<CopyFileToFolders Include="marble01.tga">
<Filter>Assets</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="water.txt"> <CopyFileToFolders Include="water.txt">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</CopyFileToFolders> </CopyFileToFolders>
@ -557,7 +581,7 @@
<Filter>shader</Filter> <Filter>shader</Filter>
</CopyFileToFolders> </CopyFileToFolders>
<CopyFileToFolders Include="C:\Users\Bacon\Downloads\BricksDragfacedRunning008\Bricks2K.png"> <CopyFileToFolders Include="C:\Users\Bacon\Downloads\BricksDragfacedRunning008\Bricks2K.png">
<Filter>Assets</Filter> <Filter>Assets\Texture</Filter>
</CopyFileToFolders> </CopyFileToFolders>
</ItemGroup> </ItemGroup>
</Project> </Project>

BIN
enginecustom/font01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
enginecustom/ground01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 MiB

2
enginecustom/imguiManager.cpp
View File

@ -205,7 +205,7 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app)
ofn.lpstrFile = szFile; ofn.lpstrFile = szFile;
ofn.lpstrFile[0] = '\0'; ofn.lpstrFile[0] = '\0';
ofn.nMaxFile = sizeof(szFile); ofn.nMaxFile = sizeof(szFile);
ofn.lpstrFilter = L"Texture\0*.tga\0"; ofn.lpstrFilter = L"Texture\0*.png\0";
ofn.nFilterIndex = 1; ofn.nFilterIndex = 1;
ofn.lpstrFileTitle = NULL; ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = 0; ofn.nMaxFileTitle = 0;

BIN
enginecustom/light01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 164 KiB

BIN
enginecustom/light01.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 MiB

BIN
enginecustom/marble01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 MiB

BIN
enginecustom/marble01.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 MiB

BIN
enginecustom/moss01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 MiB

BIN
enginecustom/moss01.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 MiB

BIN
enginecustom/normal01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 599 KiB

BIN
enginecustom/normal01.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 MiB

BIN
enginecustom/spec02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 148 KiB

BIN
enginecustom/spec02.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 MiB

BIN
enginecustom/sprite01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
enginecustom/sprite02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
enginecustom/sprite03.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
enginecustom/sprite04.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
enginecustom/stone01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 917 KiB

BIN
enginecustom/wall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 934 KiB

BIN
enginecustom/wall.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 768 KiB

BIN
enginecustom/wall01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
enginecustom/water01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 161 KiB

BIN
enginecustom/water01.tga
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 256 KiB