|
@@ -65,10 +65,10 @@ template <class T, class U> U* RefCast(T* t)
|
|
|
/// Template function for Vector to array conversion.
|
|
/// Template function for Vector to array conversion.
|
|
|
template <class T> CScriptArray* VectorToArray(const Vector<T>& vector, const char* arrayName)
|
|
template <class T> CScriptArray* VectorToArray(const Vector<T>& vector, const char* arrayName)
|
|
|
{
|
|
{
|
|
|
- asIScriptContext* context = asGetActiveContext();
|
|
|
|
|
|
|
+ Context* context = GetScriptContext();
|
|
|
if (context)
|
|
if (context)
|
|
|
{
|
|
{
|
|
|
- asITypeInfo* type = GetScriptContext()->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
|
|
|
|
+ asITypeInfo* type = context->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
@@ -83,10 +83,10 @@ template <class T> CScriptArray* VectorToArray(const Vector<T>& vector, const ch
|
|
|
/// Template function for PODVector to array conversion.
|
|
/// Template function for PODVector to array conversion.
|
|
|
template <class T> CScriptArray* VectorToArray(const PODVector<T>& vector, const char* arrayName)
|
|
template <class T> CScriptArray* VectorToArray(const PODVector<T>& vector, const char* arrayName)
|
|
|
{
|
|
{
|
|
|
- asIScriptContext* context = asGetActiveContext();
|
|
|
|
|
|
|
+ Context* context = GetScriptContext();
|
|
|
if (context)
|
|
if (context)
|
|
|
{
|
|
{
|
|
|
- asITypeInfo* type = GetScriptContext()->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
|
|
|
|
+ asITypeInfo* type = context->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
@@ -101,10 +101,10 @@ template <class T> CScriptArray* VectorToArray(const PODVector<T>& vector, const
|
|
|
/// Template function for data buffer to array conversion.
|
|
/// Template function for data buffer to array conversion.
|
|
|
template <class T> CScriptArray* BufferToArray(const T* buffer, unsigned size, const char* arrayName)
|
|
template <class T> CScriptArray* BufferToArray(const T* buffer, unsigned size, const char* arrayName)
|
|
|
{
|
|
{
|
|
|
- asIScriptContext* context = asGetActiveContext();
|
|
|
|
|
|
|
+ Context* context = GetScriptContext();
|
|
|
if (context)
|
|
if (context)
|
|
|
{
|
|
{
|
|
|
- asITypeInfo* type = GetScriptContext()->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
|
|
|
|
+ asITypeInfo* type = context->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
CScriptArray* arr = CScriptArray::Create(type, size);
|
|
CScriptArray* arr = CScriptArray::Create(type, size);
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
@@ -119,10 +119,10 @@ template <class T> CScriptArray* BufferToArray(const T* buffer, unsigned size, c
|
|
|
/// Template function for Vector to handle array conversion.
|
|
/// Template function for Vector to handle array conversion.
|
|
|
template <class T> CScriptArray* VectorToHandleArray(const Vector<T*>& vector, const char* arrayName)
|
|
template <class T> CScriptArray* VectorToHandleArray(const Vector<T*>& vector, const char* arrayName)
|
|
|
{
|
|
{
|
|
|
- asIScriptContext* context = asGetActiveContext();
|
|
|
|
|
|
|
+ Context* context = GetScriptContext();
|
|
|
if (context)
|
|
if (context)
|
|
|
{
|
|
{
|
|
|
- asITypeInfo* type = GetScriptContext()->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
|
|
|
|
+ asITypeInfo* type = context->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
@@ -143,10 +143,10 @@ template <class T> CScriptArray* VectorToHandleArray(const Vector<T*>& vector, c
|
|
|
/// Template function for PODVector to handle array conversion.
|
|
/// Template function for PODVector to handle array conversion.
|
|
|
template <class T> CScriptArray* VectorToHandleArray(const PODVector<T*>& vector, const char* arrayName)
|
|
template <class T> CScriptArray* VectorToHandleArray(const PODVector<T*>& vector, const char* arrayName)
|
|
|
{
|
|
{
|
|
|
- asIScriptContext* context = asGetActiveContext();
|
|
|
|
|
|
|
+ Context* context = GetScriptContext();
|
|
|
if (context)
|
|
if (context)
|
|
|
{
|
|
{
|
|
|
- asITypeInfo* type = GetScriptContext()->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
|
|
|
|
+ asITypeInfo* type = context->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
@@ -167,10 +167,10 @@ template <class T> CScriptArray* VectorToHandleArray(const PODVector<T*>& vector
|
|
|
/// Template function for shared pointer Vector to handle array conversion.
|
|
/// Template function for shared pointer Vector to handle array conversion.
|
|
|
template <class T> CScriptArray* VectorToHandleArray(const Vector<SharedPtr<T> >& vector, const char* arrayName)
|
|
template <class T> CScriptArray* VectorToHandleArray(const Vector<SharedPtr<T> >& vector, const char* arrayName)
|
|
|
{
|
|
{
|
|
|
- asIScriptContext* context = asGetActiveContext();
|
|
|
|
|
|
|
+ Context* context = GetScriptContext();
|
|
|
if (context)
|
|
if (context)
|
|
|
{
|
|
{
|
|
|
- asITypeInfo* type = GetScriptContext()->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
|
|
|
|
+ asITypeInfo* type = context->GetSubsystem<Script>()->GetObjectType(arrayName);
|
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
CScriptArray* arr = CScriptArray::Create(type, vector.Size());
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
for (unsigned i = 0; i < arr->GetSize(); ++i)
|
|
@@ -415,7 +415,7 @@ static const AttributeInfo& SerializableGetAttributeInfo(unsigned index, Seriali
|
|
|
const Vector<AttributeInfo>* attributes = ptr->GetAttributes();
|
|
const Vector<AttributeInfo>* attributes = ptr->GetAttributes();
|
|
|
if (!attributes || index >= attributes->Size())
|
|
if (!attributes || index >= attributes->Size())
|
|
|
{
|
|
{
|
|
|
- asGetActiveContext()->SetException("Index out of bounds");
|
|
|
|
|
|
|
+ GetActiveASContext()->SetException("Index out of bounds");
|
|
|
return noAttributeInfo;
|
|
return noAttributeInfo;
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -537,7 +537,7 @@ static Component* NodeGetComponent(unsigned index, Node* ptr)
|
|
|
const Vector<SharedPtr<Component> >& components = ptr->GetComponents();
|
|
const Vector<SharedPtr<Component> >& components = ptr->GetComponents();
|
|
|
if (index >= components.Size())
|
|
if (index >= components.Size())
|
|
|
{
|
|
{
|
|
|
- asGetActiveContext()->SetException("Index out of bounds");
|
|
|
|
|
|
|
+ GetActiveASContext()->SetException("Index out of bounds");
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -612,7 +612,7 @@ static Node* NodeGetChild(unsigned index, Node* ptr)
|
|
|
const Vector<SharedPtr<Node> >& children = ptr->GetChildren();
|
|
const Vector<SharedPtr<Node> >& children = ptr->GetChildren();
|
|
|
if (index >= children.Size())
|
|
if (index >= children.Size())
|
|
|
{
|
|
{
|
|
|
- asGetActiveContext()->SetException("Index out of bounds");
|
|
|
|
|
|
|
+ GetActiveASContext()->SetException("Index out of bounds");
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|