Added support for rendering billboards for script nodes instead of a model/box

Resource/script/CScriptObject.cpp

@@ -10,6 +10,7 @@ CScriptObject::CScriptObject(CGameArea *pArea, CScriptLayer *pLayer, CScriptTemp
     mpProperties = nullptr;
     mpTemplate->AddObject(this);
     mpDisplayModel = nullptr;
+    mpBillboard = nullptr;
     mpCollision = nullptr;
 }
 
@@ -37,6 +38,7 @@ void CScriptObject::EvaluateProperties()
     mpLightParameters = mpTemplate->FindLightParameters(mpProperties);
     mVolumeShape = mpTemplate->VolumeShape(this);
     EvaluateDisplayModel();
+    EvaluateBillboard();
     EvaluateCollisionModel();
 }
 
@@ -46,6 +48,12 @@ void CScriptObject::EvaluateDisplayModel()
     mModelToken = CToken(mpDisplayModel);
 }
 
+void CScriptObject::EvaluateBillboard()
+{
+    mpBillboard = mpTemplate->FindBillboardTexture(mpProperties);
+    mBillboardToken = CToken(mpBillboard);
+}
+
 void CScriptObject::EvaluateCollisionModel()
 {
     mpCollision = mpTemplate->FindCollision(mpProperties);
@@ -198,6 +206,11 @@ CModel* CScriptObject::GetDisplayModel() const
     return mpDisplayModel;
 }
 
+CTexture* CScriptObject::GetBillboard() const
+{
+    return mpBillboard;
+}
+
 CCollisionMeshGroup* CScriptObject::GetCollision() const
 {
     return mpCollision;

Resource/script/CScriptObject.h

@@ -32,8 +32,10 @@ class CScriptObject
     CBoolProperty *mpActive;
     CPropertyStruct *mpLightParameters;
     CModel *mpDisplayModel;
+    CTexture *mpBillboard;
     CCollisionMeshGroup *mpCollision;
     CToken mModelToken;
+    CToken mBillboardToken;
     CToken mCollisionToken;
     EVolumeShape mVolumeShape;
 
@@ -44,6 +46,7 @@ public:
     void CopyFromTemplate(CScriptTemplate *pTemp, u32 propCount);
     void EvaluateProperties();
     void EvaluateDisplayModel();
+    void EvaluateBillboard();
     void EvaluateCollisionModel();
 
     CScriptTemplate* Template() const;
@@ -73,6 +76,7 @@ public:
     void SetActive(bool isActive);
     CPropertyStruct* LightParameters() const;
     CModel* GetDisplayModel() const;
+    CTexture* GetBillboard() const;
     CCollisionMeshGroup* GetCollision() const;
     EVolumeShape VolumeShape() const;
 };

Resource/script/CScriptTemplate.cpp

@@ -210,10 +210,12 @@ CPropertyStruct* CScriptTemplate::FindLightParameters(CPropertyStruct *pProperti
     return TFetchProperty<CPropertyStruct*, eStructProperty>(pProperties, mLightParametersIDString);
 }
 
+// todo: merge these three functions, they have near-identical code
 CModel* CScriptTemplate::FindDisplayModel(CPropertyStruct *pProperties)
 {
     for (auto it = mAssets.begin(); it != mAssets.end(); it++)
     {
+        if ((it->AssetType != SEditorAsset::eModel) && (it->AssetType != SEditorAsset::eAnimParams)) continue;
         CResource *pRes = nullptr;
 
         // File
@@ -249,10 +251,45 @@ CModel* CScriptTemplate::FindDisplayModel(CPropertyStruct *pProperties)
     return nullptr;
 }
 
+CTexture* CScriptTemplate::FindBillboardTexture(CPropertyStruct *pProperties)
+{
+    for (auto it = mAssets.begin(); it != mAssets.end(); it++)
+    {
+        if (it->AssetType != SEditorAsset::eBillboard) continue;
+        CResource *pRes = nullptr;
+
+        // File
+        if (it->AssetSource == SEditorAsset::eFile)
+        {
+            TString path = "../resources/" + it->AssetLocation;
+            pRes = gResCache.GetResource(path);
+        }
+
+        // Property
+        else
+        {
+            CPropertyBase *pProp = pProperties->PropertyByIDString(it->AssetLocation);
+
+            if (pProp->Type() == eFileProperty)
+            {
+                CFileProperty *pFile = static_cast<CFileProperty*>(pProp);
+                pRes = pFile->Get();
+            }
+        }
+
+        // Verify resource exists + is correct type
+        if (pRes && (pRes->Type() == eTexture))
+            return static_cast<CTexture*>(pRes);
+    }
+
+    return nullptr;
+}
+
 CCollisionMeshGroup* CScriptTemplate::FindCollision(CPropertyStruct *pProperties)
 {
     for (auto it = mAssets.begin(); it != mAssets.end(); it++)
     {
+        if (it->AssetType != SEditorAsset::eCollision) continue;
         CResource *pRes = nullptr;
 
         // File

Resource/script/CScriptTemplate.h

@@ -48,7 +48,7 @@ private:
     struct SEditorAsset
     {
         enum {
-            eModel, eAnimParams, eCollision
+            eModel, eAnimParams, eBillboard, eCollision
         } AssetType;
 
         enum {
@@ -115,6 +115,7 @@ public:
     CBoolProperty* FindActive(CPropertyStruct *pProperties);
     CPropertyStruct* FindLightParameters(CPropertyStruct *pProperties);
     CModel* FindDisplayModel(CPropertyStruct *pProperties);
+    CTexture* FindBillboardTexture(CPropertyStruct *pProperties);
     CCollisionMeshGroup* FindCollision(CPropertyStruct *pProperties);
     bool HasPosition();