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

Corrected profile for GameObjectAsset type field button

Browse source 
Initial implementation of changeable TSStatic materials via material slots and drag and drop of material assets onto world editor from AB
Updated Volumetric Fog to support ShapeAsset for it's model data
Added cmake option to hide literal filename fields if the class supports asset fields for the same input
Added light viz modes to see diffuse, specular and detail lighting modes(currently just sun)
New raycast console function to return back material of hit object
Moved GameObject logic to SceneObject and started fixing up of editor behavior to allow any SceneObject to be converted into a GO, along with all supported behavior such as instance-template management and spawning GO via drag-and-drop from AB
Fixed inspector field tooltip text to be positioned in inspector footer properly again
Drag and drop of shape asset attempts to drop at raycast position now, instead of just at the camera ray position
This commit is contained in:
Areloch 2019-12-05 20:42:47 -06:00
parent 551df5e92a
commit 09c651c26d
25 changed files with 572 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/source/T3D/tsStatic.h
View file

@ -108,8 +108,9 @@ class TSStatic : public SceneObject
TransformMask = Parent::NextFreeMask << 0,
AdvancedStaticOptionsMask = Parent::NextFreeMask << 1,
UpdateCollisionMask = Parent::NextFreeMask << 2,
SkinMask = Parent::NextFreeFlag << 3,
NextFreeMask = Parent::NextFreeMask << 4
SkinMask = Parent::NextFreeMask << 3,
MaterialMask = Parent::NextFreeMask << 4,
NextFreeMask = Parent::NextFreeMask << 5
};
public:
@ -137,6 +138,16 @@ protected:
F32 mAlphaFade;
bool mInvertAlphaFade;
struct matMap
{
MaterialAsset* matAsset;
String assetId;
U32 slot;
};
Vector<matMap> mChangingMaterials;
Vector<matMap> mMaterials;
bool onAdd();
void onRemove();
@ -163,6 +174,8 @@ protected:
virtual void interpolateTick( F32 delta );
virtual void advanceTime( F32 dt );
virtual void onDynamicModified(const char* slotName, const char* newValue);
/// Start or stop processing ticks depending on our state.
void _updateShouldTick();
@ -261,6 +274,8 @@ public:
virtual void onInspect(GuiInspector*);
void updateMaterials();
private:
virtual void onStaticModified(const char* slotName, const char*newValue = NULL);
protected: