Skip to content

refactor(scriptengine): Remove ReloadAllTextures and call the asset manager directly #3672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OmarAglan wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −182
Open

refactor(scriptengine): Remove ReloadAllTextures and call the asset manager directly #3672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ set(GAMEENGINEDEVICE_SRC
Include/W3DDevice/GameClient/TerrainTex.h
Include/W3DDevice/GameClient/TileData.h
# Include/W3DDevice/GameClient/W3DAssetManager.h
# Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
# Include/W3DDevice/GameClient/W3DBibBuffer.h
# Include/W3DDevice/GameClient/W3DBridgeBuffer.h
# Include/W3DDevice/GameClient/W3DBufferManager.h
Expand Down Expand Up @@ -144,7 +143,6 @@ set(GAMEENGINEDEVICE_SRC
Source/W3DDevice/GameClient/TerrainTex.cpp
Source/W3DDevice/GameClient/TileData.cpp
# Source/W3DDevice/GameClient/W3DAssetManager.cpp
# Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
# Source/W3DDevice/GameClient/W3DBibBuffer.cpp
# Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static HMODULE st_DebugDLL;
#define DEFINE_PARTICLE_SYSTEM_NAMES 1
#include "GameClient/ParticleSys.h"
#include "Common/MapObject.h"
#include "../../GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h"
#include "WW3D2/assetmgr.h"

static void _addUpdatedParticleSystem( AsciiString particleSystemName );
static void _appendAllParticleSystems();
Expand Down Expand Up @@ -9655,7 +9655,7 @@ static void _updateCurrentParticleCount()
static void _reloadTextures()
{
// Need no interaction with the particle editor now.
ReloadAllTextures();
WW3DAssetManager::Get_Instance()->Release_All_Textures();
}

#ifdef DO_VTUNE_STUFF
Expand Down
2 changes: 0 additions & 2 deletions Generals/Code/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/TerrainTex.h
# Include/W3DDevice/GameClient/TileData.h
Include/W3DDevice/GameClient/W3DAssetManager.h
Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
Include/W3DDevice/GameClient/W3DBibBuffer.h
Include/W3DDevice/GameClient/W3DBridgeBuffer.h
Include/W3DDevice/GameClient/W3DBufferManager.h
Expand Down Expand Up @@ -129,7 +128,6 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/TerrainTex.cpp
# Source/W3DDevice/GameClient/TileData.cpp
Source/W3DDevice/GameClient/W3DAssetManager.cpp
Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
Source/W3DDevice/GameClient/W3DBibBuffer.cpp
Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
# Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
Expand Down
52 changes: 0 additions & 52 deletions Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static HMODULE st_DebugDLL;
#define DEFINE_PARTICLE_SYSTEM_NAMES 1
#include "GameClient/ParticleSys.h"
#include "Common/MapObject.h"
#include "../../GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h"
#include "WW3D2/assetmgr.h"

static void _addUpdatedParticleSystem( AsciiString particleSystemName );
static void _appendAllParticleSystems();
Expand Down Expand Up @@ -10356,7 +10356,7 @@ static void _updateCurrentParticleCount()
static void _reloadTextures()
{
// Need no interaction with the particle editor now.
ReloadAllTextures();
WW3DAssetManager::Get_Instance()->Release_All_Textures();
}

#ifdef DO_VTUNE_STUFF
Expand Down
2 changes: 0 additions & 2 deletions GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/TerrainTex.h
# Include/W3DDevice/GameClient/TileData.h
Include/W3DDevice/GameClient/W3DAssetManager.h
Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
Include/W3DDevice/GameClient/W3DBibBuffer.h
Include/W3DDevice/GameClient/W3DBridgeBuffer.h
Include/W3DDevice/GameClient/W3DBufferManager.h
Expand Down Expand Up @@ -140,7 +139,6 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/TerrainTex.cpp
# Source/W3DDevice/GameClient/TileData.cpp
Source/W3DDevice/GameClient/W3DAssetManager.cpp
Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
Source/W3DDevice/GameClient/W3DBibBuffer.cpp
Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
# Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
Expand Down
52 changes: 0 additions & 52 deletions GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DAssetManagerExposed.cpp
View file
Open in desktop

This file was deleted.

Loading