mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-28 23:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fairly major XML/entprop changes; some more minor stuff that fell out as a consequence.

Browse Source 
This was SVN commit r1220.
This commit is contained in:
MarkT
2004-10-07 19:23:35 +00:00
parent e260a5eb8e
commit 2ab625720b
37 changed files with 1788 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scripting/ScriptGlue.cpp
+31 -6
View File
@@ -9,6 +9,7 @@
#include "EntityManager.h"
#include "BaseEntityCollection.h"
#include "Scheduler.h"
#include "timer.h"
#include "Game.h"
#include "Network/Server.h"
@@ -17,6 +18,7 @@
#include "ps/i18n.h"
#include "scripting/JSInterface_Entity.h"
#include "scripting/JSCollection.h"
#include "scripting/JSInterface_BaseEntity.h"
#include "scripting/JSInterface_Vector3D.h"
#include "gui/scripting/JSInterface_IGUIObject.h"
@@ -58,6 +60,7 @@ JSFunctionSpec ScriptFunctionTable[] =
{"exit", exitProgram, 0, 0, 0 },
{"crash", crash, 0, 0, 0 },
{"forceGC", forceGC, 0, 0, 0 },
{"_mem", js_mem, 0, 0, 0 }, // Intentionally undocumented
{0, 0, 0, 0, 0},
};
@@ -76,6 +79,7 @@ JSPropertySpec ScriptGlobalTable[] =
{ "groups", GLOBAL_GROUPSARRAY, JSPROP_PERMANENT, JSI_Selection::getGroups, JSI_Selection::setGroups },
{ "camera", GLOBAL_CAMERA, JSPROP_PERMANENT, JSI_Camera::getCamera, JSI_Camera::setCamera },
{ "console", GLOBAL_CONSOLE, JSPROP_PERMANENT | JSPROP_READONLY, JSI_Console::getConsole, NULL },
{ "entities", 0, JSPROP_PERMANENT | JSPROP_READONLY, GetEntitySet, NULL },
{ 0, 0, 0, 0, 0 },
};
@@ -128,8 +132,8 @@ JSBool getEntityByHandle( JSContext* context, JSObject* UNUSEDPARAM(globalObject
*rval = JSVAL_NULL;
return( JS_TRUE );
}
JSObject* entity = JS_NewObject( context, &JSI_Entity::JSI_class, NULL, NULL );
JS_SetPrivate( context, entity, v );
JSObject* entity = (*v)->GetScript();
*rval = OBJECT_TO_JSVAL( entity );
return( JS_TRUE );
}
@@ -152,12 +156,22 @@ JSBool getEntityTemplate( JSContext* context, JSObject* UNUSEDPARAM(globalObject
if( !v )
{
*rval = JSVAL_NULL;
JS_ReportError( context, "No such template: %ls", (const wchar_t*)templateName );
JS_ReportError( context, "No such template: %s", CStr8(templateName).c_str() );
return( JS_TRUE );
}
JSObject* baseEntity = JS_NewObject( context, &JSI_BaseEntity::JSI_class, NULL, NULL );
JS_SetPrivate( context, baseEntity, v );
*rval = OBJECT_TO_JSVAL( baseEntity );
*rval = OBJECT_TO_JSVAL( v->GetScript() );
return( JS_TRUE );
}
JSBool GetEntitySet( JSContext* context, JSObject* globalObject, jsval argv, jsval* vp )
{
std::vector<HEntity>* extant = g_EntityManager.getExtant();
*vp = OBJECT_TO_JSVAL( EntityCollection::Create( *extant ) );
delete( extant );
return( JS_TRUE );
}
@@ -245,6 +259,17 @@ JSBool cancelInterval( JSContext* UNUSEDPARAM(context), JSObject* UNUSEDPARAM(gl
return( JS_TRUE );
}
JSBool forceGC( JSContext* cx, JSObject* obj, unsigned int argc, jsval* argv, jsval* rval )
{
double time = get_time();
JS_GC( cx );
time = get_time() - time;
g_Console->InsertMessage( L"Garbage collection completed in: %f", time );
*rval = JSVAL_TRUE;
return( JS_TRUE );
}
JSBool getGUIGlobal( JSContext* UNUSEDPARAM(context), JSObject* UNUSEDPARAM(globalObject), unsigned int UNUSEDPARAM(argc), jsval* UNUSEDPARAM(argv), jsval* rval )
{
*rval = OBJECT_TO_JSVAL( g_GUI.GetScriptObject() );