Ykkrosh
22dd4dd67b
Maps: Stored non-entity objects in XML instead of PMP, for easier manual editing. Updated existing maps to newest format, so that they can still work. Added undocumented _rewriteMaps() JS function. Also renamed _mem to vmem, and reclassified its undocumentedness as unintentional, since it's reasonably useful. Loader: added NonprogressiveLoad function, for ScEd/_rewriteMaps/etc which don't care about progressiveness. main.cpp: re-enabled vfs_display, since it doesn't crash now Vector3D: stopped warning This was SVN commit r2078.
343 lines
10 KiB
C++
Executable File
343 lines
10 KiB
C++
Executable File
#include "precompiled.h"
|
|
|
|
#include "JSInterface_Vector3D.h"
|
|
#include "scripting/JSConversions.h"
|
|
#include "scripting/ScriptingHost.h"
|
|
|
|
JSClass JSI_Vector3D::JSI_class = {
|
|
"Vector3D", JSCLASS_HAS_PRIVATE,
|
|
JS_PropertyStub, JS_PropertyStub,
|
|
JSI_Vector3D::getProperty, JSI_Vector3D::setProperty,
|
|
JS_EnumerateStub, JS_ResolveStub,
|
|
JS_ConvertStub, JSI_Vector3D::finalize,
|
|
NULL, NULL, NULL, NULL
|
|
};
|
|
|
|
JSPropertySpec JSI_Vector3D::JSI_props[] =
|
|
{
|
|
{ "x", JSI_Vector3D::component_x, JSPROP_ENUMERATE },
|
|
{ "y", JSI_Vector3D::component_y, JSPROP_ENUMERATE },
|
|
{ "z", JSI_Vector3D::component_z, JSPROP_ENUMERATE },
|
|
{ 0 }
|
|
};
|
|
|
|
JSFunctionSpec JSI_Vector3D::JSI_methods[] =
|
|
{
|
|
{ "toString", JSI_Vector3D::toString, 0, 0, 0 },
|
|
{ "add", JSI_Vector3D::add, 1, 0, 0 },
|
|
{ "subtract", JSI_Vector3D::subtract, 1, 0, 0 },
|
|
{ "minus", JSI_Vector3D::subtract, 1, 0, 0 },
|
|
{ "negate", JSI_Vector3D::negate, 1, 0, 0 },
|
|
{ "scale", JSI_Vector3D::scale, 1, 0, 0 },
|
|
{ "multiply", JSI_Vector3D::scale, 1, 0, 0 },
|
|
{ "divide", JSI_Vector3D::divide, 1, 0, 0 },
|
|
{ "dot", JSI_Vector3D::dot, 1, 0, 0 },
|
|
{ "cross", JSI_Vector3D::cross, 1, 0, 0 },
|
|
{ "length", JSI_Vector3D::length, 0, 0, 0 },
|
|
{ "normalize", JSI_Vector3D::normalize, 0, 0, 0 },
|
|
{ 0 }
|
|
};
|
|
|
|
void JSI_Vector3D::init()
|
|
{
|
|
g_ScriptingHost.DefineCustomObjectType( &JSI_class, JSI_Vector3D::construct, 0, JSI_props, JSI_methods, NULL, NULL );
|
|
}
|
|
|
|
JSI_Vector3D::Vector3D_Info::Vector3D_Info()
|
|
{
|
|
owner = NULL;
|
|
vector = new CVector3D();
|
|
}
|
|
|
|
JSI_Vector3D::Vector3D_Info::Vector3D_Info( float x, float y, float z )
|
|
{
|
|
owner = NULL;
|
|
vector = new CVector3D( x, y, z );
|
|
}
|
|
|
|
JSI_Vector3D::Vector3D_Info::Vector3D_Info( const CVector3D& copy )
|
|
{
|
|
owner = NULL;
|
|
vector = new CVector3D( copy.X, copy.Y, copy.Z );
|
|
}
|
|
|
|
JSI_Vector3D::Vector3D_Info::Vector3D_Info( CVector3D* attach, IPropertyOwner* _owner )
|
|
{
|
|
owner = _owner;
|
|
updateFn = NULL;
|
|
freshenFn = NULL;
|
|
vector = attach;
|
|
}
|
|
|
|
JSI_Vector3D::Vector3D_Info::Vector3D_Info( CVector3D* attach, IPropertyOwner* _owner, void( IPropertyOwner::*_updateFn )(void) )
|
|
{
|
|
owner = _owner;
|
|
updateFn = _updateFn;
|
|
freshenFn = NULL;
|
|
vector = attach;
|
|
}
|
|
|
|
JSI_Vector3D::Vector3D_Info::Vector3D_Info( CVector3D* attach, IPropertyOwner* _owner, void( IPropertyOwner::*_updateFn )(void), void( IPropertyOwner::*_freshenFn )(void) )
|
|
{
|
|
owner = _owner;
|
|
updateFn = _updateFn;
|
|
freshenFn = _freshenFn;
|
|
vector = attach;
|
|
}
|
|
|
|
JSI_Vector3D::Vector3D_Info::~Vector3D_Info()
|
|
{
|
|
if( !owner ) delete( vector );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::getProperty( JSContext* cx, JSObject* obj, jsval id, jsval* vp )
|
|
{
|
|
if( !JSVAL_IS_INT( id ) )
|
|
return( JS_TRUE );
|
|
|
|
Vector3D_Info* vectorInfo = (Vector3D_Info*)JS_GetPrivate( cx, obj );
|
|
if( !vectorInfo )
|
|
{
|
|
JS_ReportError( cx, "[Vector3D] Invalid reference" );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
CVector3D* vectorData = vectorInfo->vector;
|
|
|
|
if( vectorInfo->owner && vectorInfo->freshenFn ) ( (vectorInfo->owner)->*(vectorInfo->freshenFn) )();
|
|
|
|
switch( g_ScriptingHost.ValueToInt( id ) )
|
|
{
|
|
case component_x: *vp = DOUBLE_TO_JSVAL( JS_NewDouble( cx, vectorData->X ) ); return( JS_TRUE );
|
|
case component_y: *vp = DOUBLE_TO_JSVAL( JS_NewDouble( cx, vectorData->Y ) ); return( JS_TRUE );
|
|
case component_z: *vp = DOUBLE_TO_JSVAL( JS_NewDouble( cx, vectorData->Z ) ); return( JS_TRUE );
|
|
}
|
|
|
|
return( JS_FALSE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::setProperty( JSContext* cx, JSObject* obj, jsval id, jsval* vp )
|
|
{
|
|
if( !JSVAL_IS_INT( id ) )
|
|
return( JS_TRUE );
|
|
|
|
Vector3D_Info* vectorInfo = (Vector3D_Info*)JS_GetPrivate( cx, obj );
|
|
if( !vectorInfo )
|
|
{
|
|
JS_ReportError( cx, "[Vector3D] Invalid reference" );
|
|
return( JS_TRUE );
|
|
}
|
|
CVector3D* vectorData = vectorInfo->vector;
|
|
|
|
if( vectorInfo->owner && vectorInfo->freshenFn ) ( (vectorInfo->owner)->*(vectorInfo->freshenFn) )();
|
|
|
|
switch( g_ScriptingHost.ValueToInt( id ) )
|
|
{
|
|
case component_x: vectorData->X = (float)g_ScriptingHost.ValueToDouble( *vp ); break;
|
|
case component_y: vectorData->Y = (float)g_ScriptingHost.ValueToDouble( *vp ); break;
|
|
case component_z: vectorData->Z = (float)g_ScriptingHost.ValueToDouble( *vp ); break;
|
|
}
|
|
|
|
|
|
if( vectorInfo->owner && vectorInfo->updateFn ) ( (vectorInfo->owner)->*(vectorInfo->updateFn) )();
|
|
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::construct( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
JSObject* vector = JS_NewObject( cx, &JSI_Vector3D::JSI_class, NULL, NULL );
|
|
|
|
if( argc == 0 )
|
|
{
|
|
JS_SetPrivate( cx, vector, new Vector3D_Info() );
|
|
*rval = OBJECT_TO_JSVAL( vector );
|
|
return( JS_TRUE );
|
|
}
|
|
else if( argc == 3 )
|
|
{
|
|
try
|
|
{
|
|
float x = (float)g_ScriptingHost.ValueToDouble( argv[0] );
|
|
float y = (float)g_ScriptingHost.ValueToDouble( argv[1] );
|
|
float z = (float)g_ScriptingHost.ValueToDouble( argv[2] );
|
|
JS_SetPrivate( cx, vector, new Vector3D_Info( x, y, z ) );
|
|
*rval = OBJECT_TO_JSVAL( vector );
|
|
return( JS_TRUE );
|
|
}
|
|
catch (PSERROR_Scripting_ConversionFailed)
|
|
{
|
|
// Invalid input (i.e. can't be coerced into doubles) - fail
|
|
JS_ReportError( cx, "Invalid parameters to Vector3D constructor" );
|
|
*rval = JSVAL_NULL;
|
|
return( JS_FALSE );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
JS_ReportError( cx, "Invalid number of parameters to Vector3D constructor" );
|
|
*rval = JSVAL_NULL;
|
|
return( JS_FALSE );
|
|
}
|
|
}
|
|
|
|
void JSI_Vector3D::finalize( JSContext* cx, JSObject* obj )
|
|
{
|
|
delete( (Vector3D_Info*)JS_GetPrivate( cx, obj ) );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::toString( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
char buffer[256];
|
|
Vector3D_Info* vectorInfo = (Vector3D_Info*)JS_GetPrivate( cx, obj );
|
|
|
|
if( !vectorInfo ) return( JS_TRUE );
|
|
|
|
if( vectorInfo->owner && vectorInfo->freshenFn ) ( (vectorInfo->owner)->*(vectorInfo->freshenFn) )();
|
|
|
|
CVector3D* vectorData = vectorInfo->vector;
|
|
snprintf( buffer, 256, "[object Vector3D: ( %f, %f, %f )]", vectorData->X, vectorData->Y, vectorData->Z );
|
|
buffer[255] = 0;
|
|
*rval = STRING_TO_JSVAL( JS_NewStringCopyZ( cx, buffer ) );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
CVector3D* JSI_Vector3D::GetVector( JSContext* cx, JSObject* obj )
|
|
{
|
|
Vector3D_Info* vectorInfo = (Vector3D_Info*)JS_GetInstancePrivate( cx, obj, &JSI_class, NULL );
|
|
if( !vectorInfo )
|
|
{
|
|
JS_ReportError( cx, "[Vector3D] Invalid reference" );
|
|
return( NULL );
|
|
}
|
|
if( vectorInfo->owner && vectorInfo->freshenFn ) ( (vectorInfo->owner)->*(vectorInfo->freshenFn) )();
|
|
return( vectorInfo->vector );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::add( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *a, *b;
|
|
if( !( a = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
if( ( argc == 0 ) || !JSVAL_IS_OBJECT( argv[0] ) || !( b = GetVector( cx, JSVAL_TO_OBJECT( argv[0] ) ) ) )
|
|
{
|
|
JS_ReportError( cx, "[Vector3D] Invalid parameter" );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSObject* vector3d = JS_NewObject( g_ScriptingHost.getContext(), &JSI_Vector3D::JSI_class, NULL, NULL );
|
|
JS_SetPrivate( g_ScriptingHost.getContext(), vector3d, new JSI_Vector3D::Vector3D_Info( *a + *b ) );
|
|
*rval = OBJECT_TO_JSVAL( vector3d );
|
|
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::subtract( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *a, *b;
|
|
if( !( a = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
if( ( argc == 0 ) || !JSVAL_IS_OBJECT( argv[0] ) || !( b = GetVector( cx, JSVAL_TO_OBJECT( argv[0] ) ) ) )
|
|
{
|
|
JS_ReportError( cx, "[Vector3D] Invalid parameter" );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSObject* vector3d = JS_NewObject( g_ScriptingHost.getContext(), &JSI_Vector3D::JSI_class, NULL, NULL );
|
|
JS_SetPrivate( g_ScriptingHost.getContext(), vector3d, new JSI_Vector3D::Vector3D_Info( *a - *b ) );
|
|
*rval = OBJECT_TO_JSVAL( vector3d );
|
|
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::negate( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *v;
|
|
if( !( v = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
|
|
*rval = ToJSVal( -( *v ) );
|
|
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::scale( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *v; float f;
|
|
if( !( v = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
if( ( argc == 0 ) || !ToPrimitive( cx, argv[0], f ) )
|
|
{
|
|
JS_ReportError( cx, "Invalid parameter" );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSObject* vector3d = JS_NewObject( g_ScriptingHost.getContext(), &JSI_Vector3D::JSI_class, NULL, NULL );
|
|
JS_SetPrivate( g_ScriptingHost.getContext(), vector3d, new JSI_Vector3D::Vector3D_Info( *v * f ) );
|
|
*rval = OBJECT_TO_JSVAL( vector3d );
|
|
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::divide( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *v; float f;
|
|
if( !( v = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
if( ( argc == 0 ) || !ToPrimitive( cx, argv[0], f ) )
|
|
{
|
|
JS_ReportError( cx, "Invalid parameter" );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSObject* vector3d = JS_NewObject( g_ScriptingHost.getContext(), &JSI_Vector3D::JSI_class, NULL, NULL );
|
|
JS_SetPrivate( g_ScriptingHost.getContext(), vector3d, new JSI_Vector3D::Vector3D_Info( *v * ( 1.0f / f ) ) );
|
|
*rval = OBJECT_TO_JSVAL( vector3d );
|
|
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::dot( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *a, *b;
|
|
if( !( a = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
if( ( argc == 0 ) || !JSVAL_IS_OBJECT( argv[0] ) || !( b = GetVector( cx, JSVAL_TO_OBJECT( argv[0] ) ) ) )
|
|
{
|
|
JS_ReportError( cx, "[Vector3D] Invalid parameter" );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
*rval = ToJSVal( a->Dot( *b ) );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::cross( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *a, *b;
|
|
if( !( a = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
if( ( argc == 0 ) || !JSVAL_IS_OBJECT( argv[0] ) || !( b = GetVector( cx, JSVAL_TO_OBJECT( argv[0] ) ) ) )
|
|
{
|
|
JS_ReportError( cx, "[Vector3D] Invalid parameter" );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
*rval = ToJSVal( a->Cross( *b ) );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::length( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *v;
|
|
if( !( v = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
|
|
*rval = ToJSVal( v->GetLength() );
|
|
return( JS_TRUE );
|
|
}
|
|
|
|
JSBool JSI_Vector3D::normalize( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
CVector3D *v;
|
|
if( !( v = GetVector( cx, obj ) ) ) return( JS_TRUE );
|
|
|
|
CVector3D r( v->X, v->Y, v->Z );
|
|
r.Normalize();
|
|
|
|
*rval = ToJSVal( r );
|
|
return( JS_TRUE );
|
|
}
|