godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved binding system (ObjectTypeDB::bind_method) to be friendlier to statically typed languages, should help in the Mono integration. 

Disabled by default.
This commit is contained in:
Juan Linietsky 2016-06-22 23:12:20 -03:00
parent 842e7bfc2f
commit d6225b1e00
22 changed files with 517 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/tests/test_math.cpp
View File

@ -40,6 +40,9 @@
#include "scene/resources/texture.h"
#include "vmap.h"
#include "os/os.h"
#include "method_ptrcall.h"
namespace TestMath {
@ -105,8 +108,12 @@ uint32_t ihash3( uint32_t a)
return a;
}
MainLoop* test() {
return NULL;
{

2
core/io/http_client.cpp
View File

@ -29,8 +29,6 @@
#include "http_client.h"
#include "io/stream_peer_ssl.h"
VARIANT_ENUM_CAST(HTTPClient::Status);
Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl,bool p_verify_host){

1
core/io/http_client.h
View File

@ -201,5 +201,6 @@ public:
};
VARIANT_ENUM_CAST(HTTPClient::Method);
VARIANT_ENUM_CAST(HTTPClient::Status);
#endif // HTTP_CLIENT_H

15
core/make_binders.py
View File

@ -48,7 +48,13 @@ public:
$ifnoret return Variant();$
}
#ifdef PTRCAL_ENABLED
virtual void ptrcall(Object*p_object,const void** p_args,void *r_ret) {
T *instance=p_object->cast_to<T>();
$ifret PtrToArg<R>::encode( $ (instance->*method)($arg, PtrToArg<P@>::convert(p_args[@-1])$) $ifret ,r_ret)$ ;
}
#endif
MethodBind$argc$$ifret R$$ifconst C$ () {
#ifdef DEBUG_METHODS_ENABLED
_set_const($ifconst true$$ifnoconst false$);
@ -121,7 +127,12 @@ public:
$ifret return Variant(ret);$
$ifnoret return Variant();$
}
#ifdef PTRCALL_ENABLED
virtual void ptrcall(Object*p_object,const void** p_args,void *r_ret) {
__UnexistingClass *instance = (__UnexistingClass*)p_object;
$ifret PtrToArg<R>::encode( $ (instance->*method)($arg, PtrToArg<P@>::convert(p_args[@-1])$) $ifret ,r_ret) $ ;
}
#endif
MethodBind$argc$$ifret R$$ifconst C$ () {
#ifdef DEBUG_METHODS_ENABLED
_set_const($ifconst true$$ifnoconst false$);

27
core/math/bsp_tree.h
View File

@ -34,8 +34,8 @@
#include "face3.h"
#include "vector.h"
#include "dvector.h"
#include "variant.h"
#include "method_ptrcall.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
@ -138,4 +138,29 @@ bool BSP_Tree::convex_is_inside(const T& p_convex) const {
}
#ifdef PTRCALL_ENABLED
template<>
struct PtrToArg<BSP_Tree> {
_FORCE_INLINE_ static BSP_Tree convert(const void* p_ptr) {
BSP_Tree s( Variant( *reinterpret_cast<const Dictionary*>(p_ptr) ) );
return s;
}
_FORCE_INLINE_ static void encode(BSP_Tree p_val,void* p_ptr) {
Dictionary *d = reinterpret_cast<Dictionary*>(p_ptr);
*d=Variant(p_val);
}
};
template<>
struct PtrToArg<const BSP_Tree&> {
_FORCE_INLINE_ static BSP_Tree convert(const void* p_ptr) {
BSP_Tree s( Variant( *reinterpret_cast<const Dictionary*>(p_ptr) ) );
return s;
}
};
#endif
#endif

2
core/math/face3.h
View File

@ -264,4 +264,6 @@ bool Face3::intersects_aabb2(const AABB& p_aabb) const {
}
//this sucks...
#endif // FACE3_H

40
core/method_bind.h
View File

@ -33,6 +33,7 @@
#include "variant.h"
#include "object.h"
#include <stdio.h>
#include "method_ptrcall.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
@ -85,6 +86,32 @@ struct VariantCaster<const T&> {
(VariantCaster<P##m_idx>::cast( (m_idx-1)>=p_arg_count?get_default_argument(m_idx-1):*p_args[m_idx-1] ))
//SIMPLE_NUMERIC_TYPE is used to avoid a warning on Variant::get_type_for
#ifdef PTRCALL_ENABLED
#define VARIANT_ENUM_CAST( m_enum ) \
SIMPLE_NUMERIC_TYPE( m_enum );\
template<> \
struct VariantCaster<m_enum> {\
\
static _FORCE_INLINE_ m_enum cast(const Variant& p_variant) {\
return (m_enum)p_variant.operator int();\
}\
};\
template<>\
struct PtrToArg< m_enum > {\
_FORCE_INLINE_ static m_enum convert(const void* p_ptr) {\
return m_enum(*reinterpret_cast<const int*>(p_ptr));\
}\
_FORCE_INLINE_ static void encode(m_enum p_val,const void* p_ptr) {\
*(int*)p_ptr=p_val;\
}\
};
#else
#define VARIANT_ENUM_CAST( m_enum ) \
SIMPLE_NUMERIC_TYPE( m_enum );\
template<> \
@ -96,6 +123,9 @@ struct VariantCaster<m_enum> {\
};
#endif
#define CHECK_ARG(m_arg)\
if ((m_arg-1)<p_arg_count) {\
Variant::Type argtype=get_argument_type(m_arg-1);\
@ -222,6 +252,11 @@ public:
}
#endif
virtual Variant call(Object* p_object,const Variant** p_args,int p_arg_count, Variant::CallError& r_error)=0;
#ifdef PTRCALL_ENABLED
virtual void ptrcall(Object* p_object,const void** p_args,void* r_ret)=0;
#endif
StringName get_name() const;
void set_name(const StringName& p_name);
_FORCE_INLINE_ int get_method_id() const { return method_id; }
@ -277,6 +312,11 @@ public:
#endif
}
#ifdef PTRCALL_ENABLED
virtual void ptrcall(Object* p_object,const void** p_args,void* r_ret) {} //todo
#endif
void set_method(NativeCall p_method) { call_method=p_method; }
virtual bool is_const() const { return false; }
virtual String get_instance_type() const { return T::get_type_static(); }

354
core/method_ptrcall.h Normal file
View File

@ -0,0 +1,354 @@
#ifndef METHOD_PTRCALL_H
#define METHOD_PTRCALL_H
#include "typedefs.h"
#include "math_2d.h"
#include "variant.h"
#ifdef PTRCALL_ENABLED
template<class T>
struct PtrToArg {
};
#define MAKE_PTRARG(m_type) \
template<>\
struct PtrToArg<m_type> {\
_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
return *reinterpret_cast<const m_type*>(p_ptr);\
}\
_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
*((m_type*)p_ptr)=p_val;\
}\
};\
template<>\
struct PtrToArg<const m_type&> {\
_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
return *reinterpret_cast<const m_type*>(p_ptr);\
}\
_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
*((m_type*)p_ptr)=p_val;\
}\
}
#define MAKE_PTRARGR(m_type,m_ret) \
template<>\
struct PtrToArg<m_type> {\
_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
return *reinterpret_cast<const m_type*>(p_ptr);\
}\
_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
*((m_ret*)p_ptr)=p_val;\
}\
};\
template<>\
struct PtrToArg<const m_type&> {\
_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
return *reinterpret_cast<const m_type*>(p_ptr);\
}\
_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
*((m_ret*)p_ptr)=p_val;\
}\
}
MAKE_PTRARG(bool);
MAKE_PTRARGR(uint8_t,int);
MAKE_PTRARGR(int8_t,int);
MAKE_PTRARGR(uint16_t,int);
MAKE_PTRARGR(int16_t,int);
MAKE_PTRARGR(uint32_t,int);
MAKE_PTRARGR(int32_t,int);
MAKE_PTRARGR(int64_t,int);
MAKE_PTRARGR(uint64_t,int);
MAKE_PTRARG(float);
MAKE_PTRARGR(double,float);
MAKE_PTRARG(String);
MAKE_PTRARG(Vector2);
MAKE_PTRARG(Rect2);
MAKE_PTRARG(Vector3);
MAKE_PTRARG(Matrix32);
MAKE_PTRARG(Plane);
MAKE_PTRARG(Quat);
MAKE_PTRARG(AABB);
MAKE_PTRARG(Matrix3);
MAKE_PTRARG(Transform);
MAKE_PTRARG(Color);
MAKE_PTRARG(Image);
MAKE_PTRARG(NodePath);
MAKE_PTRARG(RID);
MAKE_PTRARG(InputEvent);
MAKE_PTRARG(Dictionary);
MAKE_PTRARG(Array);
MAKE_PTRARG(ByteArray);
MAKE_PTRARG(IntArray);
MAKE_PTRARG(RealArray);
MAKE_PTRARG(StringArray);
MAKE_PTRARG(Vector2Array);
MAKE_PTRARG(Vector3Array);
MAKE_PTRARG(ColorArray);
MAKE_PTRARG(Variant);
//this is for Object
template<class T>
struct PtrToArg< T* > {
_FORCE_INLINE_ static T* convert(const void* p_ptr) {
return const_cast<T*>(reinterpret_cast<const T*>(p_ptr));
}
_FORCE_INLINE_ static void encode(T* p_var, void* p_ptr) {
*((T**)p_ptr)=p_var;
}
};
template<class T>
struct PtrToArg< const T* > {
_FORCE_INLINE_ static const T* convert(const void* p_ptr) {
return reinterpret_cast<const T*>(p_ptr);
}
_FORCE_INLINE_ static void encode(T* p_var, void* p_ptr) {
*((T**)p_ptr)=p_var;
}
};
//this is for the special cases used by Variant
#define MAKE_VECARG(m_type) \
template<>\
struct PtrToArg<Vector<m_type> > {\
_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
const DVector<m_type> *dvs = reinterpret_cast<const DVector<m_type> *>(p_ptr);\
Vector<m_type> ret;\
int len = dvs->size();\
ret.resize(len);\
{\
DVector<m_type>::Read r=dvs->read();\
for(int i=0;i<len;i++) {\
ret[i]=r[i];\
}\
} \
return ret;\
}\
_FORCE_INLINE_ static void encode(Vector<m_type> p_vec, void* p_ptr) {\
DVector<m_type> *dv = reinterpret_cast<DVector<m_type> *>(p_ptr);\
int len=p_vec.size();\
dv->resize(len);\
{\
DVector<m_type>::Write w=dv->write();\
for(int i=0;i<len;i++) {\
w[i]=p_vec[i];\
}\
} \
}\
};\
template<>\
struct PtrToArg<const Vector<m_type>& > {\
_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
const DVector<m_type> *dvs = reinterpret_cast<const DVector<m_type> *>(p_ptr);\
Vector<m_type> ret;\
int len = dvs->size();\
ret.resize(len);\
{\
DVector<m_type>::Read r=dvs->read();\
for(int i=0;i<len;i++) {\
ret[i]=r[i];\
}\
} \
return ret;\
}\
}
MAKE_VECARG(String);
MAKE_VECARG(uint8_t);
MAKE_VECARG(int);
MAKE_VECARG(float);
MAKE_VECARG(Vector2);
MAKE_VECARG(Vector3);
MAKE_VECARG(Color);
//for stuff that gets converted to Array vectors
#define MAKE_VECARR(m_type) \
template<>\
struct PtrToArg<Vector<m_type> > {\
_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
Vector<m_type> ret;\
int len = arr->size();\
ret.resize(len);\
for(int i=0;i<len;i++) {\
ret[i]=(*arr)[i];\
}\
return ret;\
}\
_FORCE_INLINE_ static void encode(Vector<m_type> p_vec, void* p_ptr) {\
Array *arr = reinterpret_cast<Array *>(p_ptr);\
int len = p_vec.size();\
arr->resize(len);\
for(int i=0;i<len;i++) {\
(*arr)[i]=p_vec[i];\
}\
} \
};\
template<>\
struct PtrToArg<const Vector<m_type>& > {\
_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
Vector<m_type> ret;\
int len = arr->size();\
ret.resize(len);\
for(int i=0;i<len;i++) {\
ret[i]=(*arr)[i];\
}\
return ret;\
}\
}
MAKE_VECARR(Variant);
MAKE_VECARR(RID);
MAKE_VECARR(Plane);
#define MAKE_DVECARR(m_type) \
template<>\
struct PtrToArg<DVector<m_type> > {\
_FORCE_INLINE_ static DVector<m_type> convert(const void* p_ptr) {\
const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
DVector<m_type> ret;\
int len = arr->size();\
ret.resize(len);\
{\
DVector<m_type>::Write w=ret.write();\
for(int i=0;i<len;i++) {\
w[i]=(*arr)[i];\
}\
}\
return ret;\
}\
_FORCE_INLINE_ static void encode(DVector<m_type> p_vec, void* p_ptr) {\
Array *arr = reinterpret_cast<Array *>(p_ptr);\
int len = p_vec.size();\
arr->resize(len);\
{\
DVector<m_type>::Read r=p_vec.read();\
for(int i=0;i<len;i++) {\
(*arr)[i]=r[i];\
}\
}\
} \
};\
template<>\
struct PtrToArg<const DVector<m_type>& > {\
_FORCE_INLINE_ static DVector<m_type> convert(const void* p_ptr) {\
const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
DVector<m_type> ret;\
int len = arr->size();\
ret.resize(len);\
{\
DVector<m_type>::Write w=ret.write();\
for(int i=0;i<len;i++) {\
w[i]=(*arr)[i];\
}\
}\
return ret;\
}\
}
MAKE_DVECARR(Plane);
//for special case StringName
#define MAKE_STRINGCONV(m_type) \
template<>\
struct PtrToArg<m_type> {\
_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
m_type s = *reinterpret_cast<const String*>(p_ptr);\
return s;\
}\
_FORCE_INLINE_ static void encode(m_type p_vec, void* p_ptr) {\
String *arr = reinterpret_cast<String *>(p_ptr);\
*arr=p_vec;\
}\
};\
\
template<>\
struct PtrToArg<const m_type&> {\
_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
m_type s = *reinterpret_cast<const String*>(p_ptr);\
return s;\
}\
}
MAKE_STRINGCONV(StringName);
MAKE_STRINGCONV(IP_Address);
template<>
struct PtrToArg<DVector<Face3> > {
_FORCE_INLINE_ static DVector<Face3> convert(const void* p_ptr) {
const DVector<Vector3> *dvs = reinterpret_cast<const DVector<Vector3> *>(p_ptr);
DVector<Face3> ret;
int len = dvs->size()/3;
ret.resize(len);
{
DVector<Vector3>::Read r=dvs->read();
DVector<Face3>::Write w=ret.write();
for(int i=0;i<len;i++) {
w[i].vertex[0]=r[i*3+0];
w[i].vertex[1]=r[i*3+1];
w[i].vertex[2]=r[i*3+2];
}
}
return ret;
}
_FORCE_INLINE_ static void encode(DVector<Face3> p_vec, void* p_ptr) {\
DVector<Vector3> *arr = reinterpret_cast<DVector<Vector3> *>(p_ptr);\
int len = p_vec.size();\
arr->resize(len*3);\
{\
DVector<Face3>::Read r=p_vec.read();\
DVector<Vector3>::Write w=arr->write();\
for(int i=0;i<len;i++) {\
w[i*3+0]=r[i].vertex[0];\
w[i*3+1]=r[i].vertex[1];\
w[i*3+2]=r[i].vertex[2];\
}\
}\
} \
};
template<>
struct PtrToArg<const DVector<Face3>& > {
_FORCE_INLINE_ static DVector<Face3> convert(const void* p_ptr) {
const DVector<Vector3> *dvs = reinterpret_cast<const DVector<Vector3> *>(p_ptr);
DVector<Face3> ret;
int len = dvs->size()/3;
ret.resize(len);
{
DVector<Vector3>::Read r=dvs->read();
DVector<Face3>::Write w=ret.write();
for(int i=0;i<len;i++) {
w[i].vertex[0]=r[i*3+0];
w[i].vertex[1]=r[i*3+1];
w[i].vertex[2]=r[i*3+2];
}
}
return ret;
}
};
#endif // METHOD_PTRCALL_H
#endif

56
core/reference.h
View File

@ -329,6 +329,62 @@ public:
WeakRef();
};
#ifdef PTRCALL_ENABLED
template<class T>
struct PtrToArg< Ref<T> > {
_FORCE_INLINE_ static Ref<T> convert(const void* p_ptr) {
return Ref<T>(reinterpret_cast<const T*>(p_ptr));
}
_FORCE_INLINE_ static void encode(Ref<T> p_val,const void* p_ptr) {
*((T**)p_ptr)=p_val.ptr();
}
};
template<class T>
struct PtrToArg< const Ref<T>& > {
_FORCE_INLINE_ static Ref<T> convert(const void* p_ptr) {
return Ref<T>(reinterpret_cast<const T*>(p_ptr));
}
};
//this is for RefPtr
template<>
struct PtrToArg< RefPtr > {
_FORCE_INLINE_ static RefPtr convert(const void* p_ptr) {
return Ref<Reference>(reinterpret_cast<const Reference*>(p_ptr)).get_ref_ptr();
}
_FORCE_INLINE_ static void encode(RefPtr p_val,const void* p_ptr) {
Ref<Reference> r = p_val;
*((Reference**)p_ptr)=r.ptr();
}
};
template<>
struct PtrToArg< const RefPtr& > {
_FORCE_INLINE_ static RefPtr convert(const void* p_ptr) {
return Ref<Reference>(reinterpret_cast<const Reference*>(p_ptr)).get_ref_ptr();
}
};
#endif
#endif // REFERENCE_H

2
platform/javascript/audio_server_javascript.cpp
View File

@ -116,7 +116,7 @@ void AudioServerJavascript::sample_set_data(RID p_sample, const DVector<uint8_t>
}
const DVector<uint8_t> AudioServerJavascript::sample_get_data(RID p_sample) const{
DVector<uint8_t> AudioServerJavascript::sample_get_data(RID p_sample) const{
return DVector<uint8_t>();

2
platform/javascript/audio_server_javascript.h
View File

@ -132,7 +132,7 @@ public:
virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer);
virtual const DVector<uint8_t> sample_get_data(RID p_sample) const;
virtual DVector<uint8_t> sample_get_data(RID p_sample) const;
virtual void sample_set_mix_rate(RID p_sample,int p_rate);
virtual int sample_get_mix_rate(RID p_sample) const;

4
scene/resources/dynamic_font.cpp
View File

@ -271,7 +271,7 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next,const Vec
}
float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const {
float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const {
if (!valid)
return 0;
@ -686,7 +686,7 @@ bool DynamicFont::is_distance_field_hint() const{
return false;
}
float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate) const {
if (!data_at_size.is_valid())
return 0;

4
scene/resources/dynamic_font.h
View File

@ -143,7 +143,7 @@ public:
Size2 get_char_size(CharType p_char,CharType p_next,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
@ -199,7 +199,7 @@ public:
virtual bool is_distance_field_hint() const;
virtual float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
virtual float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
DynamicFont();
~DynamicFont();

4
scene/resources/dynamic_font_stb.cpp
View File

@ -142,7 +142,7 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next) const {
}
float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate) const {
const_cast<DynamicFontAtSize*>(this)->_update_char(p_char);
@ -455,7 +455,7 @@ bool DynamicFont::is_distance_field_hint() const{
return false;
}
float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate) const {
if (!data_at_size.is_valid())
return 0;

4
scene/resources/dynamic_font_stb.h
View File

@ -112,7 +112,7 @@ public:
Size2 get_char_size(CharType p_char,CharType p_next=0) const;
float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
@ -152,7 +152,7 @@ public:
virtual bool is_distance_field_hint() const;
virtual float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
virtual float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
DynamicFont();
~DynamicFont();

2
scene/resources/font.cpp
View File

@ -506,7 +506,7 @@ Ref<BitmapFont> BitmapFont::get_fallback() const{
return fallback;
}
float BitmapFont::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
float BitmapFont::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char, CharType p_next, const Color& p_modulate) const {
const Character * c = char_map.getptr(p_char);

4
scene/resources/font.h
View File

@ -59,7 +59,7 @@ public:
void draw(RID p_canvas_item, const Point2& p_pos, const String& p_text,const Color& p_modulate=Color(1,1,1),int p_clip_w=-1) const;
void draw_halign(RID p_canvas_item, const Point2& p_pos, HAlign p_align,float p_width,const String& p_text,const Color& p_modulate=Color(1,1,1)) const;
virtual float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const=0;
virtual float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char, CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const=0;
Font();
@ -155,7 +155,7 @@ public:
void set_distance_field_hint(bool p_distance_field);
bool is_distance_field_hint() const;
float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
BitmapFont();
~BitmapFont();

2
scene/resources/room.cpp
View File

@ -52,7 +52,7 @@ void RoomBounds::set_geometry_hint(const DVector<Face3>& p_geometry_hint) {
geometry_hint=p_geometry_hint;
}
const DVector<Face3>& RoomBounds::get_geometry_hint() const {
DVector<Face3> RoomBounds::get_geometry_hint() const {
return geometry_hint;
}

2
scene/resources/room.h
View File

@ -56,7 +56,7 @@ public:
BSP_Tree get_bounds() const;
void set_geometry_hint(const DVector<Face3>& geometry_hint);
const DVector<Face3>& get_geometry_hint() const;
DVector<Face3> get_geometry_hint() const;
RoomBounds();
~RoomBounds();

2
servers/audio/audio_server_sw.cpp
View File

@ -388,7 +388,7 @@ void AudioServerSW::sample_set_data(RID p_sample, const DVector<uint8_t>& p_buff
AUDIO_LOCK
sample_manager->sample_set_data(p_sample,p_buffer);
}
const DVector<uint8_t> AudioServerSW::sample_get_data(RID p_sample) const {
DVector<uint8_t> AudioServerSW::sample_get_data(RID p_sample) const {
AUDIO_LOCK
return sample_manager->sample_get_data(p_sample);
}

2
servers/audio/audio_server_sw.h
View File

@ -126,7 +126,7 @@ public:
const void* sample_get_data_ptr(RID p_sample) const;
virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer);
virtual const DVector<uint8_t> sample_get_data(RID p_sample) const;
virtual DVector<uint8_t> sample_get_data(RID p_sample) const;
virtual void sample_set_mix_rate(RID p_sample,int p_rate);
virtual int sample_get_mix_rate(RID p_sample) const;

2
servers/audio_server.h
View File

@ -169,7 +169,7 @@ public:
virtual void sample_set_signed_data(RID p_sample, const DVector<float>& p_buffer);
virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer)=0;
virtual const DVector<uint8_t> sample_get_data(RID p_sample) const=0;
virtual DVector<uint8_t> sample_get_data(RID p_sample) const=0;
virtual void sample_set_mix_rate(RID p_sample,int p_rate)=0;
virtual int sample_get_mix_rate(RID p_sample) const=0;