Browse Source

For consistency with the Node class, refer to the ScriptInstance's contained object with "scriptObject" property instead of "object" in AngelScript scripting.

Lasse Öörni 11 years ago
parent
commit
bccc6d0c55
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Bin/Data/Scripts/05_AnimatingScene.as
  2. 1 1
      Source/Engine/Script/ScriptAPI.cpp

+ 1 - 1
Bin/Data/Scripts/05_AnimatingScene.as

@@ -69,7 +69,7 @@ void CreateScene()
         ScriptInstance@ instance = boxNode.CreateComponent("ScriptInstance");
         instance.CreateObject(scriptFile, "Rotator");
         // Retrieve the created script object and set its rotation speed member variable
-        Rotator@ rotator = cast<Rotator>(instance.object);
+        Rotator@ rotator = cast<Rotator>(instance.scriptObject);
         rotator.rotationSpeed = Vector3(10.0f, 20.0f, 30.0f);
     }
 

+ 1 - 1
Source/Engine/Script/ScriptAPI.cpp

@@ -276,7 +276,7 @@ static void RegisterScriptInstance(asIScriptEngine* engine)
     engine->RegisterObjectMethod("ScriptInstance", "void ClearDelayedExecute(const String&in declaration = String())", asMETHOD(ScriptInstance, ClearDelayedExecute), asCALL_THISCALL);
     engine->RegisterObjectMethod("ScriptInstance", "void set_scriptFile(ScriptFile@+)", asMETHOD(ScriptInstance, SetScriptFile), asCALL_THISCALL);
     engine->RegisterObjectMethod("ScriptInstance", "ScriptFile@+ get_scriptFile() const", asMETHOD(ScriptInstance, GetScriptFile), asCALL_THISCALL);
-    engine->RegisterObjectMethod("ScriptInstance", "ScriptObject@+ get_object() const", asMETHOD(ScriptInstance, GetScriptObject), asCALL_THISCALL);
+    engine->RegisterObjectMethod("ScriptInstance", "ScriptObject@+ get_scriptObject() const", asMETHOD(ScriptInstance, GetScriptObject), asCALL_THISCALL);
     engine->RegisterObjectMethod("ScriptInstance", "void set_className(const String&in)", asMETHOD(ScriptInstance, SetClassName), asCALL_THISCALL);
     engine->RegisterObjectMethod("ScriptInstance", "const String& get_className() const", asMETHOD(ScriptInstance, GetClassName), asCALL_THISCALL);
     engine->RegisterGlobalFunction("ScriptInstance@+ get_self()", asFUNCTION(GetSelf), asCALL_CDECL);