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 ae9fb0adc465..17ee569b6bf7 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 0084a3616f5d..f4c96703b9dc 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 cd39aa6c81d6..3cd8bb773367 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 f30137094453..83217ffc411f 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 049ac0132fc9..73ff487b19bd 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 ad93fca4b52b..81a9e2b06229 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 1e0dcc678fdf..d62e9849a18b 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 28953a535f01..93a9e6475fa0 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 000000000000..3270eebbfe3b --- /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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::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 9b394e8a8cf8..1fee50c8b51e 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 d951524d3acd..26a0b292287d 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 428c3ac37e39..b14568eb5f5b 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 ac2a20fb68a7..36f5f2aec547 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 543eecdf8bd9..4470b7ca0c24 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 25851c0d7398..c28d72c99c18 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 7806666b63a4..34dbcbee9169 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 33176c4f343d..3114106235a4 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 85f2b91582d9..c6210e7c9a11 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 f2f7a15e9107..655c6e8bf6ee 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 77e909f10575..ca7b75749732 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 407747fc0dd0..cb1df78fda4a 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 96b858533860..4707b73e1c50 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 a80fdce64cf3..21ecac6e3d65 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 f9f028e20dbd..0d1de7f2366e 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);