Adds some in-progress gameObject recreation of various legacy game classes, such as PlayerObject, AIPlayerObject, Sound Emitter and Static Shape.

Engine/source/T3D/assets/GameObjectAsset.cpp

@@ -139,6 +139,44 @@ void GameObjectAsset::onAssetRefresh()
       Con::executeFile(mScriptFilePath, false, false);
 }
 
+const char* GameObjectAsset::create()
+{
+   if (!Platform::isFile(mTAMLFilePath))
+      return "";
+
+   // Set the format mode.
+   Taml taml;
+
+   // Yes, so set it.
+   taml.setFormatMode(Taml::getFormatModeEnum("xml"));
+
+   // Turn-off auto-formatting.
+   taml.setAutoFormat(false);
+
+   // Read object.
+   SimObject* pSimObject = taml.read(mTAMLFilePath);
+
+   // Did we find the object?
+   if (pSimObject == NULL)
+   {
+      // No, so warn.
+      Con::warnf("GameObjectAsset::create() - Could not read object from file '%s'.", mTAMLFilePath);
+      return "";
+   }
+
+   //Flag it so we know where it came from
+   pSimObject->setDataField("GameObject", nullptr, getAssetId());
+
+   return pSimObject->getIdString();
+}
+
+DefineEngineMethod(GameObjectAsset, createObject, const char*, (),,
+   "Creates an instance of the given GameObject given the asset definition.\n"
+   "@return The GameObject entity created from the asset.")
+{
+   return object->create();
+}
+
 //-----------------------------------------------------------------------------
 // GuiInspectorTypeAssetId
 //-----------------------------------------------------------------------------
@@ -161,34 +199,50 @@ void GuiInspectorTypeGameObjectAssetPtr::consoleInit()
 GuiControl* GuiInspectorTypeGameObjectAssetPtr::constructEditControl()
 {
    // Create base filename edit controls
-   GuiControl *retCtrl = Parent::constructEditControl();
-   if (retCtrl == NULL)
-      return retCtrl;
+   // Create "Open in ShapeEditor" button
+   mGameObjectEditButton = new GuiButtonCtrl();
 
    // Change filespec
    char szBuffer[512];
-   dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"GameObjectAsset\", \"AssetBrowser.changeAsset\", %d, %s);",
-      mInspector->getComponentGroupTargetId(), mCaption);
-   mBrowseButton->setField("Command", szBuffer);
+   dSprintf(szBuffer, sizeof(szBuffer), "%d.onClick(%s);", this->getId(), mCaption);
+   mGameObjectEditButton->setField("Command", szBuffer);
 
-   // Create "Open in ShapeEditor" button
-   mSMEdButton = new GuiBitmapButtonCtrl();
+   mGameObjectEditButton->setDataField(StringTable->insert("Profile"), NULL, "GuiButtonProfile");
+   mGameObjectEditButton->setDataField(StringTable->insert("tooltipprofile"), NULL, "GuiToolTipProfile");
+   mGameObjectEditButton->setDataField(StringTable->insert("hovertime"), NULL, "1000");
 
-   dSprintf(szBuffer, sizeof(szBuffer), "echo(\"Game Object Editor not implemented yet!\");", retCtrl->getId());
-   mSMEdButton->setField("Command", szBuffer);
+   const char* assetId = getData();
 
-   char bitmapName[512] = "tools/worldEditor/images/toolbar/shape-editor";
-   mSMEdButton->setBitmap(bitmapName);
+   if (assetId == "")
+   {
+      mGameObjectEditButton->setText("Create Game Object");
 
-   mSMEdButton->setDataField(StringTable->insert("Profile"), NULL, "GuiButtonProfile");
-   mSMEdButton->setDataField(StringTable->insert("tooltipprofile"), NULL, "GuiToolTipProfile");
-   mSMEdButton->setDataField(StringTable->insert("hovertime"), NULL, "1000");
-   mSMEdButton->setDataField(StringTable->insert("tooltip"), NULL, "Open this file in the State Machine Editor");
+      mGameObjectEditButton->setDataField(StringTable->insert("tooltip"), NULL, "Convert this object into a reusable Game Object asset.");
+   }
+   else
+   {
+      GameObjectAsset* goAsset = AssetDatabase.acquireAsset< GameObjectAsset>(assetId);
 
-   mSMEdButton->registerObject();
-   addObject(mSMEdButton);
+      if (goAsset)
+      {
+         mGameObjectEditButton->setText("Edit Game Object");
 
-   return retCtrl;
+         mGameObjectEditButton->setDataField(StringTable->insert("tooltip"), NULL, "Edit this object instance or Game Object asset.");
+      }
+      else
+      {
+         mGameObjectEditButton->setText("Create Game Object");
+
+         mGameObjectEditButton->setDataField(StringTable->insert("tooltip"), NULL, "Convert this object into a reusable Game Object asset.");
+      }
+   }
+
+   //mGameObjectEditButton->registerObject();
+   _registerEditControl(mGameObjectEditButton);
+
+   addObject(mGameObjectEditButton);
+
+   return mGameObjectEditButton;
 }
 
 bool GuiInspectorTypeGameObjectAssetPtr::updateRects()
@@ -199,19 +253,12 @@ bool GuiInspectorTypeGameObjectAssetPtr::updateRects()
    Point2I fieldPos = getPosition();
 
    mCaptionRect.set(0, 0, fieldExtent.x - dividerPos - dividerMargin, fieldExtent.y);
-   mEditCtrlRect.set(fieldExtent.x - dividerPos + dividerMargin, 1, dividerPos - dividerMargin - 34, fieldExtent.y);
+   mEditCtrlRect.set(fieldExtent.x - dividerPos + dividerMargin, 1, dividerPos - dividerMargin, fieldExtent.y);
 
    bool resized = mEdit->resize(mEditCtrlRect.point, mEditCtrlRect.extent);
-   if (mBrowseButton != NULL)
+   if (mGameObjectEditButton != NULL)
    {
-      mBrowseRect.set(fieldExtent.x - 32, 2, 14, fieldExtent.y - 4);
-      resized |= mBrowseButton->resize(mBrowseRect.point, mBrowseRect.extent);
-   }
-
-   if (mSMEdButton != NULL)
-   {
-      RectI shapeEdRect(fieldExtent.x - 16, 2, 14, fieldExtent.y - 4);
-      resized |= mSMEdButton->resize(shapeEdRect.point, shapeEdRect.extent);
+      resized |= mGameObjectEditButton->resize(mEditCtrlRect.point, mEditCtrlRect.extent);
    }
 
    return resized;

Engine/source/T3D/assets/GameObjectAsset.h

@@ -59,6 +59,8 @@ public:
    static void initPersistFields();
    virtual void copyTo(SimObject* object);
 
+   const char* create();
+
    /// Declare Console Object.
    DECLARE_CONOBJECT(GameObjectAsset);
 
@@ -73,12 +75,12 @@ DefineConsoleType(TypeGameObjectAssetPtr, GameObjectAsset)
 //-----------------------------------------------------------------------------
 // TypeAssetId GuiInspectorField Class
 //-----------------------------------------------------------------------------
-class GuiInspectorTypeGameObjectAssetPtr : public GuiInspectorTypeFileName
+class GuiInspectorTypeGameObjectAssetPtr : public GuiInspectorField
 {
-   typedef GuiInspectorTypeFileName Parent;
+   typedef GuiInspectorField Parent;
 public:
 
-   GuiBitmapButtonCtrl  *mSMEdButton;
+   GuiButtonCtrl  *mGameObjectEditButton;
 
    DECLARE_CONOBJECT(GuiInspectorTypeGameObjectAssetPtr);
    static void consoleInit();

Engine/source/T3D/gameObjects/aiPlayerObject.cpp

@@ -0,0 +1,42 @@
+#include "aiPlayerObject.h"
+
+IMPLEMENT_CO_NETOBJECT_V1(AIPlayerObject);
+
+AIPlayerObject::AIPlayerObject()
+   : mAIControllerComponent(nullptr)
+{
+
+}
+AIPlayerObject::~AIPlayerObject()
+{
+
+}
+
+bool AIPlayerObject::onAdd()
+{
+   if (!Parent::onAdd())
+      return false;
+
+   //If we don't delinate from the template, just spawn as apropos here
+   if (!mDirtyGameObject)
+   {
+      //AI Controller
+      mAIControllerComponent = new AIControllerComponent();
+      if (!mAIControllerComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add mAIControllerComponent!");
+         return false;
+      }
+
+      mAIControllerComponent->setInternalName("aiControllerComponent");
+
+      addComponent(mAIControllerComponent);
+   }
+
+   return true;
+}
+
+void AIPlayerObject::onRemove()
+{
+   Parent::onRemove();
+}

Engine/source/T3D/gameObjects/aiPlayerObject.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "playerObject.h"
+
+#include "T3D/components/ai/aiControllerComponent.h"
+
+class AIPlayerObject : public PlayerObject
+{
+   typedef PlayerObject Parent;
+
+   AIControllerComponent* mAIControllerComponent;
+
+public:
+   AIPlayerObject();
+   ~AIPlayerObject();
+
+   virtual bool onAdd();
+   virtual void onRemove();
+
+   DECLARE_CONOBJECT(AIPlayerObject);
+};

Engine/source/T3D/gameObjects/playerObject.cpp

@@ -0,0 +1,165 @@
+#include "playerObject.h"
+
+IMPLEMENT_CO_NETOBJECT_V1(PlayerObject);
+
+PlayerObject::PlayerObject()
+   :  mMeshComponent(nullptr),
+      mCollisionComponent(nullptr),
+      mAnimationComponent(nullptr),
+      mPhysicsComponent(nullptr)
+{
+
+}
+PlayerObject::~PlayerObject()
+{
+
+}
+
+bool PlayerObject::onAdd()
+{
+   if (!Parent::onAdd())
+      return false;
+
+   //If we don't delinate from the template, just spawn as apropos here
+   if (!mDirtyGameObject)
+   {
+      //Mesh
+      mMeshComponent = new MeshComponent();
+      if (!mMeshComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add MeshComponent!");
+         return false;
+      }
+
+      mMeshComponent->setInternalName("meshComponent");
+
+      addComponent(mMeshComponent);
+
+      //Collision
+      mCollisionComponent = new ShapeCollisionComponent();
+      if (!mCollisionComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add ShapeCollisionComponent!");
+         return false;
+      }
+
+      mCollisionComponent->setInternalName("collisionComponent");
+
+      addComponent(mCollisionComponent);
+
+      //Animation
+      mAnimationComponent = new ActionAnimationComponent();
+      if (!mAnimationComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add ActionAnimationComponent!");
+         return false;
+      }
+
+      mAnimationComponent->setInternalName("animationComponent");
+
+      addComponent(mAnimationComponent);
+
+      //Arm Animation
+      mArmAnimationComponent = new ArmAnimationComponent();
+      if (!mArmAnimationComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add ArmAnimationComponent!");
+         return false;
+      }
+
+      mArmAnimationComponent->setInternalName("armAnimationComponent");
+
+      addComponent(mArmAnimationComponent);
+
+      //Physics control
+      mPhysicsComponent = new PlayerControllerComponent();
+      if (!mPhysicsComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add PhysicsComponent!");
+         return false;
+      }
+
+      mPhysicsComponent->setInternalName("physicsComponent");
+
+      addComponent(mPhysicsComponent);
+
+      //State Machine
+      mStateMachineComponent = new StateMachineComponent();
+      if (!mStateMachineComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add StateMachineComponent!");
+         return false;
+      }
+
+      mStateMachineComponent->setInternalName("stateMachineComponent");
+
+      addComponent(mStateMachineComponent);
+
+      //Camera
+      mCameraComponent = new CameraComponent();
+      if (!mCameraComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add CameraComponent!");
+         return false;
+      }
+
+      mCameraComponent->setInternalName("cameraComponent");
+
+      addComponent(mCameraComponent);
+
+      //Camera Orbiter
+      mCameraOrbiterComponent = new CameraOrbiterComponent();
+      if (!mCameraOrbiterComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add CameraOrbiterComponent!");
+         return false;
+      }
+
+      mCameraOrbiterComponent->setInternalName("cameraOrbiterComponent");
+
+      addComponent(mCameraOrbiterComponent);
+
+      //Control Object
+      mControlObjectComponent = new ControlObjectComponent();
+      if (!mControlObjectComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add ControlObjectComponent!");
+         return false;
+      }
+
+      mControlObjectComponent->setInternalName("controlObjectComponent");
+
+      addComponent(mControlObjectComponent);
+
+      //Sound
+      mSoundComponent = new SoundComponent();
+      if (!mSoundComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add SoundComponent!");
+         return false;
+      }
+
+      mSoundComponent->setInternalName("soundComponent");
+
+      addComponent(mSoundComponent);
+
+      //Interaction
+      mInteractComponent = new InteractComponent();
+      if (!mInteractComponent->registerObject())
+      {
+         Con::errorf("PlayerObject::onAdd - unable to add InteractComponent!");
+         return false;
+      }
+
+      mInteractComponent->setInternalName("interactComponent");
+
+      addComponent(mInteractComponent);
+   }
+
+   return true;
+}
+
+void PlayerObject::onRemove()
+{
+   Parent::onRemove();
+}

Engine/source/T3D/gameObjects/playerObject.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include "T3D/entity.h"
+#include "T3D/components/render/meshComponent.h"
+#include "T3D/components/collision/shapeCollisionComponent.h"
+#include "T3D/components/animation/actionAnimationComponent.h"
+#include "T3D/components/animation/armAnimationComponent.h"
+#include "T3D/components/physics/playerControllerComponent.h"
+#include "T3D/components/game/stateMachineComponent.h"
+#include "T3D/components/camera/cameraComponent.h"
+#include "T3D/components/camera/cameraOrbiterComponent.h"
+#include "T3D/components/game/controlObjectComponent.h"
+#include "T3D/components/audio/soundComponent.h"
+#include "T3D/components/game/interactComponent.h"
+
+class PlayerObject : public Entity
+{
+   typedef Entity Parent;
+
+   MeshComponent* mMeshComponent;
+   ShapeCollisionComponent* mCollisionComponent;
+   ActionAnimationComponent* mAnimationComponent;
+   ArmAnimationComponent* mArmAnimationComponent;
+   PlayerControllerComponent* mPhysicsComponent;
+   StateMachineComponent* mStateMachineComponent;
+   CameraComponent* mCameraComponent;
+   CameraOrbiterComponent* mCameraOrbiterComponent;
+   ControlObjectComponent* mControlObjectComponent;
+   SoundComponent* mSoundComponent;
+   InteractComponent* mInteractComponent;
+
+public:
+   PlayerObject();
+   ~PlayerObject();
+
+   virtual bool onAdd();
+   virtual void onRemove();
+
+   DECLARE_CONOBJECT(PlayerObject);
+};

Engine/source/T3D/gameObjects/soundEmitterObject.cpp

@@ -0,0 +1,38 @@
+#include "SoundEmitterObject.h"
+
+IMPLEMENT_CO_NETOBJECT_V1(SoundEmitterObject);
+
+SoundEmitterObject::SoundEmitterObject()
+   :  mSoundComponent(nullptr)
+{
+
+}
+SoundEmitterObject::~SoundEmitterObject()
+{
+
+}
+
+bool SoundEmitterObject::onAdd()
+{
+   if (!Parent::onAdd())
+      return false;
+
+   //Sound
+   mSoundComponent = new SoundComponent();
+   if (!mSoundComponent->registerObject())
+   {
+      Con::errorf("SoundEmitterObject::onAdd - unable to add soundComponent!");
+      return false;
+   }
+
+   mSoundComponent->setInternalName("soundComponent");
+   
+   addComponent(mSoundComponent);
+
+   return true;
+}
+
+void SoundEmitterObject::onRemove()
+{
+   Parent::onRemove();
+}

Engine/source/T3D/gameObjects/soundEmitterObject.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "T3D/entity.h"
+#include "T3D/components/audio/soundComponent.h"
+
+class SoundEmitterObject : public Entity
+{
+   typedef Entity Parent;
+
+   SoundComponent* mSoundComponent;
+
+public:
+   SoundEmitterObject();
+   ~SoundEmitterObject();
+
+   virtual bool onAdd();
+   virtual void onRemove();
+
+   DECLARE_CONOBJECT(SoundEmitterObject);
+};

Engine/source/T3D/gameObjects/staticShapeObject.cpp

@@ -0,0 +1,68 @@
+#include "staticShapeObject.h"
+
+IMPLEMENT_CO_NETOBJECT_V1(StaticShapeObject);
+
+StaticShapeObject::StaticShapeObject()
+   :  mMeshComponent(nullptr),
+      mCollisionComponent(nullptr),
+      mAnimationComponent(nullptr)
+{
+
+}
+StaticShapeObject::~StaticShapeObject()
+{
+
+}
+
+bool StaticShapeObject::onAdd()
+{
+   if (!Parent::onAdd())
+      return false;
+
+   //If we don't delinate from the template, just spawn as apropos here
+   if (!mDirtyGameObject)
+   {
+      //Mesh
+      mMeshComponent = new MeshComponent();
+      if (!mMeshComponent->registerObject())
+      {
+         Con::errorf("StaticShapeObject::onAdd - unable to add MeshComponent!");
+         return false;
+      }
+
+      mMeshComponent->setInternalName("meshComponent");
+
+      addComponent(mMeshComponent);
+
+      //Collision
+      mCollisionComponent = new ShapeCollisionComponent();
+      if (!mCollisionComponent->registerObject())
+      {
+         Con::errorf("StaticShapeObject::onAdd - unable to add ShapeCollisionComponent!");
+         return false;
+      }
+
+      mCollisionComponent->setInternalName("collisionComponent");
+
+      addComponent(mCollisionComponent);
+
+      //Animation
+      mAnimationComponent = new AnimationComponent();
+      if (!mAnimationComponent->registerObject())
+      {
+         Con::errorf("StaticShapeObject::onAdd - unable to add AnimationComponent!");
+         return false;
+      }
+
+      mAnimationComponent->setInternalName("animationComponent");
+
+      addComponent(mAnimationComponent);
+   }
+
+   return true;
+}
+
+void StaticShapeObject::onRemove()
+{
+   Parent::onRemove();
+}

Engine/source/T3D/gameObjects/staticShapeObject.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "T3D/entity.h"
+#include "T3D/components/render/meshComponent.h"
+#include "T3D/components/collision/shapeCollisionComponent.h"
+#include "T3D/components/animation/animationComponent.h"
+
+class StaticShapeObject : public Entity
+{
+   typedef Entity Parent;
+
+   MeshComponent* mMeshComponent;
+   ShapeCollisionComponent* mCollisionComponent;
+   AnimationComponent* mAnimationComponent;
+
+public:
+   StaticShapeObject();
+   ~StaticShapeObject();
+
+   virtual bool onAdd();
+   virtual void onRemove();
+
+   MeshComponent* getMeshComponent() { return mMeshComponent; }
+   ShapeCollisionComponent* getCollisionComponent() { return mCollisionComponent; }
+   AnimationComponent* getAnimationComponent() { return mAnimationComponent; }
+
+   DECLARE_CONOBJECT(StaticShapeObject);
+};