Browse Source

Renamed BillboardSet::Updated() to Commit() to match CustomGeometry API.

Lasse Öörni 12 years ago
parent
commit
cd88d22e36

+ 2 - 2
Bin/Data/Scripts/TestSceneOld.as

@@ -200,7 +200,7 @@ void InitScene()
             bb.rotation = Random() * 360;
             bb.rotation = Random() * 360;
             bb.enabled = true;
             bb.enabled = true;
         }
         }
-        billboard.Updated();
+        billboard.Commit();
 
 
         billboards.Push(newNode);
         billboards.Push(newNode);
     }
     }
@@ -266,7 +266,7 @@ void AnimateScene(float timeStep)
         BillboardSet@ billboard = billboards[i].GetComponent("BillboardSet");
         BillboardSet@ billboard = billboards[i].GetComponent("BillboardSet");
         for (uint j = 0; j < billboard.numBillboards; ++j)
         for (uint j = 0; j < billboard.numBillboards; ++j)
             billboard.billboards[j].rotation += 50 * timeStep;
             billboard.billboards[j].rotation += 50 * timeStep;
-        billboard.Updated();
+        billboard.Commit();
     }
     }
 }
 }
 
 

+ 1 - 1
Docs/ScriptAPI.dox

@@ -2592,7 +2592,7 @@ Methods:<br>
 - void Remove()
 - void Remove()
 - void MarkNetworkUpdate() const
 - void MarkNetworkUpdate() const
 - void DrawDebugGeometry(DebugRenderer@, bool)
 - void DrawDebugGeometry(DebugRenderer@, bool)
-- void Updated()
+- void Commit()
 
 
 Properties:<br>
 Properties:<br>
 - ShortStringHash type (readonly)
 - ShortStringHash type (readonly)

+ 1 - 1
Engine/Engine/GraphicsAPI.cpp

@@ -858,7 +858,7 @@ static void RegisterBillboardSet(asIScriptEngine* engine)
     engine->RegisterObjectProperty("Billboard", "bool enabled", offsetof(Billboard, enabled_));
     engine->RegisterObjectProperty("Billboard", "bool enabled", offsetof(Billboard, enabled_));
     
     
     RegisterDrawable<BillboardSet>(engine, "BillboardSet");
     RegisterDrawable<BillboardSet>(engine, "BillboardSet");
-    engine->RegisterObjectMethod("BillboardSet", "void Updated()", asMETHOD(BillboardSet, Updated), asCALL_THISCALL);
+    engine->RegisterObjectMethod("BillboardSet", "void Commit()", asMETHOD(BillboardSet, Commit), asCALL_THISCALL);
     engine->RegisterObjectMethod("BillboardSet", "void set_material(Material@+)", asMETHOD(BillboardSet, SetMaterial), asCALL_THISCALL);
     engine->RegisterObjectMethod("BillboardSet", "void set_material(Material@+)", asMETHOD(BillboardSet, SetMaterial), asCALL_THISCALL);
     engine->RegisterObjectMethod("BillboardSet", "Material@+ get_material() const", asMETHOD(BillboardSet, GetMaterial), asCALL_THISCALL);
     engine->RegisterObjectMethod("BillboardSet", "Material@+ get_material() const", asMETHOD(BillboardSet, GetMaterial), asCALL_THISCALL);
     engine->RegisterObjectMethod("BillboardSet", "void set_numBillboards(uint)", asMETHOD(BillboardSet, SetNumBillboards), asCALL_THISCALL);
     engine->RegisterObjectMethod("BillboardSet", "void set_numBillboards(uint)", asMETHOD(BillboardSet, SetNumBillboards), asCALL_THISCALL);

+ 7 - 7
Engine/Graphics/BillboardSet.cpp

@@ -174,25 +174,25 @@ void BillboardSet::SetNumBillboards(unsigned num)
     }
     }
     
     
     bufferSizeDirty_ = true;
     bufferSizeDirty_ = true;
-    Updated();
+    Commit();
 }
 }
 
 
 void BillboardSet::SetRelative(bool enable)
 void BillboardSet::SetRelative(bool enable)
 {
 {
     relative_ = enable;
     relative_ = enable;
-    Updated();
+    Commit();
 }
 }
 
 
 void BillboardSet::SetScaled(bool enable)
 void BillboardSet::SetScaled(bool enable)
 {
 {
     scaled_ = enable;
     scaled_ = enable;
-    Updated();
+    Commit();
 }
 }
 
 
 void BillboardSet::SetSorted(bool enable)
 void BillboardSet::SetSorted(bool enable)
 {
 {
     sorted_ = enable;
     sorted_ = enable;
-    Updated();
+    Commit();
 }
 }
 
 
 void BillboardSet::SetAnimationLodBias(float bias)
 void BillboardSet::SetAnimationLodBias(float bias)
@@ -201,7 +201,7 @@ void BillboardSet::SetAnimationLodBias(float bias)
     MarkNetworkUpdate();
     MarkNetworkUpdate();
 }
 }
 
 
-void BillboardSet::Updated()
+void BillboardSet::Commit()
 {
 {
     MarkPositionsDirty();
     MarkPositionsDirty();
     MarkNetworkUpdate();
     MarkNetworkUpdate();
@@ -240,7 +240,7 @@ void BillboardSet::SetBillboardsAttr(VariantVector value)
         i->enabled_ = value[index++].GetBool();
         i->enabled_ = value[index++].GetBool();
     }
     }
     
     
-    Updated();
+    Commit();
 }
 }
 
 
 void BillboardSet::SetNetBillboardsAttr(const PODVector<unsigned char>& value)
 void BillboardSet::SetNetBillboardsAttr(const PODVector<unsigned char>& value)
@@ -259,7 +259,7 @@ void BillboardSet::SetNetBillboardsAttr(const PODVector<unsigned char>& value)
         i->enabled_ = buf.ReadBool();
         i->enabled_ = buf.ReadBool();
     }
     }
     
     
-    Updated();
+    Commit();
 }
 }
 
 
 ResourceRef BillboardSet::GetMaterialAttr() const
 ResourceRef BillboardSet::GetMaterialAttr() const

+ 2 - 2
Engine/Graphics/BillboardSet.h

@@ -84,8 +84,8 @@ public:
     void SetSorted(bool enable);
     void SetSorted(bool enable);
     /// Set animation LOD bias.
     /// Set animation LOD bias.
     void SetAnimationLodBias(float bias);
     void SetAnimationLodBias(float bias);
-    /// Call after changing the billboards.
-    void Updated();
+    /// Mark for bounding box and vertex buffer update. Call after modifying the billboards.
+    void Commit();
     
     
     /// Return material.
     /// Return material.
     Material* GetMaterial() const;
     Material* GetMaterial() const;

+ 1 - 1
Engine/Graphics/CustomGeometry.h

@@ -82,7 +82,7 @@ public:
     void DefineColor(const Color& color);
     void DefineColor(const Color& color);
     /// Define a vertex UV coordinate.
     /// Define a vertex UV coordinate.
     void DefineTexCoord(const Vector2& texCoord);
     void DefineTexCoord(const Vector2& texCoord);
-    /// Commit all geometries to the vertex buffer and calculate the bounding box.
+    /// Update vertex buffer and calculate the bounding box. Call after finishing defining geometry.
     void Commit();
     void Commit();
     /// Set material on all geometries.
     /// Set material on all geometries.
     void SetMaterial(Material* material);
     void SetMaterial(Material* material);

+ 5 - 5
Engine/Graphics/ParticleEmitter.cpp

@@ -117,7 +117,7 @@ void ParticleEmitter::Update(const FrameInfo& frame)
     if (particles_.Size() != billboards_.Size())
     if (particles_.Size() != billboards_.Size())
         SetNumBillboards(particles_.Size());
         SetNumBillboards(particles_.Size());
     
     
-    bool needBillboardUpdate = false;
+    bool needCommit = false;
     
     
     // Check active/inactive period switching
     // Check active/inactive period switching
     periodTimer_ += lastTimeStep_;
     periodTimer_ += lastTimeStep_;
@@ -146,7 +146,7 @@ void ParticleEmitter::Update(const FrameInfo& frame)
         {
         {
             emissionTimer_ -= Lerp(intervalMin_, intervalMax_, Random(1.0f));
             emissionTimer_ -= Lerp(intervalMin_, intervalMax_, Random(1.0f));
             if (EmitNewParticle())
             if (EmitNewParticle())
-                needBillboardUpdate = true;
+                needCommit = true;
         }
         }
     }
     }
     
     
@@ -164,7 +164,7 @@ void ParticleEmitter::Update(const FrameInfo& frame)
         
         
         if (billboard.enabled_)
         if (billboard.enabled_)
         {
         {
-            needBillboardUpdate = true;
+            needCommit = true;
             
             
             // Time to live
             // Time to live
             if (particle.timer_ >= particle.timeToLive_)
             if (particle.timer_ >= particle.timeToLive_)
@@ -229,8 +229,8 @@ void ParticleEmitter::Update(const FrameInfo& frame)
         }
         }
     }
     }
     
     
-    if (needBillboardUpdate)
-        Updated();
+    if (needCommit)
+        Commit();
 }
 }
 
 
 bool ParticleEmitter::SetParameters(XMLFile* file)
 bool ParticleEmitter::SetParameters(XMLFile* file)