TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code duplication prune. should aid in stability

Browse source
This commit is contained in:
AzaezelX 2021-10-03 02:56:26 -05:00
parent 10f2453cee
commit 98a079a797
123 changed files with 632 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Engine/source/terrain/terrMaterial.cpp
View file

@ -73,11 +73,11 @@ TerrainMaterial::TerrainMaterial()
mIsSRGB(false),
mInvertRoughness(false)
{
INIT_IMAGEASSET(DiffuseMap);
INIT_IMAGEASSET(NormalMap);
INIT_IMAGEASSET(DetailMap);
INIT_IMAGEASSET(ORMConfigMap);
INIT_IMAGEASSET(MacroMap);
INIT_ASSET(DiffuseMap);
INIT_ASSET(NormalMap);
INIT_ASSET(DetailMap);
INIT_ASSET(ORMConfigMap);
INIT_ASSET(MacroMap);
}
TerrainMaterial::~TerrainMaterial()
@ -203,8 +203,8 @@ TerrainMaterial* TerrainMaterial::findOrCreate( const char *nameOrPath )
//material.getDiffuseMap(); //returns the raw file referenced
//material.getDiffuseMapAsset(); //returns the asset id
//material.setDiffuseMap(%texture); //tries to set the asset and failing that attempts a flat file reference
DEF_IMAGEASSET_BINDS(TerrainMaterial, DiffuseMap);
DEF_IMAGEASSET_BINDS(TerrainMaterial, NormalMap);
DEF_IMAGEASSET_BINDS(TerrainMaterial, DetailMap);
DEF_IMAGEASSET_BINDS(TerrainMaterial, ORMConfigMap);
DEF_IMAGEASSET_BINDS(TerrainMaterial, MacroMap);
DEF_ASSET_BINDS(TerrainMaterial, DiffuseMap);
DEF_ASSET_BINDS(TerrainMaterial, NormalMap);
DEF_ASSET_BINDS(TerrainMaterial, DetailMap);
DEF_ASSET_BINDS(TerrainMaterial, ORMConfigMap);
DEF_ASSET_BINDS(TerrainMaterial, MacroMap);

10
Engine/source/terrain/terrMaterial.h
View file

@ -43,7 +43,7 @@ protected:
//AssetPtr<ImageAsset> mDiffuseAsset;
DECLARE_IMAGEASSET(TerrainMaterial, DiffuseMap, onDiffuseMapChanged, GFXStaticTextureSRGBProfile);
DECLARE_IMAGEASSET_SETGET(TerrainMaterial, DiffuseMap);
DECLARE_ASSET_SETGET(TerrainMaterial, DiffuseMap);
/// The size of the diffuse base map in meters
/// used to generate its texture coordinates.
@ -51,11 +51,11 @@ protected:
///
DECLARE_IMAGEASSET(TerrainMaterial, NormalMap, onNormalMapChanged, GFXNormalMapProfile);
DECLARE_IMAGEASSET_SETGET(TerrainMaterial, NormalMap);
DECLARE_ASSET_SETGET(TerrainMaterial, NormalMap);
///
DECLARE_IMAGEASSET(TerrainMaterial, DetailMap, onDetailMapChanged, GFXStaticTextureProfile);
DECLARE_IMAGEASSET_SETGET(TerrainMaterial, DetailMap);
DECLARE_ASSET_SETGET(TerrainMaterial, DetailMap);
/// The size of the detail map in meters used
/// to generate the texture coordinates for the
@ -70,7 +70,7 @@ protected:
///
DECLARE_IMAGEASSET(TerrainMaterial, ORMConfigMap, onORMConfigMapChanged, GFXStaticTextureProfile);
DECLARE_IMAGEASSET_SETGET(TerrainMaterial, ORMConfigMap);
DECLARE_ASSET_SETGET(TerrainMaterial, ORMConfigMap);
bool mIsSRGB;
bool mInvertRoughness;
@ -82,7 +82,7 @@ protected:
bool mSideProjection;
DECLARE_IMAGEASSET(TerrainMaterial, MacroMap, onMacroMapChanged, GFXStaticTextureProfile);
DECLARE_IMAGEASSET_SETGET(TerrainMaterial, MacroMap);
DECLARE_ASSET_SETGET(TerrainMaterial, MacroMap);
F32 mMacroSize;
F32 mMacroStrength;
F32 mMacroDistance;