diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-09-15 11:33:30 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-09-15 11:33:30 -0300 |
commit | 8cab401d08f8e25aa9b2dc710204785858ff3dbb (patch) | |
tree | 1a4cec868f937fb24d340ee33fbeba2f1c6fa9f2 /drivers/unix | |
parent | 1a2cb755e2d8b9d59178f36702f6dff7235b9088 (diff) |
3D Physics Rework, Other Stuff
-=-=-=-=-=-=-=-=-=-=-=-=-=-
3D Physics:
-Fixed "Bounce" parameter in 3D
-Fixed bug affecting Area (sometims it would not detect properly)
-Vehicle Body has seen heavy work
-Added Query API for doing space queries in 3D. Needs some docs though.
-Added JOINTS! Adapted Bullet Joints: and created easy gizmos for setting them up:
-PinJoint
-HingeJoint (with motor)
-SliderJoint
-ConeTwistJoint
-Generic6DOFJoint
-Added OBJECT PICKING! based on the new query API. Any physics object now (Area or Body) has the following signals and virtual functions:
-input_event (mouse or multitouch input over the body)
-mouse_enter (mouse entered the body area)
-mouse_exit (mouse exited body area)
For Area it needs to be activated manually, as it isn't by default (ray goes thru).
Other:
-Begun working on Windows 8 (RT) port. Compiles but does not work yet.
-Added TheoraPlayer library for improved to-texture and portable video support.
-Fixed a few bugs in the renderer, collada importer, collada exporter, etc.
Diffstat (limited to 'drivers/unix')
-rw-r--r-- | drivers/unix/file_access_unix.cpp | 2 | ||||
-rw-r--r-- | drivers/unix/ip_unix.cpp | 45 |
2 files changed, 32 insertions, 15 deletions
diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 239e41be4c..7f85526852 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -64,7 +64,7 @@ Error FileAccessUnix::_open(const String& p_path, int p_mode_flags) { f=NULL; String path=fix_path(p_path); - //printf("opening %ls\n", path.c_str()); + //printf("opening %ls, %i\n", path.c_str(), Memory::get_static_mem_usage()); ERR_FAIL_COND_V(f,ERR_ALREADY_IN_USE); const char* mode_string; diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp index 24b18a14f7..c221743457 100644 --- a/drivers/unix/ip_unix.cpp +++ b/drivers/unix/ip_unix.cpp @@ -32,23 +32,31 @@ #ifdef WINDOWS_ENABLED -#define WINVER 0x0600 -#include <ws2tcpip.h> -#include <winsock2.h> -#include <windows.h> -#include <stdio.h> -#include <iphlpapi.h> + #ifdef WINRT_ENABLED + #include <ws2tcpip.h> + #include <winsock2.h> + #include <windows.h> + #include <stdio.h> + #else + #define WINVER 0x0600 + #include <ws2tcpip.h> + #include <winsock2.h> + #include <windows.h> + #include <stdio.h> + #include <iphlpapi.h> + #endif #else -#include <netdb.h> -#ifdef ANDROID_ENABLED -#include "platform/android/ifaddrs_android.h" -#else -#include <ifaddrs.h> -#endif -#include <arpa/inet.h> -#include <sys/socket.h> + #include <netdb.h> + #ifdef ANDROID_ENABLED + #include "platform/android/ifaddrs_android.h" + #else + #include <ifaddrs.h> + #endif + #include <arpa/inet.h> + #include <sys/socket.h> #endif + IP_Address IP_Unix::_resolve_hostname(const String& p_hostname) { struct hostent *he; @@ -66,6 +74,14 @@ IP_Address IP_Unix::_resolve_hostname(const String& p_hostname) { #if defined(WINDOWS_ENABLED) +#if defined(WINRT_ENABLED) + +void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const { + + +}; +#else + void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const { ULONG buf_size = 1024; @@ -119,6 +135,7 @@ void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const { memfree(addrs); }; +#endif #else |