gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

# Rewrite of the game's simulation system

Browse Source 
Giant merge from
http://svn.wildfiregames.com/hg-source/file/5fb522019d5e
Infrastructure is largely complete, gameplay is largely missing
Disabled by default; use command-line flag "-sim2"
(Second attempt at commit...)

This was SVN commit r7259.
This commit is contained in:
Ykkrosh
2010-01-09 19:20:14 +00:00
parent 3339aea2a7
commit 7c2e9027c2
480 changed files with 16454 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scripting/ScriptingHost.cpp
+15 -94
View File
@@ -24,6 +24,7 @@
#include "ps/Profile.h"
#include "ps/CLogger.h"
#include "ps/Filesystem.h"
#include "scriptinterface/ScriptInterface.h"
#if OS_WIN
@@ -43,7 +44,7 @@ namespace
JSClass GlobalClass =
{
"global", 0,
"global", JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_PropertyStub,
JS_EnumerateStub, JS_ResolveStub,
@@ -85,14 +86,18 @@ ScriptingHost::ScriptingHost()
if( JS_DefineProperties( m_Context, m_GlobalObject, ScriptGlobalTable ) == JS_FALSE )
throw PSERROR_Scripting_SetupFailed();
m_ScriptInterface = new ScriptInterface("Engine", m_Context);
}
ScriptingHost::~ScriptingHost()
{
delete m_ScriptInterface;
if (m_Context != NULL)
{
JS_EndRequest(m_Context);
JS_DestroyContext(m_Context);
JS_DestroyContext(m_Context);
m_Context = NULL;
}
@@ -103,6 +108,11 @@ ScriptingHost::~ScriptingHost()
}
}
ScriptInterface& ScriptingHost::GetScriptInterface()
{
return *m_ScriptInterface;
}
void ScriptingHost::FinalShutdown()
{
// This should only be called once per process, just to clean up before
@@ -186,27 +196,6 @@ void ScriptingHost::DefineConstant(const std::string & name, int value)
throw PSERROR_Scripting_DefineConstantFailed();
}
void ScriptingHost::DefineConstant(const std::string & name, double value)
{
// First remove this constant if it already exists
JS_DeleteProperty(m_Context, m_GlobalObject, name.c_str());
struct JSConstDoubleSpec spec[2];
spec[0].name = name.c_str();
spec[0].dval = value;
spec[0].flags = JSPROP_READONLY;
spec[1].name = 0;
spec[1].dval = 0.0;
spec[1].flags = 0;
JSBool ok = JS_DefineConstDoubles(m_Context, m_GlobalObject, spec);
if (ok == JS_FALSE)
throw PSERROR_Scripting_DefineConstantFailed();
}
void ScriptingHost::DefineCustomObjectType(JSClass *clasp, JSNative constructor, uintN minArgs, JSPropertySpec *ps, JSFunctionSpec *fs, JSPropertySpec *static_ps, JSFunctionSpec *static_fs)
{
std::string typeName = clasp->name;
@@ -292,67 +281,12 @@ void ScriptingHost::SetGlobal(const std::string &globalName, jsval value)
JS_SetProperty(m_Context, m_GlobalObject, globalName.c_str(), &value);
}
// unused
jsval ScriptingHost::GetGlobal(const std::string &globalName)
{
jsval vp;
JS_GetProperty(m_Context, m_GlobalObject, globalName.c_str(), &vp);
return vp;
}
//----------------------------------------------------------------------------
// conversions
//----------------------------------------------------------------------------
/*
// These have been removed in favour of ToPrimitive<int>(value)
int ScriptingHost::ValueToInt(const jsval value)
{
int32 i = 0;
JSBool ok = JS_ValueToInt32(m_Context, value, &i);
if (!ok)
throw PSERROR_Scripting_ConversionFailed();
return i;
}
bool ScriptingHost::ValueToBool(const jsval value)
{
JSBool b;
JSBool ok = JS_ValueToBoolean(m_Context, value, &b);
if (!ok)
throw PSERROR_Scripting_ConversionFailed();
return b == JS_TRUE;
}
double ScriptingHost::ValueToDouble(const jsval value)
{
jsdouble d;
JSBool ok = JS_ValueToNumber(m_Context, value, &d);
if (ok == JS_FALSE || !isfinite(d))
throw PSERROR_Scripting_ConversionFailed();
return d;
}
*/
std::string ScriptingHost::ValueToString(const jsval value)
{
JSString* string = JS_ValueToString(m_Context, value);
@@ -363,19 +297,6 @@ std::string ScriptingHost::ValueToString(const jsval value)
}
CStrW ScriptingHost::ValueToUCString( const jsval value )
{
return CStrW(ValueToUTF16(value));
}
jsval ScriptingHost::UCStringToValue( const CStrW& str )
{
utf16string utf16=str.utf16();
return UTF16ToValue(utf16);
}
utf16string ScriptingHost::ValueToUTF16( const jsval value )
{
JSString* string = JS_ValueToString(m_Context, value);
if (string == NULL)
@@ -383,12 +304,12 @@ utf16string ScriptingHost::ValueToUTF16( const jsval value )
jschar *strptr=JS_GetStringChars(string);
size_t length=JS_GetStringLength(string);
return utf16string(strptr, strptr+length);
return std::wstring(strptr, strptr+length);
}
jsval ScriptingHost::UTF16ToValue(const utf16string &str)
jsval ScriptingHost::UCStringToValue( const CStrW& str )
{
return STRING_TO_JSVAL(JS_NewUCStringCopyZ(m_Context, str.c_str()));
return STRING_TO_JSVAL(JS_NewUCStringCopyZ(m_Context, str.utf16().c_str()));
}
//----------------------------------------------------------------------------