godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

3D Physics and Other Stuff

Browse Source 
-=-=-=-=-=-=-=-=-=-=-=-=-=

-New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too.
-A lot of fixes to the 3D physics engine
-Added KinematicBody with demo
-Fixed the space query API for 2D (demo will come soon). 3D is WIP.
-Fixed long-standing bug with body_enter/body_exit for Area and Area2D
-Performance variables now includes physics (active bodies, collision pairs and islands)
-Ability to see what's inside of instanced scenes!
-Fixed Blend Shapes (no bs+skeleton yet)
-Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
This commit is contained in:
Juan Linietsky
2014-09-02 23:13:40 -03:00
parent 89fa70706f
commit 1a2cb755e2
82 changed files with 5161 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
platform/android/java_class_wrapper.h Normal file
View File

@@ -0,0 +1,168 @@
#ifndef JAVA_CLASS_WRAPPER_H
#define JAVA_CLASS_WRAPPER_H
#include "reference.h"
#include <jni.h>
#include <android/log.h>
class JavaObject;
class JavaClass : public Reference {
OBJ_TYPE(JavaClass,Reference);
enum ArgumentType {
ARG_TYPE_VOID,
ARG_TYPE_BOOLEAN,
ARG_TYPE_BYTE,
ARG_TYPE_CHAR,
ARG_TYPE_SHORT,
ARG_TYPE_INT,
ARG_TYPE_LONG,
ARG_TYPE_FLOAT,
ARG_TYPE_DOUBLE,
ARG_TYPE_STRING, //special case
ARG_TYPE_CLASS,
ARG_ARRAY_BIT=1<<16,
ARG_NUMBER_CLASS_BIT=1<<17,
ARG_TYPE_MASK=(1<<16)-1
};
Map<StringName,Variant> constant_map;
struct MethodInfo {
bool _static;
Vector<uint32_t> param_types;
Vector<StringName> param_sigs;
uint32_t return_type;
jmethodID method;
};
_FORCE_INLINE_ static void _convert_to_variant_type(int p_sig, Variant::Type& r_type, float& likelyhood) {
likelyhood=1.0;
r_type=Variant::NIL;
switch(p_sig) {
case ARG_TYPE_VOID: r_type=Variant::NIL; break;
case ARG_TYPE_BOOLEAN|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_BOOLEAN: r_type=Variant::BOOL; break;
case ARG_TYPE_BYTE|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_BYTE: r_type=Variant::INT; likelyhood=0.1; break;
case ARG_TYPE_CHAR|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_CHAR: r_type=Variant::INT; likelyhood=0.2; break;
case ARG_TYPE_SHORT|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_SHORT: r_type=Variant::INT; likelyhood=0.3; break;
case ARG_TYPE_INT|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_INT: r_type=Variant::INT; likelyhood=1.0; break;
case ARG_TYPE_LONG|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_LONG: r_type=Variant::INT; likelyhood=0.5; break;
case ARG_TYPE_FLOAT|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_FLOAT: r_type=Variant::REAL; likelyhood=1.0; break;
case ARG_TYPE_DOUBLE|ARG_NUMBER_CLASS_BIT:
case ARG_TYPE_DOUBLE: r_type=Variant::REAL; likelyhood=0.5; break;
case ARG_TYPE_STRING: r_type=Variant::STRING; break;
case ARG_TYPE_CLASS: r_type=Variant::OBJECT; break;
case ARG_ARRAY_BIT|ARG_TYPE_VOID: r_type=Variant::NIL; break;
case ARG_ARRAY_BIT|ARG_TYPE_BOOLEAN: r_type=Variant::ARRAY; break;
case ARG_ARRAY_BIT|ARG_TYPE_BYTE: r_type=Variant::RAW_ARRAY; likelyhood=1.0; break;
case ARG_ARRAY_BIT|ARG_TYPE_CHAR: r_type=Variant::RAW_ARRAY; likelyhood=0.5; break;
case ARG_ARRAY_BIT|ARG_TYPE_SHORT: r_type=Variant::INT_ARRAY; likelyhood=0.3; break;
case ARG_ARRAY_BIT|ARG_TYPE_INT: r_type=Variant::INT_ARRAY; likelyhood=1.0; break;
case ARG_ARRAY_BIT|ARG_TYPE_LONG: r_type=Variant::INT_ARRAY; likelyhood=0.5; break;
case ARG_ARRAY_BIT|ARG_TYPE_FLOAT: r_type=Variant::REAL_ARRAY; likelyhood=1.0; break;
case ARG_ARRAY_BIT|ARG_TYPE_DOUBLE: r_type=Variant::REAL_ARRAY; likelyhood=0.5; break;
case ARG_ARRAY_BIT|ARG_TYPE_STRING: r_type=Variant::STRING_ARRAY; break;
case ARG_ARRAY_BIT|ARG_TYPE_CLASS: r_type=Variant::ARRAY; break;
}
}
_FORCE_INLINE_ static bool _convert_object_to_variant(JNIEnv * env, jobject obj, Variant& var,uint32_t p_sig);
bool _call_method(JavaObject* p_instance,const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error,Variant& ret);
friend class JavaClassWrapper;
Map<StringName,List<MethodInfo> > methods;
jclass _class;
public:
virtual Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error);
JavaClass();
};
class JavaObject : public Reference {
OBJ_TYPE(JavaObject,Reference);
Ref<JavaClass> base_class;
friend class JavaClass;
jobject instance;
public:
virtual Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error);
JavaObject(const Ref<JavaClass>& p_base,jobject *p_instance);
~JavaObject();
};
class JavaClassWrapper : public Object {
OBJ_TYPE(JavaClassWrapper,Object);
Map<String,Ref<JavaClass> > class_cache;
friend class JavaClass;
jclass activityClass;
jmethodID findClass;
jmethodID getDeclaredMethods;
jmethodID getFields;
jmethodID getParameterTypes;
jmethodID getReturnType;
jmethodID getModifiers;
jmethodID getName;
jmethodID Class_getName;
jmethodID Field_getName;
jmethodID Field_getModifiers;
jmethodID Field_get;
jmethodID Boolean_booleanValue;
jmethodID Byte_byteValue;
jmethodID Character_characterValue;
jmethodID Short_shortValue;
jmethodID Integer_integerValue;
jmethodID Long_longValue;
jmethodID Float_floatValue;
jmethodID Double_doubleValue;
jobject classLoader;
bool _get_type_sig(JNIEnv *env, jobject obj, uint32_t& sig, String&strsig);
static JavaClassWrapper *singleton;
protected:
static void _bind_methods();
public:
static JavaClassWrapper *get_singleton() { return singleton; }
Ref<JavaClass> wrap(const String& p_class);
JavaClassWrapper(jobject p_activity=NULL);
};
#endif // JAVA_CLASS_WRAPPER_H