janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
35 lines
1.2 KiB
C++
35 lines
1.2 KiB
C++
#include "scripting/ScriptableObject.h"
|
|
|
|
#ifndef INCLUDED_SCRIPTCUSTOMTYPES
|
|
#define INCLUDED_SCRIPTCUSTOMTYPES
|
|
|
|
// Custom object types
|
|
|
|
// Whilst Point2d is fully coded, it is never registered so is not available in script
|
|
// This is mostly as a demonstration of what you need to code to add a new type
|
|
|
|
// VECTOR2D
|
|
extern JSClass Point2dClass;
|
|
extern JSPropertySpec Point2dProperties[];
|
|
JSBool Point2d_Constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
|
|
|
|
// Colour
|
|
struct SColour : public CJSObject<SColour>
|
|
{
|
|
public:
|
|
float r, g, b, a; /* 0...1 */
|
|
SColour() { SColourInit( 0.0f, 0.0f, 0.0f, 0.0f ); }
|
|
SColour( float r_, float g_, float b_ ) { SColourInit( r_, g_, b_, 1.0f ); }
|
|
SColour( float r_, float g_, float b_, float a_ ) { SColourInit( r_, g_, b_, a_ ); }
|
|
SColour( const SColour& other ) { SColourInit( other.r, other.g, other.b, other.a ); }
|
|
void SColourInit( float r, float g, float b, float a );
|
|
|
|
SColour &operator = (const SColour &o);
|
|
|
|
CStr ToString( JSContext* cx, uintN argc, jsval* argv );
|
|
static void ScriptingInit();
|
|
static JSBool Construct( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval );
|
|
};
|
|
|
|
#endif
|