TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 00:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2190 from Areloch/AssetCodeCleanupRoundOne

Browse source 
Some code cleanup on assets, entities and components, round 1
This commit is contained in:
Areloch 2018-02-13 14:54:50 -06:00 • committed by GitHub
commit e18661d861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 59 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -90,14 +90,9 @@ ConsoleSetType(TypeImageAssetPtr)
//-----------------------------------------------------------------------------
ImageAsset::ImageAsset()
ImageAsset::ImageAsset() : AssetBase(), mImage(nullptr), mUseMips(true), mIsHDRImage(false), mIsValidImage(false)
{
mImageFileName = StringTable->EmptyString();
mImage = NULL;
mUseMips = true;
mIsHDRImage = false;
mIsValidImage = false;
}
//-----------------------------------------------------------------------------

5
Engine/source/T3D/assets/ImageAsset.h
View file

@ -47,11 +47,6 @@ class ImageAsset : public AssetBase
{
typedef AssetBase Parent;
AssetManager* mpOwningAssetManager;
bool mAssetInitialized;
AssetDefinition* mpAssetDefinition;
U32 mAcquireReferenceCount;
StringTableEntry mImageFileName;
GFXTexHandle mImage;

4
Engine/source/T3D/assets/LevelAsset.cpp
View file

@ -90,10 +90,12 @@ ConsoleSetType(TypeLevelAssetPtr)
//-----------------------------------------------------------------------------
LevelAsset::LevelAsset()
LevelAsset::LevelAsset() : AssetBase(), mIsSubLevel(false)
{
mLevelFile = StringTable->EmptyString();
mPreviewImage = StringTable->EmptyString();
mMainLevelAsset = StringTable->EmptyString();
}
//-----------------------------------------------------------------------------

2
Engine/source/T3D/assets/ScriptAsset.cpp
View file

@ -89,7 +89,7 @@ ConsoleSetType(TypeScriptAssetPtr)
//-----------------------------------------------------------------------------
ScriptAsset::ScriptAsset()
ScriptAsset::ScriptAsset() : AssetBase(), mIsServerSide(true)
{
mScriptFilePath = StringTable->EmptyString();
}