8cab401d08
-=-=-=-=-=-=-=-=-=-=-=-=-=-
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.
106 lines
3.2 KiB
C++
106 lines
3.2 KiB
C++
/*************************************************************************/
|
|
/* mutex_windows.cpp */
|
|
/*************************************************************************/
|
|
/* This file is part of: */
|
|
/* GODOT ENGINE */
|
|
/* http://www.godotengine.org */
|
|
/*************************************************************************/
|
|
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
|
/* */
|
|
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
/* a copy of this software and associated documentation files (the */
|
|
/* "Software"), to deal in the Software without restriction, including */
|
|
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
/* the following conditions: */
|
|
/* */
|
|
/* The above copyright notice and this permission notice shall be */
|
|
/* included in all copies or substantial portions of the Software. */
|
|
/* */
|
|
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
/*************************************************************************/
|
|
#include "mutex_windows.h"
|
|
#include "os/memory.h"
|
|
|
|
#ifdef WINDOWS_ENABLED
|
|
|
|
|
|
|
|
void MutexWindows::lock() {
|
|
|
|
#ifdef WINDOWS_USE_MUTEX
|
|
WaitForSingleObject(mutex,INFINITE);
|
|
#else
|
|
EnterCriticalSection( &mutex );
|
|
#endif
|
|
}
|
|
|
|
|
|
void MutexWindows::unlock() {
|
|
|
|
#ifdef WINDOWS_USE_MUTEX
|
|
ReleaseMutex(mutex);
|
|
#else
|
|
LeaveCriticalSection( &mutex );
|
|
#endif
|
|
}
|
|
|
|
Error MutexWindows::try_lock() {
|
|
|
|
#ifdef WINDOWS_USE_MUTEX
|
|
return (WaitForSingleObject(mutex,0)==WAIT_TIMEOUT)?ERR_BUSY:OK;
|
|
#else
|
|
|
|
if (TryEnterCriticalSection( &mutex ))
|
|
return OK;
|
|
else
|
|
return ERR_BUSY;
|
|
#endif
|
|
|
|
}
|
|
|
|
Mutex *MutexWindows::create_func_windows(bool p_recursive) {
|
|
|
|
return memnew( MutexWindows );
|
|
}
|
|
|
|
void MutexWindows::make_default() {
|
|
|
|
create_func=create_func_windows;
|
|
}
|
|
|
|
MutexWindows::MutexWindows() {
|
|
|
|
#ifdef WINDOWS_USE_MUTEX
|
|
mutex = CreateMutex( NULL, FALSE, NULL );
|
|
#else
|
|
#ifdef WINRT_ENABLED
|
|
InitializeCriticalSectionEx( &mutex, 0, 0 );
|
|
#else
|
|
InitializeCriticalSection( &mutex );
|
|
#endif
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
MutexWindows::~MutexWindows() {
|
|
|
|
#ifdef WINDOWS_USE_MUTEX
|
|
CloseHandle(mutex);
|
|
#else
|
|
|
|
DeleteCriticalSection(&mutex);
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
#endif
|