From abbea4d945bbb1114570c3b6c7f649e01ca8ebb8 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 13 Nov 2014 00:53:12 -0300 Subject: [PATCH] UDP Fixes -=-=-=-=- Curse the day I decided to port UDP code, as it ended up being two nights of work. At least It's done now (I hope). -Fixed UDP Support, API seems stable -Added UDP Chat demo (chat that can lose your packets, heh) -Added helpers to areas and bodies to get list of collided bodies and contained bodies. -Sped up screen/viewport capture code. -Added code to save an image as PNG -Small fix so scripts register their singletons after modules did. --- core/image.cpp | 9 ++ core/image.h | 5 + core/io/ip_address.h | 6 ++ core/io/packet_peer_udp.cpp | 20 +++- core/io/packet_peer_udp.h | 4 +- core/script_language.cpp | 7 ++ core/script_language.h | 2 + core/variant_call.cpp | 2 + demos/misc/udp_chat/chat.gd | 72 +++++++++++++ demos/misc/udp_chat/chat.scn | Bin 0 -> 3198 bytes demos/misc/udp_chat/engine.cfg | 5 + demos/misc/udp_chat/icon.png | Bin 0 -> 2388 bytes drivers/gles2/rasterizer_gles2.cpp | 21 +++- drivers/png/resource_saver_png.cpp | 107 +++++++++++-------- drivers/png/resource_saver_png.h | 4 + drivers/unix/packet_peer_udp_posix.cpp | 22 ++-- drivers/unix/packet_peer_udp_posix.h | 3 +- main/main.cpp | 2 + modules/gdscript/register_types.cpp | 2 +- platform/windows/packet_peer_udp_winsock.cpp | 43 +++++++- platform/windows/packet_peer_udp_winsock.h | 7 +- scene/2d/area_2d.cpp | 21 ++++ scene/2d/area_2d.h | 2 + scene/2d/physics_body_2d.cpp | 22 ++++ scene/2d/physics_body_2d.h | 2 + scene/3d/area.cpp | 20 ++++ scene/3d/area.h | 2 + scene/3d/physics_body.cpp | 23 ++++ scene/3d/physics_body.h | 1 + 29 files changed, 365 insertions(+), 71 deletions(-) create mode 100644 demos/misc/udp_chat/chat.gd create mode 100644 demos/misc/udp_chat/chat.scn create mode 100644 demos/misc/udp_chat/engine.cfg create mode 100644 demos/misc/udp_chat/icon.png diff --git a/core/image.cpp b/core/image.cpp index ae9fb0adc4..17ee569b6b 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -34,6 +34,7 @@ #include "print_string.h" #include +SavePNGFunc Image::save_png_func = NULL; void Image::_put_pixel(int p_x,int p_y, const BColor& p_color, unsigned char *p_data) { @@ -1200,6 +1201,14 @@ Error Image::load(const String& p_path) { return ImageLoader::load_image(p_path, this); } +Error Image::save_png(const String& p_path) { + + if (save_png_func == NULL) + return ERR_UNAVAILABLE; + + return save_png_func(p_path, *this); +}; + bool Image::operator==(const Image& p_image) const { if (data.size() == 0 && p_image.data.size() == 0) diff --git a/core/image.h b/core/image.h index 0084a3616f..f4c96703b9 100644 --- a/core/image.h +++ b/core/image.h @@ -40,7 +40,9 @@ * Images can be loaded from a file, or registered into the Render object as textures. */ +class Image; +typedef Error (*SavePNGFunc)(const String &p_path, Image& p_img); class Image { @@ -50,6 +52,8 @@ class Image { }; public: + static SavePNGFunc save_png_func; + enum Format { FORMAT_GRAYSCALE, ///< one byte per pixel, 0-255 FORMAT_INTENSITY, ///< one byte per pixel, 0-255 @@ -278,6 +282,7 @@ public: DVector get_data() const; Error load(const String& p_path); + Error save_png(const String& p_path); /** * create an empty image diff --git a/core/io/ip_address.h b/core/io/ip_address.h index cd39aa6c81..3cd8bb7733 100644 --- a/core/io/ip_address.h +++ b/core/io/ip_address.h @@ -39,6 +39,12 @@ struct IP_Address { }; //operator Variant() const; + bool operator==(const IP_Address& p_ip) const { + return host==p_ip.host; + } + bool operator!=(const IP_Address& p_ip) const { + return host!=p_ip.host; + } operator String() const; IP_Address(const String& p_string); IP_Address(uint8_t p_a,uint8_t p_b,uint8_t p_c,uint8_t p_d); diff --git a/core/io/packet_peer_udp.cpp b/core/io/packet_peer_udp.cpp index f301370944..83217ffc41 100644 --- a/core/io/packet_peer_udp.cpp +++ b/core/io/packet_peer_udp.cpp @@ -1,5 +1,5 @@ #include "packet_peer_udp.h" - +#include "io/ip.h" PacketPeerUDP* (*PacketPeerUDP::_create)()=NULL; @@ -15,17 +15,31 @@ String PacketPeerUDP::_get_packet_ip() const { return get_packet_address(); } +Error PacketPeerUDP::_set_send_address(const String& p_address,int p_port) { + + IP_Address ip; + if (p_address.is_valid_ip_address()) { + ip=p_address; + } else { + ip=IP::get_singleton()->resolve_hostname(p_address); + if (ip==IP_Address()) + return ERR_CANT_RESOLVE; + } + + set_send_address(ip,p_port); + return OK; +} void PacketPeerUDP::_bind_methods() { ObjectTypeDB::bind_method(_MD("listen:Error","port","recv_buf_size"),&PacketPeerUDP::listen,DEFVAL(65536)); ObjectTypeDB::bind_method(_MD("close"),&PacketPeerUDP::close); - ObjectTypeDB::bind_method(_MD("poll:Error"),&PacketPeerUDP::poll); + ObjectTypeDB::bind_method(_MD("wait:Error"),&PacketPeerUDP::wait); ObjectTypeDB::bind_method(_MD("is_listening"),&PacketPeerUDP::is_listening); ObjectTypeDB::bind_method(_MD("get_packet_ip"),&PacketPeerUDP::_get_packet_ip); ObjectTypeDB::bind_method(_MD("get_packet_address"),&PacketPeerUDP::_get_packet_address); ObjectTypeDB::bind_method(_MD("get_packet_port"),&PacketPeerUDP::get_packet_port); - ObjectTypeDB::bind_method(_MD("set_send_address","address","port"),&PacketPeerUDP::set_send_address); + ObjectTypeDB::bind_method(_MD("set_send_address","host","port"),&PacketPeerUDP::_set_send_address); } diff --git a/core/io/packet_peer_udp.h b/core/io/packet_peer_udp.h index 049ac0132f..73ff487b19 100644 --- a/core/io/packet_peer_udp.h +++ b/core/io/packet_peer_udp.h @@ -15,11 +15,13 @@ protected: int _get_packet_address() const; String _get_packet_ip() const; + virtual Error _set_send_address(const String& p_address,int p_port); + public: virtual Error listen(int p_port,int p_recv_buffer_size=65536)=0; virtual void close()=0; - virtual Error poll()=0; + virtual Error wait()=0; virtual bool is_listening() const=0; virtual IP_Address get_packet_address() const=0; virtual int get_packet_port() const=0; diff --git a/core/script_language.cpp b/core/script_language.cpp index ad93fca4b5..81a9e2b062 100644 --- a/core/script_language.cpp +++ b/core/script_language.cpp @@ -85,6 +85,13 @@ void ScriptServer::register_language(ScriptLanguage *p_language) { _languages[_language_count++]=p_language; } +void ScriptServer::init_languages() { + + for(int i=0;i<_language_count;i++) { + _languages[i]->init(); + } +} + Variant ScriptInstance::call(const StringName& p_method,VARIANT_ARG_DECLARE) { VARIANT_ARGPTRS; diff --git a/core/script_language.h b/core/script_language.h index 1e0dcc678f..d62e9849a1 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -54,6 +54,8 @@ public: static int get_language_count(); static ScriptLanguage *get_language(int p_idx); static void register_language(ScriptLanguage *p_language); + + static void init_languages(); }; diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 28953a535f..93a9e6475f 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -544,6 +544,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var VCALL_PTR0R(Image,get_used_rect); VCALL_PTR3R(Image,brushed); VCALL_PTR1R(Image,load); + VCALL_PTR1R(Image,save_png); VCALL_PTR3(Image,brush_transfer); VCALL_PTR1R(Image,get_rect); VCALL_PTR1R(Image,compressed); @@ -1326,6 +1327,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl ADDFUNC4(IMAGE, NIL, Image, put_pixel, INT, "x", INT, "y", COLOR, "color", INT, "mipmap_level", varray(0)); ADDFUNC3(IMAGE, IMAGE, Image, brushed, IMAGE, "src", IMAGE, "brush", VECTOR2, "pos", varray(0)); ADDFUNC1(IMAGE, INT, Image, load, STRING, "path", varray(0)); + ADDFUNC1(IMAGE, INT, Image, save_png, STRING, "path", varray(0)); ADDFUNC3(IMAGE, NIL, Image, brush_transfer, IMAGE, "src", IMAGE, "brush", VECTOR2, "pos", varray(0)); ADDFUNC0(IMAGE, RECT2, Image, get_used_rect, varray(0)); ADDFUNC1(IMAGE, IMAGE, Image, get_rect, RECT2, "area", varray(0)); diff --git a/demos/misc/udp_chat/chat.gd b/demos/misc/udp_chat/chat.gd new file mode 100644 index 0000000000..3270eebbfe --- /dev/null +++ b/demos/misc/udp_chat/chat.gd @@ -0,0 +1,72 @@ + +extends Panel + +# Really simple UDP chat client, not intended as a chat example!! +# (UDP can lose packets and you won't normally find out, so don't do a chat this way) +# This is just a demo that shows how to use the UDP class. + +var udp = PacketPeerUDP.new() + +func _process(delta): + + if (not udp.is_listening()): + return + + while(udp.get_available_packet_count()>0): + var packet = udp.get_var() + if (typeof(packet)==TYPE_STRING): + var host = udp.get_packet_ip() + var port = udp.get_packet_port() + get_node("chat/text").add_text("("+host+":"+str(port)+":) "+packet) + get_node("chat/text").newline() + + + +func _ready(): + # Initalization here + get_node("chat").add_style_override("panel",get_stylebox("bg","Tree")) + set_process(true) + + + +func send_message(text): + if (udp.is_listening()): + udp.put_var(text) + + +func _on_connect_toggled( pressed ): + + + if (pressed): + var err = udp.listen( get_node("listen_port").get_val() ) + if (err!=OK): + get_node("status").set_text("Error:\nCan't Listen.") + get_node("connect").set_pressed(false) + else: + get_node("status").set_text("Connected.") + get_node("connect").set_text("Disconnect") + err = udp.set_send_address(get_node("remote_host").get_text(),get_node("remote_port").get_val()) + if (err!=OK): + get_node("status").set_text("Error:\nCan't Resolve.") + get_node("connect").set_pressed(false) + else: + send_message("* "+get_node("user_name").get_text()+" entered chat.") + else: + + udp.close() + get_node("status").set_text("Disconnected.") + get_node("connect").set_text("Connect") + + + + +func _on_entry_line_text_entered( text ): + _on_entry_button_pressed(); + +func _on_entry_button_pressed(): + var msg = get_node("entry_line").get_text() + if (msg==""): + return + send_message(get_node("user_name").get_text()+"> "+msg) + + get_node("entry_line").set_text("") diff --git a/demos/misc/udp_chat/chat.scn b/demos/misc/udp_chat/chat.scn new file mode 100644 index 0000000000000000000000000000000000000000..efa4b799a0d4116591fe0cc513ee7ad83c989ff8 GIT binary patch literal 3198 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 literal 0 HcmV?d00001 diff --git a/demos/misc/udp_chat/engine.cfg b/demos/misc/udp_chat/engine.cfg new file mode 100644 index 0000000000..584841ea83 --- /dev/null +++ b/demos/misc/udp_chat/engine.cfg @@ -0,0 +1,5 @@ +[application] + +name="UDP Chat" +main_scene="res://chat.scn" +icon="res://icon.png" diff --git a/demos/misc/udp_chat/icon.png b/demos/misc/udp_chat/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..db6e21cce19ead5531f76b3d9a59bd119acb693f GIT binary patch literal 2388 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hElwQ~#Anp>leor?(aUA=hiQBA+xxi7bDU7$Q^e-1mB zPvB|gx2t$kJ*^!VEwwS(Fx%IR-|YR}`2Qbr?zE&hoAC#o$bWX`?%wC+=YGz8|I_yU zUM_)k$woWQWePQvuy=7N8NK;;+BiG;2;j;K* zHZy}m*!noz2P@;u8Ft*w6BNwM$ndb#v$u~gdv~WYcP4{^+GI}`mtDJdt-HZ_um1nv z$NUaDV#0!gORuEXdT9y@b{xVV_* z-LY808KEPlsiifk^z}7fZGMTP)9yKRA5{ts4Q;ksrtIF=aWltHTR3J%!NU!;$9FI@ zbev6_{OMEC%603eZQEwn>9#m1HdgoP)2B(BZw9%wv$!q}v@Cx&=grN{?x#+jQqk7d zUb|v)Uhw4e%xb3}Zd}|D&+#KQh*`~O#bh-D&I248=fjT}`{zDC@XpH4;)>(bY{sxV zTfZ6Y>*?{)+V*GODrR4qJMzyu-{&7T@Tsl%^tr3D==146x%nNdw$EN!qkG`i`urD@ zf2pmmJ0#+ESmsjKe7pB0mF4*XtN2V#+MeF0S@t_*W|)QdyxJ^xeg6acLLa(q{@u_| z`PaL>`|w2V+i^c8v;0xwUw`+?>FLk4Cz)@TpL|_j`LRi6ZTA8cK-C!zCJUCWj=*p?%m!~s6E?!--(yT>XDn@iREc; zEQ;%o|E?Kd$-ovi`-(m&aaf&bblzK>qz(_6O@! zSG()D9J*XyUjFr7bkL^*4SOzbyB2u0XA5J+({fQ0H>aG6FOu)#zA2Rb4p}C8?$OQV zWjxjE_W!o8{_*jJvi-4nmaW$BBhKBqY0iJ*_rsNs8Fb>d2rYF}@AbUh{Oq~t>0;6K zr*~I37kw#M{^r(4|Hyw^O`WUW{QJInxz*F1UDuyJ__smkU-sfZDW~OCE>AOk@I%u4 zj>i7KS8oTEF31c~I+S8*Gn31o$$;~K3d42dna8siUd=P-cKu*#GGU@f{cjbQU$;0} zii<6miR8B)PS(0UqwQdCoc{JUrx|V*{yY}%zJ4mwF!{)MVsljGp|r!dFB!c$p`|co z?%8fx*_b!4W>qlQye|s8al_()lC8sumru4FJ>-7(?wt2;RBqh#G!bJ~IGu86`ox1@ zdU&2i=$v`;?wE9Ef}G0%|5&|kJR7csGA=MNpUy5V^~+~TgVplMe-9k=NOAeBUudgSo_h6yu0~4OKqmQ33xE?4;=<;*8!Z5p^@$7-f2f_;? zHM3kh_>^8a$LW7>bK)pC`0~lg#HI;i46|$P@;KRcPMLTxdG6flU(==8T0dHRZj?OW zb70x;s*=~&X7^?)^30tQ@x@foN}o}l@p(f%qxh6XxefXO^^+$aoN~_3??=raBMBL6 zhP-l%A92OTTjluAf8A`oJLrtyL%#&G2bU&aXD)SMzrbR`pjdn9ZPn+Q4tx(T=4vHe zmzuozIe)f5AJhM-neEzsEVZ!^K zRyLbQUngrTL<^*+BEr@kfKf6Ji?Ow&4*$vT*@&#NK#|naHu*;jF->K2M21N*j1~aO_zw^8DA_GPMT`pSI}k zW?as8U=l~=uPiU7MZUk=-QNDu%b47i^^fJOF^|~s$1@uDdKKF7=6XvrY`^K#dD11@ zpZ|Slf#>Z-m-up|47Se~&b~T(#}e}j&+t0KwTi)wIlQxC|C?p@TJYEK%(<4J(s06* zM@-xGOwKb8fBv%@Z~S1GkiKz3s>Ga^Z{CEKOBXN~7zeBf{n3<{Si9)0=R<%55EjZTy(9Wz Oz~JfX=d#Wzp$Pz~IdBdD literal 0 HcmV?d00001 diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index bc1b17eade..057de329df 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -4174,7 +4174,7 @@ void RasterizerGLES2::capture_viewport(Image* r_capture) { DVector::Write w = pixels.write(); glPixelStorei(GL_PACK_ALIGNMENT, 4); - uint64_t time = OS::get_singleton()->get_ticks_usec(); +// uint64_t time = OS::get_singleton()->get_ticks_usec(); if (current_rt) { #ifdef GLEW_ENABLED @@ -4185,13 +4185,26 @@ void RasterizerGLES2::capture_viewport(Image* r_capture) { // back? glReadPixels( viewport.x, window_size.height-(viewport.height+viewport.y), viewport.width,viewport.height,GL_RGBA,GL_UNSIGNED_BYTE,w.ptr()); } - printf("readpixels time %i\n", (int)(OS::get_singleton()->get_ticks_usec() - time)); + + uint32_t *imgptr = (uint32_t*)w.ptr(); + for(int y=0;y<(viewport.height/2);y++) { + + uint32_t *ptr1 = &imgptr[y*viewport.width]; + uint32_t *ptr2 = &imgptr[(viewport.height-y-1)*viewport.width]; + + for(int x=0;x::Write(); r_capture->create(viewport.width,viewport.height,0,Image::FORMAT_RGBA,pixels); - r_capture->flip_y(); + //r_capture->flip_y(); - printf("total time %i\n", (int)(OS::get_singleton()->get_ticks_usec() - time)); #endif diff --git a/drivers/png/resource_saver_png.cpp b/drivers/png/resource_saver_png.cpp index 9b394e8a8c..1fee50c8b5 100644 --- a/drivers/png/resource_saver_png.cpp +++ b/drivers/png/resource_saver_png.cpp @@ -31,6 +31,7 @@ #include "drivers/png/png.h" #include "os/file_access.h" #include "globals.h" +#include "core/image.h" static void _write_png_data(png_structp png_ptr,png_bytep data, png_size_t p_length) { @@ -46,12 +47,56 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t ERR_EXPLAIN("Can't save empty texture as PNG"); ERR_FAIL_COND_V(!texture->get_width() || !texture->get_height(),ERR_INVALID_PARAMETER); + Image img = texture->get_data(); - if (img.get_format() > Image::FORMAT_INDEXED_ALPHA) - img.decompress(); + + Error err = save_image(p_path, img); + + if (err == OK) { + + bool global_filter = Globals::get_singleton()->get("image_loader/filter"); + bool global_mipmaps = Globals::get_singleton()->get("image_loader/gen_mipmaps"); + bool global_repeat = Globals::get_singleton()->get("image_loader/repeat"); + + String text; + + if (global_filter!=bool(texture->get_flags()&Texture::FLAG_FILTER)) { + text+=bool(texture->get_flags()&Texture::FLAG_FILTER)?"filter=true\n":"filter=false\n"; + } + if (global_mipmaps!=bool(texture->get_flags()&Texture::FLAG_MIPMAPS)) { + text+=bool(texture->get_flags()&Texture::FLAG_FILTER)?"gen_mipmaps=true\n":"gen_mipmaps=false\n"; + } + if (global_repeat!=bool(texture->get_flags()&Texture::FLAG_REPEAT)) { + text+=bool(texture->get_flags()&Texture::FLAG_FILTER)?"repeat=true\n":"repeat=false\n"; + } + if (bool(texture->get_flags()&Texture::FLAG_ANISOTROPIC_FILTER)) { + text+="anisotropic=true\n"; + } + if (bool(texture->get_flags()&Texture::FLAG_CONVERT_TO_LINEAR)) { + text+="tolinear=true\n"; + } + + if (text!="" || FileAccess::exists(p_path+".flags")) { + + FileAccess* f = FileAccess::open(p_path+".flags",FileAccess::WRITE); + if (f) { + + f->store_string(text); + memdelete(f); + } + } + } - ERR_FAIL_COND_V(img.get_format() > Image::FORMAT_INDEXED_ALPHA, ERR_INVALID_PARAMETER); + return err; +}; + +Error ResourceSaverPNG::save_image(const String &p_path, Image &p_img) { + + if (p_img.get_format() > Image::FORMAT_INDEXED_ALPHA) + p_img.decompress(); + + ERR_FAIL_COND_V(p_img.get_format() > Image::FORMAT_INDEXED_ALPHA, ERR_INVALID_PARAMETER); png_structp png_ptr; png_infop info_ptr; @@ -89,7 +134,7 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t int cs=0; - switch(img.get_format()) { + switch(p_img.get_format()) { case Image::FORMAT_GRAYSCALE: { @@ -113,14 +158,14 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t } break; default: { - if (img.detect_alpha()) { + if (p_img.detect_alpha()) { - img.convert(Image::FORMAT_RGBA); + p_img.convert(Image::FORMAT_RGBA); pngf=PNG_COLOR_TYPE_RGB_ALPHA; cs=4; } else { - img.convert(Image::FORMAT_RGB); + p_img.convert(Image::FORMAT_RGB); pngf=PNG_COLOR_TYPE_RGB; cs=3; } @@ -128,8 +173,8 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t } } - int w = img.get_width(); - int h = img.get_height(); + int w = p_img.get_width(); + int h = p_img.get_height(); png_set_IHDR(png_ptr, info_ptr, w,h, 8, pngf, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); @@ -144,7 +189,7 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t } - DVector::Read r = img.get_data().read(); + DVector::Read r = p_img.get_data().read(); row_pointers = (png_bytep*)memalloc(sizeof(png_bytep)*h); for(int i=0;iget("image_loader/filter"); - bool global_mipmaps = Globals::get_singleton()->get("image_loader/gen_mipmaps"); - bool global_repeat = Globals::get_singleton()->get("image_loader/repeat"); - - String text; - - if (global_filter!=bool(texture->get_flags()&Texture::FLAG_FILTER)) { - text+=bool(texture->get_flags()&Texture::FLAG_FILTER)?"filter=true\n":"filter=false\n"; - } - if (global_mipmaps!=bool(texture->get_flags()&Texture::FLAG_MIPMAPS)) { - text+=bool(texture->get_flags()&Texture::FLAG_FILTER)?"gen_mipmaps=true\n":"gen_mipmaps=false\n"; - } - if (global_repeat!=bool(texture->get_flags()&Texture::FLAG_REPEAT)) { - text+=bool(texture->get_flags()&Texture::FLAG_FILTER)?"repeat=true\n":"repeat=false\n"; - } - if (bool(texture->get_flags()&Texture::FLAG_ANISOTROPIC_FILTER)) { - text+="anisotropic=true\n"; - } - if (bool(texture->get_flags()&Texture::FLAG_CONVERT_TO_LINEAR)) { - text+="tolinear=true\n"; - } - - if (text!="" || FileAccess::exists(p_path+".flags")) { - - f = FileAccess::open(p_path+".flags",FileAccess::WRITE); - if (f) { - - f->store_string(text); - memdelete(f); - } - } - } - - /* cleanup heap allocation */ return OK; @@ -218,3 +226,8 @@ void ResourceSaverPNG::get_recognized_extensions(const RES& p_resource,List *p_extensions) const; + + ResourceSaverPNG(); }; diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp index d951524d3a..26a0b29228 100644 --- a/drivers/unix/packet_peer_udp_posix.cpp +++ b/drivers/unix/packet_peer_udp_posix.cpp @@ -25,7 +25,7 @@ int PacketPeerUDPPosix::get_available_packet_count() const { - Error err = const_cast(this)->poll(); + Error err = const_cast(this)->_poll(false); if (err!=OK) return 0; @@ -34,16 +34,16 @@ int PacketPeerUDPPosix::get_available_packet_count() const { Error PacketPeerUDPPosix::get_packet(const uint8_t **r_buffer,int &r_buffer_size) const{ - Error err = const_cast(this)->poll(); + Error err = const_cast(this)->_poll(false); if (err!=OK) return err; if (queue_count==0) return ERR_UNAVAILABLE; uint32_t size; - rb.read((uint8_t*)&size,4,true); rb.read((uint8_t*)&packet_ip.host,4,true); rb.read((uint8_t*)&packet_port,4,true); + rb.read((uint8_t*)&size,4,true); rb.read(packet_buffer,size,true); --queue_count; *r_buffer=packet_buffer; @@ -62,6 +62,7 @@ Error PacketPeerUDPPosix::put_packet(const uint8_t *p_buffer,int p_buffer_size){ errno = 0; int err; + while ( (err = sendto(sock, p_buffer, p_buffer_size, 0, (struct sockaddr*)&addr, sizeof(addr))) != p_buffer_size) { if (errno != EAGAIN) { @@ -91,8 +92,8 @@ Error PacketPeerUDPPosix::listen(int p_port, int p_recv_buffer_size){ close(); return ERR_UNAVAILABLE; } - printf("UDP Connection listening on port %i\n", p_port); - rb.resize(nearest_power_of_2(p_recv_buffer_size)); + printf("UDP Connection listening on port %i bufsize %i \n", p_port,p_recv_buffer_size); + rb.resize(nearest_shift(p_recv_buffer_size)); return OK; } @@ -105,18 +106,23 @@ void PacketPeerUDPPosix::close(){ queue_count=0; } -Error PacketPeerUDPPosix::poll() { + +Error PacketPeerUDPPosix::wait() { + + return _poll(true); +} + +Error PacketPeerUDPPosix::_poll(bool p_wait) { struct sockaddr_in from = {0}; socklen_t len = sizeof(struct sockaddr_in); int ret; - while ( (ret = recvfrom(sockfd, recv_buffer, MIN(sizeof(recv_buffer),rb.data_left()-12), MSG_DONTWAIT, (struct sockaddr*)&from, &len)) > 0) { + while ( (ret = recvfrom(sockfd, recv_buffer, MIN(sizeof(recv_buffer),rb.data_left()-12), p_wait?0:MSG_DONTWAIT, (struct sockaddr*)&from, &len)) > 0) { rb.write((uint8_t*)&from.sin_addr, 4); uint32_t port = ntohs(from.sin_port); rb.write((uint8_t*)&port, 4); rb.write((uint8_t*)&ret, 4); rb.write(recv_buffer, ret); - len = sizeof(struct sockaddr_in); ++queue_count; }; diff --git a/drivers/unix/packet_peer_udp_posix.h b/drivers/unix/packet_peer_udp_posix.h index 428c3ac37e..b14568eb5f 100644 --- a/drivers/unix/packet_peer_udp_posix.h +++ b/drivers/unix/packet_peer_udp_posix.h @@ -27,6 +27,7 @@ class PacketPeerUDPPosix : public PacketPeerUDP { _FORCE_INLINE_ int _get_socket(); static PacketPeerUDP* _create(); + virtual Error _poll(bool p_block); public: @@ -38,7 +39,7 @@ public: virtual Error listen(int p_port,int p_recv_buffer_size=65536); virtual void close(); - virtual Error poll(); + virtual Error wait(); virtual bool is_listening() const; virtual IP_Address get_packet_address() const; diff --git a/main/main.cpp b/main/main.cpp index ac2a20fb68..36f5f2aec5 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -819,6 +819,8 @@ Error Main::setup2() { register_module_types(); register_driver_types(); + ScriptServer::init_languages(); + MAIN_PRINT("Main: Load Translations"); translation_server->setup(); //register translations, load them, etc. diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp index 543eecdf8b..4470b7ca0c 100644 --- a/modules/gdscript/register_types.cpp +++ b/modules/gdscript/register_types.cpp @@ -125,7 +125,7 @@ void register_gdscript_types() { ObjectTypeDB::register_virtual_type(); script_language_gd=memnew( GDScriptLanguage ); - script_language_gd->init(); + //script_language_gd->init(); ScriptServer::register_language(script_language_gd); resource_loader_gd=memnew( ResourceFormatLoaderGDScript ); ResourceLoader::add_resource_format_loader(resource_loader_gd); diff --git a/platform/windows/packet_peer_udp_winsock.cpp b/platform/windows/packet_peer_udp_winsock.cpp index 25851c0d73..c28d72c99c 100644 --- a/platform/windows/packet_peer_udp_winsock.cpp +++ b/platform/windows/packet_peer_udp_winsock.cpp @@ -4,7 +4,7 @@ int PacketPeerUDPWinsock::get_available_packet_count() const { - Error err = const_cast(this)->poll(); + Error err = const_cast(this)->_poll(false); if (err!=OK) return 0; @@ -13,16 +13,16 @@ int PacketPeerUDPWinsock::get_available_packet_count() const { Error PacketPeerUDPWinsock::get_packet(const uint8_t **r_buffer,int &r_buffer_size) const{ - Error err = const_cast(this)->poll(); + Error err = const_cast(this)->_poll(false); if (err!=OK) return err; if (queue_count==0) return ERR_UNAVAILABLE; uint32_t size; - rb.read((uint8_t*)&size,4,true); rb.read((uint8_t*)&packet_ip.host,4,true); rb.read((uint8_t*)&packet_port,4,true); + rb.read((uint8_t*)&size,4,true); rb.read(packet_buffer,size,true); --queue_count; *r_buffer=packet_buffer; @@ -39,6 +39,9 @@ Error PacketPeerUDPWinsock::put_packet(const uint8_t *p_buffer,int p_buffer_size addr.sin_port = htons(peer_port); addr.sin_addr = *((struct in_addr*)&peer_addr.host); + + _set_blocking(true); + errno = 0; int err; while ( (err = sendto(sock, (const char*)p_buffer, p_buffer_size, 0, (struct sockaddr*)&addr, sizeof(addr))) != p_buffer_size) { @@ -56,6 +59,21 @@ int PacketPeerUDPWinsock::get_max_packet_size() const{ return 512; // uhm maybe not } + +void PacketPeerUDPWinsock::_set_blocking(bool p_blocking) { + + if (blocking==p_blocking) + return; + + blocking=p_blocking; + unsigned long par = blocking?0:1; + if (ioctlsocket(sockfd, FIONBIO, &par)) { + perror("setting non-block mode"); + //close(); + //return -1; + }; +} + Error PacketPeerUDPWinsock::listen(int p_port, int p_recv_buffer_size){ close(); @@ -70,8 +88,11 @@ Error PacketPeerUDPWinsock::listen(int p_port, int p_recv_buffer_size){ close(); return ERR_UNAVAILABLE; } + + blocking=true; + printf("UDP Connection listening on port %i\n", p_port); - rb.resize(nearest_power_of_2(p_recv_buffer_size)); + rb.resize(nearest_shift(p_recv_buffer_size)); return OK; } @@ -84,7 +105,16 @@ void PacketPeerUDPWinsock::close(){ queue_count=0; } -Error PacketPeerUDPWinsock::poll() { + +Error PacketPeerUDPWinsock::wait() { + + return _poll(true); +} +Error PacketPeerUDPWinsock::_poll(bool p_wait) { + + + _set_blocking(p_wait); + struct sockaddr_in from = {0}; int len = sizeof(struct sockaddr_in); @@ -100,13 +130,16 @@ Error PacketPeerUDPWinsock::poll() { ++queue_count; }; + if (ret == 0 || (ret == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) ) { close(); return FAILED; }; + return OK; } + bool PacketPeerUDPWinsock::is_listening() const{ return sockfd!=-1; diff --git a/platform/windows/packet_peer_udp_winsock.h b/platform/windows/packet_peer_udp_winsock.h index 7806666b63..34dbcbee91 100644 --- a/platform/windows/packet_peer_udp_winsock.h +++ b/platform/windows/packet_peer_udp_winsock.h @@ -26,6 +26,11 @@ class PacketPeerUDPWinsock : public PacketPeerUDP { static PacketPeerUDP* _create(); + bool blocking; + void _set_blocking(bool p_blocking); + + Error _poll(bool p_wait); + public: virtual int get_available_packet_count() const; @@ -36,7 +41,7 @@ public: virtual Error listen(int p_port,int p_recv_buffer_size=65536); virtual void close(); - virtual Error poll(); + virtual Error wait(); virtual bool is_listening() const; virtual IP_Address get_packet_address() const; diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 33176c4f34..3114106235 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -263,6 +263,25 @@ bool Area2D::is_monitoring_enabled() const { return monitoring; } +Array Area2D::get_overlapping_bodies() const { + + ERR_FAIL_COND_V(!monitoring,Array()); + Array ret; + ret.resize(body_map.size()); + int idx=0; + for (const Map::Element *E=body_map.front();E;E=E->next()) { + Object *obj = ObjectDB::get_instance(E->key()); + if (!obj) { + ret.resize( ret.size() -1 ); //ops + } else { + ret[idx++]=obj; + } + + } + + return ret; +} + void Area2D::_bind_methods() { @@ -290,6 +309,8 @@ void Area2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_enable_monitoring","enable"),&Area2D::set_enable_monitoring); ObjectTypeDB::bind_method(_MD("is_monitoring_enabled"),&Area2D::is_monitoring_enabled); + ObjectTypeDB::bind_method(_MD("get_overlapping_bodies"),&Area2D::get_overlapping_bodies); + ObjectTypeDB::bind_method(_MD("_body_inout"),&Area2D::_body_inout); diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h index 85f2b91582..c6210e7c9a 100644 --- a/scene/2d/area_2d.h +++ b/scene/2d/area_2d.h @@ -112,6 +112,8 @@ public: void set_enable_monitoring(bool p_enable); bool is_monitoring_enabled() const; + Array get_overlapping_bodies() const; //function for script + Area2D(); ~Area2D(); diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index f2f7a15e91..655c6e8bf6 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -618,6 +618,26 @@ RigidBody2D::CCDMode RigidBody2D::get_continuous_collision_detection_mode() cons } +Array RigidBody2D::get_colliding_bodies() const { + + ERR_FAIL_COND_V(!contact_monitor,Array()); + + Array ret; + ret.resize(contact_monitor->body_map.size()); + int idx=0; + for (const Map::Element *E=contact_monitor->body_map.front();E;E=E->next()) { + Object *obj = ObjectDB::get_instance(E->key()); + if (!obj) { + ret.resize( ret.size() -1 ); //ops + } else { + ret[idx++]=obj; + } + + } + + return ret; +} + void RigidBody2D::set_contact_monitor(bool p_enabled) { if (p_enabled==is_contact_monitor_enabled()) @@ -697,6 +717,8 @@ void RigidBody2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("_body_enter_tree"),&RigidBody2D::_body_enter_tree); ObjectTypeDB::bind_method(_MD("_body_exit_tree"),&RigidBody2D::_body_exit_tree); + ObjectTypeDB::bind_method(_MD("get_colliding_bodies"),&RigidBody2D::get_colliding_bodies); + BIND_VMETHOD(MethodInfo("_integrate_forces",PropertyInfo(Variant::OBJECT,"state:Physics2DDirectBodyState"))); ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Rigid,Static,Character,Kinematic"),_SCS("set_mode"),_SCS("get_mode")); diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h index 77e909f105..ca7b757497 100644 --- a/scene/2d/physics_body_2d.h +++ b/scene/2d/physics_body_2d.h @@ -229,6 +229,8 @@ public: void set_applied_force(const Vector2& p_force); Vector2 get_applied_force() const; + Array get_colliding_bodies() const; //function for script + RigidBody2D(); ~RigidBody2D(); diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 407747fc0d..cb1df78fda 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -255,6 +255,24 @@ bool Area::is_monitoring_enabled() const { } +Array Area::get_overlapping_bodies() const { + + ERR_FAIL_COND_V(!monitoring,Array()); + Array ret; + ret.resize(body_map.size()); + int idx=0; + for (const Map::Element *E=body_map.front();E;E=E->next()) { + Object *obj = ObjectDB::get_instance(E->key()); + if (!obj) { + ret.resize( ret.size() -1 ); //ops + } else { + ret[idx++]=obj; + } + + } + + return ret; +} void Area::_bind_methods() { @@ -283,6 +301,8 @@ void Area::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_enable_monitoring","enable"),&Area::set_enable_monitoring); ObjectTypeDB::bind_method(_MD("is_monitoring_enabled"),&Area::is_monitoring_enabled); + ObjectTypeDB::bind_method(_MD("get_overlapping_bodies"),&Area::get_overlapping_bodies); + ObjectTypeDB::bind_method(_MD("_body_inout"),&Area::_body_inout); diff --git a/scene/3d/area.h b/scene/3d/area.h index 96b8585338..4707b73e1c 100644 --- a/scene/3d/area.h +++ b/scene/3d/area.h @@ -112,6 +112,8 @@ public: void set_enable_monitoring(bool p_enable); bool is_monitoring_enabled() const; + Array get_overlapping_bodies() const; + Area(); ~Area(); diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index a80fdce64c..21ecac6e3d 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -637,6 +637,27 @@ RigidBody::AxisLock RigidBody::get_axis_lock() const { } +Array RigidBody::get_colliding_bodies() const { + + ERR_FAIL_COND_V(!contact_monitor,Array()); + + Array ret; + ret.resize(contact_monitor->body_map.size()); + int idx=0; + for (const Map::Element *E=contact_monitor->body_map.front();E;E=E->next()) { + Object *obj = ObjectDB::get_instance(E->key()); + if (!obj) { + ret.resize( ret.size() -1 ); //ops + } else { + ret[idx++]=obj; + } + + } + + return ret; +} + + void RigidBody::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_mode","mode"),&RigidBody::set_mode); @@ -688,6 +709,8 @@ void RigidBody::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_axis_lock","axis_lock"),&RigidBody::set_axis_lock); ObjectTypeDB::bind_method(_MD("get_axis_lock"),&RigidBody::get_axis_lock); + ObjectTypeDB::bind_method(_MD("get_colliding_bodies"),&RigidBody::get_colliding_bodies); + BIND_VMETHOD(MethodInfo("_integrate_forces",PropertyInfo(Variant::OBJECT,"state:PhysicsDirectBodyState"))); ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Rigid,Static,Character,Kinematic"),_SCS("set_mode"),_SCS("get_mode")); diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index f9f028e20d..0d1de7f236 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -236,6 +236,7 @@ public: void set_axis_lock(AxisLock p_lock); AxisLock get_axis_lock() const; + Array get_colliding_bodies() const; void apply_impulse(const Vector3& p_pos, const Vector3& p_impulse);