TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #317 from Areloch/ShapeBaseDataAssetify

Browse source 
Implements hook-look-up logic for shape assets to ShapeBaseData including autoimport handling
This commit is contained in:
Brian Roberts 2020-11-27 18:04:16 -06:00 • committed by GitHub
commit 6441ecd941
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/shapeBase.h
View file

@ -67,6 +67,10 @@
#include "console/dynamicTypes.h"
#endif
#ifndef SHAPEASSET_H
#include "T3D/assets/ShapeAsset.h"
#endif
// Need full definition visible for SimObjectPtr<ParticleEmitter>
#include "T3D/fx/particleEmitter.h"
@ -536,6 +540,10 @@ public:
StringTableEntry shapeName;
AssetPtr<ShapeAsset> shapeAsset;
StringTableEntry shapeAssetId;
StringTableEntry cloakTexName;
String cubeDescName;