sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Reversing the last merge because I botched it.

Browse Source
This commit is contained in:
Mitchell Stokes 2010-05-29 21:22:24 +00:00
parent e335321e88
commit 9d3157eed0
29 changed files with 381 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
CMakeLists.txt
View File

@ -162,8 +162,6 @@ IF(UNIX AND NOT APPLE)
FIND_PACKAGE(Freetype) FIND_PACKAGE(Freetype)
# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
IF(WITH_PYTHON)
# No way to set py31. remove for now. # No way to set py31. remove for now.
# FIND_PACKAGE(PythonLibs) # FIND_PACKAGE(PythonLibs)
SET(PYTHON /usr) SET(PYTHON /usr)
@ -177,8 +175,6 @@ IF(UNIX AND NOT APPLE)
# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "") # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic") SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
ENDIF(WITH_PYTHON)
IF(WITH_SDL) IF(WITH_SDL)
FIND_PACKAGE(SDL) FIND_PACKAGE(SDL)
@ -188,7 +184,6 @@ IF(UNIX AND NOT APPLE)
ENDIF(NOT SDL_FOUND) ENDIF(NOT SDL_FOUND)
ENDIF(WITH_SDL) ENDIF(WITH_SDL)
IF(WITH_OPENEXR)
SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory") SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
FIND_PATH(OPENEXR_INC FIND_PATH(OPENEXR_INC
ImfXdr.h ImfXdr.h
@ -201,14 +196,11 @@ IF(UNIX AND NOT APPLE)
/opt/include/OpenEXR /opt/include/OpenEXR
) )
SET(OPENEXR_LIB Half IlmImf Iex Imath) SET(OPENEXR_LIB Half IlmImf Iex Imath)
ENDIF(WITH_OPENEXR)
IF(WITH_FFMPEG)
SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory") SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
SET(FFMPEG_INC ${FFMPEG}/include) SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries") SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
SET(FFMPEG_LIBPATH ${FFMPEG}/lib) SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
ENDIF(WITH_FFMPEG)
IF(WITH_FFTW3) IF(WITH_FFTW3)
SET(FFTW3 /usr) SET(FFTW3 /usr)
@ -255,10 +247,6 @@ IF(UNIX AND NOT APPLE)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux") IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# BSD's dont use libdl.so # BSD's dont use libdl.so
SET(LLIBS "${LLIBS} -ldl") SET(LLIBS "${LLIBS} -ldl")
# binreloc is linux only
SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
SET(BINRELOC_INC ${BINRELOC}/include)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
IF(WITH_OPENMP) IF(WITH_OPENMP)
@ -279,7 +267,6 @@ IF(UNIX AND NOT APPLE)
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
ENDIF(UNIX AND NOT APPLE) ENDIF(UNIX AND NOT APPLE)
IF(WIN32) IF(WIN32)
# this file is included anyway when building under Windows with cl.exe # this file is included anyway when building under Windows with cl.exe
@ -293,36 +280,12 @@ IF(WIN32)
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64) SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
ENDIF(CMAKE_CL_64) ENDIF(CMAKE_CL_64)
ADD_DEFINITIONS(-DWIN32)
SET(ICONV ${LIBDIR}/iconv)
SET(ICONV_INC ${ICONV}/include)
SET(ICONV_LIB iconv)
SET(ICONV_LIBPATH ${ICONV}/lib)
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
SET(LIBSAMPLERATE_LIB libsamplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
SET(PNG "${LIBDIR}/png")
SET(PNG_INC "${PNG}/include")
SET(PNG_LIBPATH ${PNG}/lib)
SET(JPEG "${LIBDIR}/jpeg")
SET(JPEG_INC "${JPEG}/include")
SET(JPEG_LIBPATH ${JPEG}/lib)
SET(WINTAB_INC ${LIBDIR}/wintab/include)
IF(WITH_PYTHON)
SET(PYTHON ${LIBDIR}/python) SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 3.1) SET(PYTHON_VERSION 3.1)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}") SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
# SET(PYTHON_BINARY python) # not used yet # SET(PYTHON_BINARY python) # not used yet
SET(PYTHON_LIB python31) SET(PYTHON_LIB python31)
SET(PYTHON_LIBPATH ${PYTHON}/lib) SET(PYTHON_LIBPATH ${PYTHON}/lib)
ENDIF(WITH_PYTHON)
IF(WITH_OPENAL) IF(WITH_OPENAL)
SET(OPENAL ${LIBDIR}/openal) SET(OPENAL ${LIBDIR}/openal)
@ -338,19 +301,35 @@ IF(WIN32)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib) SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
ENDIF(WITH_SNDFILE) ENDIF(WITH_SNDFILE)
IF(WITH_SDL) SET(ICONV ${LIBDIR}/iconv)
SET(SDL ${LIBDIR}/sdl) SET(ICONV_INC ${ICONV}/include)
SET(SDL_INCLUDE_DIR ${SDL}/include) SET(ICONV_LIB iconv)
SET(SDL_LIBRARY SDL) SET(ICONV_LIBPATH ${ICONV}/lib)
SET(SDL_LIBPATH ${SDL}/lib)
ENDIF(WITH_SDL)
IF(WITH_QUICKTIME)
SET(QUICKTIME ${LIBDIR}/QTDevWin) SET(QUICKTIME ${LIBDIR}/QTDevWin)
SET(QUICKTIME_INC ${QUICKTIME}/CIncludes) SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
SET(QUICKTIME_LIB qtmlClient) SET(QUICKTIME_LIB qtmlClient)
SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries) SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
ENDIF(WITH_QUICKTIME)
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
SET(LIBSAMPLERATE_LIB libsamplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
SET(SDL ${LIBDIR}/sdl)
SET(SDL_INCLUDE_DIR ${SDL}/include)
SET(SDL_LIBRARY SDL)
SET(SDL_LIBPATH ${SDL}/lib)
SET(PNG "${LIBDIR}/png")
SET(PNG_INC "${PNG}/include")
SET(PNG_LIBPATH ${PNG}/lib)
SET(JPEG "${LIBDIR}/jpeg")
SET(JPEG_INC "${JPEG}/include")
SET(JPEG_LIBPATH ${JPEG}/lib)
SET(WINTAB_INC ${LIBDIR}/wintab/include)
IF(MSVC) IF(MSVC)
IF(CMAKE_CL_64) IF(CMAKE_CL_64)
@ -371,6 +350,8 @@ IF(WIN32)
SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE) SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
ADD_DEFINITIONS(-DWIN32)
IF(WITH_OPENMP) IF(WITH_OPENMP)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
@ -476,19 +457,19 @@ IF(WIN32)
ELSE(MSVC) # MINGW ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid") SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ") SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags " FORCE)
SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ") SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags " FORCE)
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags ") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags " FORCE)
SET(CMAKE_CXX_FLAGS_RELEASE " -O2" CACHE STRING "Mingw release C++ flags ") SET(CMAKE_CXX_FLAGS_RELEASE " -O2" CACHE STRING "Mingw release C++ flags " FORCE)
SET(CMAKE_CXX_FLAGS_MINSIZEREL " -Os" CACHE STRING "Mingw minsize release C++ flags ") SET(CMAKE_CXX_FLAGS_MINSIZEREL " -Os" CACHE STRING "Mingw minsize release C++ flags " FORCE)
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags " FORCE)
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C flags ") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C flags " FORCE)
SET(CMAKE_C_FLAGS_RELEASE "-O2" CACHE STRING "Mingw release C flags ") SET(CMAKE_C_FLAGS_RELEASE "-O2" CACHE STRING "Mingw release C flags " FORCE)
SET(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE STRING "Mingw minsize release C flags ") SET(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE STRING "Mingw minsize release C flags " FORCE)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags " FORCE)
ADD_DEFINITIONS(-DFREE_WINDOWS) ADD_DEFINITIONS(-DFREE_WINDOWS -DWIN32)
IF(WITH_OPENMP) IF(WITH_OPENMP)
SET(LLIBS "${LLIBS} -lgomp") SET(LLIBS "${LLIBS} -lgomp")
@ -545,7 +526,7 @@ IF(WIN32)
IF(WITH_OPENEXR) IF(WITH_OPENEXR)
SET(OPENEXR ${LIBDIR}/gcc/openexr) SET(OPENEXR ${LIBDIR}/gcc/openexr)
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR) SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
SET(OPENEXR_LIB Half IlmImf Iex IlmThread) SET(OPENEXR_LIB Half IlmImf Iex)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib) SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR) ENDIF(WITH_OPENEXR)
@ -570,7 +551,6 @@ IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
IF(APPLE) IF(APPLE)
IF(WITH_LIBS10.5) IF(WITH_LIBS10.5)
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal) SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
@ -749,6 +729,11 @@ IF(APPLE)
ENDIF(APPLE) ENDIF(APPLE)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
SET(BINRELOC_INC ${BINRELOC}/include)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# buildinfo # buildinfo
IF(WITH_BUILDINFO) IF(WITH_BUILDINFO)

2
config/linuxcross-config.py
View File

@ -55,7 +55,7 @@ WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False WITH_BF_STATICOPENEXR = False
BF_OPENEXR = LIBDIR + '/gcc/openexr' BF_OPENEXR = LIBDIR + '/gcc/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Half IlmImf Iex IlmThread ' BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm. # Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'

2
config/win32-mingw-config.py
View File

@ -54,7 +54,7 @@ WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False WITH_BF_STATICOPENEXR = False
BF_OPENEXR = LIBDIR + '/gcc/openexr' BF_OPENEXR = LIBDIR + '/gcc/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Half IlmImf Iex IlmThread ' BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm. # Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'

2
intern/ghost/GHOST_ISystem.h
View File

@ -258,7 +258,7 @@ public:
* @return Indication of success. * @return Indication of success.
*/ */
virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
const bool stereoVisual) = 0; const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0) = 0;
/** /**
* Ends full screen mode. * Ends full screen mode.

9
intern/ghost/intern/GHOST_System.cpp
View File

@ -133,7 +133,7 @@ bool GHOST_System::validWindow(GHOST_IWindow* window)
GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
const bool stereoVisual) const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{ {
GHOST_TSuccess success = GHOST_kFailure; GHOST_TSuccess success = GHOST_kFailure;
GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager") GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
@ -145,7 +145,7 @@ GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting
success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, setting); success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, setting);
if (success == GHOST_kSuccess) { if (success == GHOST_kSuccess) {
//GHOST_PRINT("GHOST_System::beginFullScreen(): creating full-screen window\n"); //GHOST_PRINT("GHOST_System::beginFullScreen(): creating full-screen window\n");
success = createFullScreenWindow((GHOST_Window**)window, stereoVisual); success = createFullScreenWindow((GHOST_Window**)window, stereoVisual, numOfAASamples);
if (success == GHOST_kSuccess) { if (success == GHOST_kSuccess) {
m_windowManager->beginFullScreen(*window, stereoVisual); m_windowManager->beginFullScreen(*window, stereoVisual);
} }
@ -327,7 +327,7 @@ GHOST_TSuccess GHOST_System::exit()
} }
GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual) GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{ {
GHOST_TSuccess success; GHOST_TSuccess success;
GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager") GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
@ -341,7 +341,8 @@ GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const
0, 0, settings.xPixels, settings.yPixels, 0, 0, settings.xPixels, settings.yPixels,
GHOST_kWindowStateFullScreen, GHOST_kWindowStateFullScreen,
GHOST_kDrawingContextTypeOpenGL, GHOST_kDrawingContextTypeOpenGL,
stereoVisual); stereoVisual,
numOfAASamples);
success = *window == 0 ? GHOST_kFailure : GHOST_kSuccess; success = *window == 0 ? GHOST_kFailure : GHOST_kSuccess;
} }
return success; return success;

4
intern/ghost/intern/GHOST_System.h
View File

@ -141,7 +141,7 @@ public:
* @return Indication of success. * @return Indication of success.
*/ */
virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
const bool stereoVisual); const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0);
/** /**
* Ends full screen mode. * Ends full screen mode.
@ -330,7 +330,7 @@ protected:
* @return Indication of success. * @return Indication of success.
*/ */
virtual GHOST_TSuccess createFullScreenWindow(GHOST_Window** window, virtual GHOST_TSuccess createFullScreenWindow(GHOST_Window** window,
const bool stereoVisual); const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0);
/** The display manager (platform dependant). */ /** The display manager (platform dependant). */
GHOST_DisplayManager* m_displayManager; GHOST_DisplayManager* m_displayManager;

13
source/blender/editors/interface/interface_handlers.c
View File

@ -1659,7 +1659,7 @@ static void ui_do_but_textedit(bContext *C, uiBlock *block, uiBut *but, uiHandle
my= event->y; my= event->y;
ui_window_to_block(data->region, block, &mx, &my); ui_window_to_block(data->region, block, &mx, &my);
if (ui_mouse_inside_button(data->region, but, mx, my)) { if ((but->y1 <= my) && (my <= but->y2) && (but->x1 <= mx) && (mx <= but->x2)) {
ui_textedit_set_cursor_pos(but, data, mx); ui_textedit_set_cursor_pos(but, data, mx);
but->selsta = but->selend = but->pos; but->selsta = but->selend = but->pos;
data->selstartx= mx; data->selstartx= mx;
@ -1999,9 +1999,7 @@ static int ui_do_but_HOTKEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data
if(event->type == MOUSEMOVE) if(event->type == MOUSEMOVE)
return WM_UI_HANDLER_CONTINUE; return WM_UI_HANDLER_CONTINUE;
if(event->type == LEFTMOUSE && event->val==KM_PRESS) { if(event->type == ESCKEY) {
/* only cancel if click outside the button */
if(ui_mouse_inside_button(but->active->region, but, event->x, event->y) == 0) {
/* data->cancel doesnt work, this button opens immediate */ /* data->cancel doesnt work, this button opens immediate */
if(but->flag & UI_BUT_IMMEDIATE) if(but->flag & UI_BUT_IMMEDIATE)
ui_set_but_val(but, 0); ui_set_but_val(but, 0);
@ -2010,7 +2008,6 @@ static int ui_do_but_HOTKEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data
button_activate_state(C, but, BUTTON_STATE_EXIT); button_activate_state(C, but, BUTTON_STATE_EXIT);
return WM_UI_HANDLER_BREAK; return WM_UI_HANDLER_BREAK;
} }
}
/* always set */ /* always set */
but->modifier_key = 0; but->modifier_key = 0;
@ -2043,10 +2040,14 @@ static int ui_do_but_HOTKEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data
return WM_UI_HANDLER_CONTINUE; return WM_UI_HANDLER_CONTINUE;
} }
static int ui_do_but_KEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data, wmEvent *event) static int ui_do_but_KEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data, wmEvent *event)
{ {
if(data->state == BUTTON_STATE_HIGHLIGHT) { if(data->state == BUTTON_STATE_HIGHLIGHT) {
if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->val==KM_PRESS) { if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->val==KM_PRESS) {
short event= (short)ui_get_but_val(but);
/* hardcoded prevention from editing or assigning ESC */
if(event!=ESCKEY)
button_activate_state(C, but, BUTTON_STATE_WAIT_KEY_EVENT); button_activate_state(C, but, BUTTON_STATE_WAIT_KEY_EVENT);
return WM_UI_HANDLER_BREAK; return WM_UI_HANDLER_BREAK;
} }
@ -2056,7 +2057,7 @@ static int ui_do_but_KEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data, w
return WM_UI_HANDLER_CONTINUE; return WM_UI_HANDLER_CONTINUE;
if(event->val==KM_PRESS) { if(event->val==KM_PRESS) {
if(WM_key_event_string(event->type)[0]) if(event->type!=ESCKEY && WM_key_event_string(event->type)[0])
ui_set_but_val(but, event->type); ui_set_but_val(but, event->type);
else else
data->cancel= 1; data->cancel= 1;

42
source/blender/editors/sound/sound_ops.c
View File

@ -30,13 +30,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "MEM_guardedalloc.h"
#include "DNA_packedFile_types.h" #include "DNA_packedFile_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_space_types.h" #include "DNA_space_types.h"
#include "DNA_sequence_types.h" #include "DNA_sequence_types.h"
#include "DNA_userdef_types.h"
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_global.h" #include "BKE_global.h"
@ -64,30 +61,17 @@
/******************** open sound operator ********************/ /******************** open sound operator ********************/
static void open_init(bContext *C, wmOperator *op)
{
PropertyPointerRNA *pprop;
op->customdata= pprop= MEM_callocN(sizeof(PropertyPointerRNA), "OpenPropertyPointerRNA");
uiIDContextProperty(C, &pprop->ptr, &pprop->prop);
}
static int open_exec(bContext *C, wmOperator *op) static int open_exec(bContext *C, wmOperator *op)
{ {
char path[FILE_MAX]; char path[FILE_MAX];
bSound *sound; bSound *sound;
PropertyPointerRNA *pprop;
PointerRNA idptr;
AUD_SoundInfo info; AUD_SoundInfo info;
RNA_string_get(op->ptr, "path", path); RNA_string_get(op->ptr, "path", path);
sound = sound_new_file(CTX_data_main(C), path); sound = sound_new_file(CTX_data_main(C), path);
if(!op->customdata)
open_init(C, op);
if (sound==NULL || sound->playback_handle == NULL) { if (sound==NULL || sound->playback_handle == NULL) {
if(op->customdata) MEM_freeN(op->customdata);
BKE_report(op->reports, RPT_ERROR, "Unsupported audio format"); BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
@ -96,7 +80,6 @@ static int open_exec(bContext *C, wmOperator *op)
if (info.specs.channels == AUD_CHANNELS_INVALID) { if (info.specs.channels == AUD_CHANNELS_INVALID) {
sound_delete(C, sound); sound_delete(C, sound);
if(op->customdata) MEM_freeN(op->customdata);
BKE_report(op->reports, RPT_ERROR, "Unsupported audio format"); BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
@ -105,33 +88,11 @@ static int open_exec(bContext *C, wmOperator *op)
sound_cache(sound, 0); sound_cache(sound, 0);
} }
/* hook into UI */
pprop= op->customdata;
if(pprop->prop) {
/* when creating new ID blocks, use is already 1, but RNA
* pointer se also increases user, so this compensates it */
sound->id.us--;
RNA_id_pointer_create(&sound->id, &idptr);
RNA_property_pointer_set(&pprop->ptr, pprop->prop, idptr);
RNA_property_update(C, &pprop->ptr, pprop->prop);
}
MEM_freeN(op->customdata);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
static int open_invoke(bContext *C, wmOperator *op, wmEvent *event) static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
{ {
if(!RNA_property_is_set(op->ptr, "relative_path"))
RNA_boolean_set(op->ptr, "relative_path", U.flag & USER_RELPATHS);
if(RNA_property_is_set(op->ptr, "path"))
return open_exec(C, op);
open_init(C, op);
return WM_operator_filesel(C, op, event); return WM_operator_filesel(C, op, event);
} }
@ -152,7 +113,6 @@ void SOUND_OT_open(wmOperatorType *ot)
/* properties */ /* properties */
WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE); WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE);
RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory."); RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory.");
RNA_def_boolean(ot->srna, "relative_path", FALSE, "Relative Path", "Load image with relative path to current .blend file");
} }
/* ******************************************************* */ /* ******************************************************* */

4
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -1157,8 +1157,8 @@ static int viewzoom_invoke(bContext *C, wmOperator *op, wmEvent *event)
else { else {
/* Set y move = x move as MOUSEZOOM uses only x axis to pass magnification value */ /* Set y move = x move as MOUSEZOOM uses only x axis to pass magnification value */
vod->origy = vod->oldy = vod->origy + event->x - event->prevx; vod->origy = vod->oldy = event->x;
viewzoom_apply(vod, event->prevx, event->prevy, USER_ZOOM_DOLLY); viewzoom_apply(vod, event->x, event->prevx, USER_ZOOM_DOLLY);
} }
request_depth_update(CTX_wm_region_view3d(C)); request_depth_update(CTX_wm_region_view3d(C));

1
source/blender/makesdna/DNA_object_types.h
View File

@ -402,6 +402,7 @@ extern Object workob;
#define OB_BOUND_POLYH 4 #define OB_BOUND_POLYH 4
#define OB_BOUND_POLYT 5 #define OB_BOUND_POLYT 5
#define OB_BOUND_DYN_MESH 6 #define OB_BOUND_DYN_MESH 6
#define OB_BOUND_CAPSULE 7
/* **************** BASE ********************* */ /* **************** BASE ********************* */

3
source/blender/makesrna/intern/rna_object.c
View File

@ -73,6 +73,7 @@ static EnumPropertyItem collision_bounds_items[] = {
{OB_BOUND_CONE, "CONE", 0, "Cone", ""}, {OB_BOUND_CONE, "CONE", 0, "Cone", ""},
{OB_BOUND_POLYT, "CONVEX_HULL", 0, "Convex Hull", ""}, {OB_BOUND_POLYT, "CONVEX_HULL", 0, "Convex Hull", ""},
{OB_BOUND_POLYH, "TRIANGLE_MESH", 0, "Triangle Mesh", ""}, {OB_BOUND_POLYH, "TRIANGLE_MESH", 0, "Triangle Mesh", ""},
{OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", ""},
//{OB_DYN_MESH, "DYNAMIC_MESH", 0, "Dynamic Mesh", ""}, //{OB_DYN_MESH, "DYNAMIC_MESH", 0, "Dynamic Mesh", ""},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};
@ -329,6 +330,7 @@ static EnumPropertyItem *rna_Object_collision_bounds_itemf(bContext *C, PointerR
RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_CYLINDER); RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_CYLINDER);
RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_SPHERE); RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_SPHERE);
RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_BOX); RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_BOX);
RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_CAPSULE);
} }
RNA_enum_item_end(&item, &totitem); RNA_enum_item_end(&item, &totitem);
@ -1443,6 +1445,7 @@ static void rna_def_object(BlenderRNA *brna)
{OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", ""}, {OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", ""},
{OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", ""}, {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", ""},
{OB_BOUND_CONE, "CONE", 0, "Cone", ""}, {OB_BOUND_CONE, "CONE", 0, "Cone", ""},
{OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", ""},
{OB_BOUND_POLYH, "POLYHEDER", 0, "Polyheder", ""}, {OB_BOUND_POLYH, "POLYHEDER", 0, "Polyheder", ""},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};

2
source/blender/windowmanager/wm_event_types.h
View File

@ -226,7 +226,7 @@
#define ISTWEAK(event) (event >= EVT_TWEAK_L && event <= EVT_GESTURE) #define ISTWEAK(event) (event >= EVT_TWEAK_L && event <= EVT_GESTURE)
/* test whether event type is acceptable as hotkey, excluding modifiers */ /* test whether event type is acceptable as hotkey, excluding modifiers */
#define ISHOTKEY(event) ((ISKEYBOARD(event) || ISMOUSE(event)) && !(event>=LEFTCTRLKEY && event<=LEFTSHIFTKEY) && !(event>=UNKNOWNKEY && event<=GRLESSKEY)) #define ISHOTKEY(event) ((ISKEYBOARD(event) || ISMOUSE(event)) && !(event>=LEFTCTRLKEY && event<=ESCKEY) && !(event>=UNKNOWNKEY && event<=GRLESSKEY))
/* **************** BLENDER GESTURE EVENTS ********************* */ /* **************** BLENDER GESTURE EVENTS ********************* */

7
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -1570,6 +1570,13 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
objprop.m_boundobject.c.m_height = 2.f*bb.m_extends[2]; objprop.m_boundobject.c.m_height = 2.f*bb.m_extends[2];
break; break;
} }
case OB_BOUND_CAPSULE:
{
objprop.m_boundclass = KX_BOUNDCAPSULE;
objprop.m_boundobject.c.m_radius = MT_max(bb.m_extends[0], bb.m_extends[1]);
objprop.m_boundobject.c.m_height = bb.m_extends[2];
break;
}
} }
} }

32
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@ -932,7 +932,7 @@ Main* KX_BlenderSceneConverter::GetMainDynamicPath(const char *path)
return NULL; return NULL;
} }
bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_Scene *scene_merge, char **err_str) bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, char *filter, KX_Scene *scene_merge, char **err_str)
{ {
bContext *C; bContext *C;
Main *main_newlib; /* stored as a dynamic 'main' until we free it */ Main *main_newlib; /* stored as a dynamic 'main' until we free it */
@ -941,6 +941,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_S
BlendHandle *bpy_openlib = NULL; /* ptr to the open .blend file */ BlendHandle *bpy_openlib = NULL; /* ptr to the open .blend file */
int idcode= BLO_idcode_from_name(group); int idcode= BLO_idcode_from_name(group);
short flag= 0; /* dont need any special options */ short flag= 0; /* dont need any special options */
bool found = false; /* used for error reporting when using item */
ReportList reports; ReportList reports;
static char err_local[255]; static char err_local[255];
@ -950,12 +951,10 @@ bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_S
return false; return false;
} }
if(GetMainDynamicPath(path)) { main_newlib = GetMainDynamicPath(path);
snprintf(err_local, sizeof(err_local), "blend file already open \"%s\"\n", path);
*err_str= err_local;
return false;
}
if (main_newlib == NULL)
{
bpy_openlib = BLO_blendhandle_from_file( (char *)path ); bpy_openlib = BLO_blendhandle_from_file( (char *)path );
if(bpy_openlib==NULL) { if(bpy_openlib==NULL) {
snprintf(err_local, sizeof(err_local), "could not open blendfile \"%s\"\n", path); snprintf(err_local, sizeof(err_local), "could not open blendfile \"%s\"\n", path);
@ -992,7 +991,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_S
/* needed for lookups*/ /* needed for lookups*/
GetMainDynamic().push_back(main_newlib); GetMainDynamic().push_back(main_newlib);
strncpy(main_newlib->name, path, sizeof(main_newlib->name)); strncpy(main_newlib->name, path, sizeof(main_newlib->name));
}
if(idcode==ID_ME) { if(idcode==ID_ME) {
/* Convert all new meshes into BGE meshes */ /* Convert all new meshes into BGE meshes */
@ -1000,16 +999,24 @@ bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_S
KX_Scene *kx_scene= m_currentScene; KX_Scene *kx_scene= m_currentScene;
for(mesh= (ID *)main_newlib->mesh.first; mesh; mesh= (ID *)mesh->next ) { for(mesh= (ID *)main_newlib->mesh.first; mesh; mesh= (ID *)mesh->next ) {
/* If item is defined, use it to filter meshes */
if (!strcmp(filter, "") || !strcmp(filter, mesh->name+2))
{
found = true;
RAS_MeshObject *meshobj = BL_ConvertMesh((Mesh *)mesh, NULL, scene_merge, this); RAS_MeshObject *meshobj = BL_ConvertMesh((Mesh *)mesh, NULL, scene_merge, this);
kx_scene->GetLogicManager()->RegisterMeshName(meshobj->GetName(),meshobj); kx_scene->GetLogicManager()->RegisterMeshName(meshobj->GetName(),meshobj);
} }
} }
}
else if(idcode==ID_SCE) { else if(idcode==ID_SCE) {
/* Merge all new linked in scene into the existing one */ /* Merge all new linked in scene into the existing one */
ID *scene; ID *scene;
for(scene= (ID *)main_newlib->scene.first; scene; scene= (ID *)scene->next ) { for(scene= (ID *)main_newlib->scene.first; scene; scene= (ID *)scene->next ) {
printf("SceneName: %s\n", scene->name); /* If item is defined, use it to filter scenes */
if (!strcmp(filter, "") || !strcmp(filter, scene->name+2))
{
found = true;
printf("Loading scene: %s\n", scene->name+2);
/* merge into the base scene */ /* merge into the base scene */
KX_Scene* other= m_ketsjiEngine->CreateScene((Scene *)scene); KX_Scene* other= m_ketsjiEngine->CreateScene((Scene *)scene);
scene_merge->MergeScene(other); scene_merge->MergeScene(other);
@ -1018,6 +1025,13 @@ bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_S
delete other; delete other;
} }
} }
}
if (found == false)
{
printf("Item not found: %s\n", filter);
return false;
}
return true; return true;
} }

2
source/gameengine/Converter/KX_BlenderSceneConverter.h
View File

@ -142,7 +142,7 @@ public:
struct Main* GetMainDynamicPath(const char *path); struct Main* GetMainDynamicPath(const char *path);
vector<struct Main*> &GetMainDynamic(); vector<struct Main*> &GetMainDynamic();
bool LinkBlendFile(const char *path, char *group, KX_Scene *scene_merge, char **err_str); bool LinkBlendFile(const char *path, char *group, char *filter, KX_Scene *scene_merge, char **err_str);
bool MergeScene(KX_Scene *to, KX_Scene *from); bool MergeScene(KX_Scene *to, KX_Scene *from);
RAS_MeshObject *ConvertMeshSpecial(KX_Scene* kx_scene, Main *maggie, const char *name); RAS_MeshObject *ConvertMeshSpecial(KX_Scene* kx_scene, Main *maggie, const char *name);
bool FreeBlendFile(struct Main *maggie); bool FreeBlendFile(struct Main *maggie);

23
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
View File

@ -228,7 +228,8 @@ static HWND findGhostWindowHWND(GHOST_IWindow* window)
bool GPG_Application::startScreenSaverPreview( bool GPG_Application::startScreenSaverPreview(
HWND parentWindow, HWND parentWindow,
const bool stereoVisual, const bool stereoVisual,
const int stereoMode) const int stereoMode,
const GHOST_TUns16 samples)
{ {
bool success = false; bool success = false;
@ -240,7 +241,7 @@ bool GPG_Application::startScreenSaverPreview(
STR_String title = ""; STR_String title = "";
m_mainWindow = fSystem->createWindow(title, 0, 0, windowWidth, windowHeight, GHOST_kWindowStateMinimized, m_mainWindow = fSystem->createWindow(title, 0, 0, windowWidth, windowHeight, GHOST_kWindowStateMinimized,
GHOST_kDrawingContextTypeOpenGL, stereoVisual); GHOST_kDrawingContextTypeOpenGL, stereoVisual, samples);
if (!m_mainWindow) { if (!m_mainWindow) {
printf("error: could not create main window\n"); printf("error: could not create main window\n");
exit(-1); exit(-1);
@ -282,9 +283,10 @@ bool GPG_Application::startScreenSaverFullScreen(
int height, int height,
int bpp,int frequency, int bpp,int frequency,
const bool stereoVisual, const bool stereoVisual,
const int stereoMode) const int stereoMode,
const GHOST_TUns16 samples)
{ {
bool ret = startFullScreen(width, height, bpp, frequency, stereoVisual, stereoMode); bool ret = startFullScreen(width, height, bpp, frequency, stereoVisual, stereoMode, samples);
if (ret) if (ret)
{ {
HWND ghost_hwnd = findGhostWindowHWND(m_mainWindow); HWND ghost_hwnd = findGhostWindowHWND(m_mainWindow);
@ -306,13 +308,14 @@ bool GPG_Application::startWindow(STR_String& title,
int windowWidth, int windowWidth,
int windowHeight, int windowHeight,
const bool stereoVisual, const bool stereoVisual,
const int stereoMode) const int stereoMode,
const GHOST_TUns16 samples)
{ {
bool success; bool success;
// Create the main window // Create the main window
//STR_String title ("Blender Player - GHOST"); //STR_String title ("Blender Player - GHOST");
m_mainWindow = fSystem->createWindow(title, windowLeft, windowTop, windowWidth, windowHeight, GHOST_kWindowStateNormal, m_mainWindow = fSystem->createWindow(title, windowLeft, windowTop, windowWidth, windowHeight, GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL, stereoVisual); GHOST_kDrawingContextTypeOpenGL, stereoVisual, samples);
if (!m_mainWindow) { if (!m_mainWindow) {
printf("error: could not create main window\n"); printf("error: could not create main window\n");
exit(-1); exit(-1);
@ -334,10 +337,11 @@ bool GPG_Application::startWindow(STR_String& title,
bool GPG_Application::startEmbeddedWindow(STR_String& title, bool GPG_Application::startEmbeddedWindow(STR_String& title,
const GHOST_TEmbedderWindowID parentWindow, const GHOST_TEmbedderWindowID parentWindow,
const bool stereoVisual, const bool stereoVisual,
const int stereoMode) { const int stereoMode,
const GHOST_TUns16 samples) {
m_mainWindow = fSystem->createWindow(title, 0, 0, 0, 0, GHOST_kWindowStateNormal, m_mainWindow = fSystem->createWindow(title, 0, 0, 0, 0, GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL, stereoVisual, parentWindow); GHOST_kDrawingContextTypeOpenGL, stereoVisual,samples, parentWindow);
if (!m_mainWindow) { if (!m_mainWindow) {
printf("error: could not create main window\n"); printf("error: could not create main window\n");
@ -358,7 +362,8 @@ bool GPG_Application::startFullScreen(
int height, int height,
int bpp,int frequency, int bpp,int frequency,
const bool stereoVisual, const bool stereoVisual,
const int stereoMode) const int stereoMode,
const GHOST_TUns16 samples)
{ {
bool success; bool success;
// Create the main window // Create the main window

10
source/gameengine/GamePlayer/ghost/GPG_Application.h
View File

@ -59,12 +59,12 @@ public:
bool SetGameEngineData(struct Main* maggie, struct Scene* scene, int argc, char** argv); bool SetGameEngineData(struct Main* maggie, struct Scene* scene, int argc, char** argv);
bool startWindow(STR_String& title, int windowLeft, int windowTop, int windowWidth, int windowHeight, bool startWindow(STR_String& title, int windowLeft, int windowTop, int windowWidth, int windowHeight,
const bool stereoVisual, const int stereoMode); const bool stereoVisual, const int stereoMode, const GHOST_TUns16 numOfAASamples = 0);
bool startFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode); bool startFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0);
bool startEmbeddedWindow(STR_String& title, const GHOST_TEmbedderWindowID parent_window, const bool stereoVisual, const int stereoMode); bool startEmbeddedWindow(STR_String& title, const GHOST_TEmbedderWindowID parent_window, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0);
#ifdef WIN32 #ifdef WIN32
bool startScreenSaverFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode); bool startScreenSaverFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0);
bool startScreenSaverPreview(HWND parentWindow, const bool stereoVisual, const int stereoMode); bool startScreenSaverPreview(HWND parentWindow, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0);
#endif #endif
virtual bool processEvent(GHOST_IEvent* event); virtual bool processEvent(GHOST_IEvent* event);

19
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
View File

@ -214,6 +214,7 @@ void usage(const char* program)
printf(" -c: keep console window open\n\n"); printf(" -c: keep console window open\n\n");
#endif #endif
printf(" -d: turn debugging on\n\n"); printf(" -d: turn debugging on\n\n");
printf(" -m: sets the number of samples to request for multisampling");
printf(" -g: game engine options:\n\n"); printf(" -g: game engine options:\n\n");
printf(" Name Default Description\n"); printf(" Name Default Description\n");
printf(" ------------------------------------------------------------------------\n"); printf(" ------------------------------------------------------------------------\n");
@ -229,6 +230,7 @@ void usage(const char* program)
printf("\n"); printf("\n");
printf("example: %s -w 320 200 10 10 -g noaudio c:\\loadtest.blend\n", program); printf("example: %s -w 320 200 10 10 -g noaudio c:\\loadtest.blend\n", program);
printf("example: %s -g show_framerate = 0 c:\\loadtest.blend\n", program); printf("example: %s -g show_framerate = 0 c:\\loadtest.blend\n", program);
printf("example: %s -m 4 game.blend", program);
} }
static void get_filename(int argc, char **argv, char *filename) static void get_filename(int argc, char **argv, char *filename)
@ -334,6 +336,7 @@ int main(int argc, char** argv)
int windowHeight = 480; int windowHeight = 480;
GHOST_TUns32 fullScreenWidth = 0; GHOST_TUns32 fullScreenWidth = 0;
GHOST_TUns32 fullScreenHeight= 0; GHOST_TUns32 fullScreenHeight= 0;
GHOST_TUns16 aaSamples = 4;
int fullScreenBpp = 32; int fullScreenBpp = 32;
int fullScreenFrequency = 60; int fullScreenFrequency = 60;
GHOST_TEmbedderWindowID parentWindow = 0; GHOST_TEmbedderWindowID parentWindow = 0;
@ -508,6 +511,12 @@ int main(int argc, char** argv)
} }
} }
break; break;
case 'm':
i++;
if ((i+1) < argc)
aaSamples = atoi(argv[i++]);
break;
case 'h': case 'h':
usage(argv[0]); usage(argv[0]);
@ -810,13 +819,13 @@ int main(int argc, char** argv)
if (scr_saver_mode == SCREEN_SAVER_MODE_SAVER) if (scr_saver_mode == SCREEN_SAVER_MODE_SAVER)
{ {
app.startScreenSaverFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency, app.startScreenSaverFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency,
stereoWindow, stereomode); stereoWindow, stereomode, aaSamples);
} }
else else
#endif #endif
{ {
app.startFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency, app.startFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency,
stereoWindow, stereomode); stereoWindow, stereomode, aaSamples);
} }
} }
else else
@ -856,16 +865,16 @@ int main(int argc, char** argv)
#ifdef WIN32 #ifdef WIN32
if (scr_saver_mode == SCREEN_SAVER_MODE_PREVIEW) if (scr_saver_mode == SCREEN_SAVER_MODE_PREVIEW)
{ {
app.startScreenSaverPreview(scr_saver_hwnd, stereoWindow, stereomode); app.startScreenSaverPreview(scr_saver_hwnd, stereoWindow, stereomode, aaSamples);
} }
else else
#endif #endif
{ {
if (parentWindow != 0) if (parentWindow != 0)
app.startEmbeddedWindow(title, parentWindow, stereoWindow, stereomode); app.startEmbeddedWindow(title, parentWindow, stereoWindow, stereomode, aaSamples);
else else
app.startWindow(title, windowLeft, windowTop, windowWidth, windowHeight, app.startWindow(title, windowLeft, windowTop, windowWidth, windowHeight,
stereoWindow, stereomode); stereoWindow, stereomode, aaSamples);
} }
} }
} }

4
source/gameengine/Ketsji/CMakeLists.txt
View File

@ -69,6 +69,10 @@ ELSE(WITH_SDL)
ADD_DEFINITIONS(-DDISABLE_SDL) ADD_DEFINITIONS(-DDISABLE_SDL)
ENDIF(WITH_SDL) ENDIF(WITH_SDL)
if(WITH_DDS)
ADD_DEFINITIONS(-DWITH_DDS)
ENDIF(WITH_DDS)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) SET(INC ${INC} ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)

3
source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
View File

@ -53,7 +53,8 @@ typedef enum {
KX_BOUNDCONE, KX_BOUNDCONE,
KX_BOUNDMESH, KX_BOUNDMESH,
KX_BOUNDPOLYTOPE, KX_BOUNDPOLYTOPE,
KX_BOUND_DYN_MESH KX_BOUND_DYN_MESH,
KX_BOUNDCAPSULE
} KX_BoundBoxClass; } KX_BoundBoxClass;
struct KX_BoxBounds struct KX_BoxBounds

8
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
View File

@ -184,6 +184,14 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj,
bm = shapeInfo->CreateBulletShape(ci.m_margin); bm = shapeInfo->CreateBulletShape(ci.m_margin);
break; break;
} }
case KX_BOUNDCAPSULE:
{
shapeInfo->m_radius = objprop->m_boundobject.c.m_radius;
shapeInfo->m_height = objprop->m_boundobject.c.m_height;
shapeInfo->m_shapeType = PHY_SHAPE_CAPSULE;
bm = shapeInfo->CreateBulletShape(ci.m_margin);
break;
}
case KX_BOUNDMESH: case KX_BOUNDMESH:
{ {
// mesh shapes can be shared, check first if we already have a shape on that mesh // mesh shapes can be shared, check first if we already have a shape on that mesh

5
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -628,12 +628,13 @@ static PyObject *gLibLoad(PyObject*, PyObject* args)
KX_Scene *kx_scene= gp_KetsjiScene; KX_Scene *kx_scene= gp_KetsjiScene;
char *path; char *path;
char *group; char *group;
char *filter= "";
char *err_str= NULL; char *err_str= NULL;
if (!PyArg_ParseTuple(args,"ss:LibLoad",&path, &group)) if (!PyArg_ParseTuple(args,"ss|s:LibLoad",&path, &group, &filter))
return NULL; return NULL;
if(kx_scene->GetSceneConverter()->LinkBlendFile(path, group, kx_scene, &err_str)) { if(kx_scene->GetSceneConverter()->LinkBlendFile(path, group, filter, kx_scene, &err_str)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }

3
source/gameengine/Ketsji/SConscript
View File

@ -23,6 +23,9 @@ incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #
incs += ' ' + env['BF_BULLET_INC'] incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_OPENGL_INC']
if env['WITH_BF_DDS']:
defs.append('WITH_DDS')
if env['WITH_BF_SDL']: if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC'] incs += ' ' + env['BF_SDL_INC']
else: else:

5
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
View File

@ -2027,6 +2027,11 @@ btCollisionShape* CcdShapeConstructionInfo::CreateBulletShape(btScalar margin, b
collisionShape->setMargin(margin); collisionShape->setMargin(margin);
break; break;
case PHY_SHAPE_CAPSULE:
collisionShape = new btCapsuleShapeZ(m_radius, m_height);
collisionShape->setMargin(margin);
break;
case PHY_SHAPE_MESH: case PHY_SHAPE_MESH:
// Let's use the latest btScaledBvhTriangleMeshShape: it allows true sharing of // Let's use the latest btScaledBvhTriangleMeshShape: it allows true sharing of
// triangle mesh information between duplicates => drastic performance increase when // triangle mesh information between duplicates => drastic performance increase when

1
source/gameengine/Physics/common/PHY_DynamicTypes.h
View File

@ -138,6 +138,7 @@ typedef enum PHY_ShapeType {
PHY_SHAPE_SPHERE, PHY_SHAPE_SPHERE,
PHY_SHAPE_CYLINDER, PHY_SHAPE_CYLINDER,
PHY_SHAPE_CONE, PHY_SHAPE_CONE,
PHY_SHAPE_CAPSULE,
PHY_SHAPE_MESH, PHY_SHAPE_MESH,
PHY_SHAPE_POLYTOPE, PHY_SHAPE_POLYTOPE,
PHY_SHAPE_COMPOUND, PHY_SHAPE_COMPOUND,

129
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
View File

@ -194,6 +194,15 @@ void RAS_2DFilterManager::AnalyseShader(int passindex, vector<STR_String>& propN
{ {
texflag[passindex] |= 0x2; texflag[passindex] |= 0x2;
} }
if(glGetUniformLocationARB(m_filters[passindex], "bgl_QuarteredRenderTexture") != -1)
{
texflag[passindex] |= 0x4;
}
if(glGetUniformLocationARB(m_filters[passindex], "bgl_QuartedDepthTexture") != -1)
{
if(GLEW_ARB_depth_texture)
texflag[passindex] |= 0x8;
}
if(m_gameObjects[passindex]) if(m_gameObjects[passindex])
{ {
@ -242,6 +251,29 @@ void RAS_2DFilterManager::StartShaderProgram(int passindex)
} }
} }
/* Send the quartered render texture to glsl program if it needs */
if(texflag[passindex] & 0x4){
uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_QuarteredRenderTexture");
glActiveTextureARB(GL_TEXTURE3);
glBindTexture(GL_TEXTURE_2D, texname[3]);
if (uniformLoc != -1)
{
glUniform1iARB(uniformLoc, 3);
}
}
if(texflag[passindex] & 0x5){
uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_QuarteredDepthTexture");
glActiveTextureARB(GL_TEXTURE4);
glBindTexture(GL_TEXTURE_2D, texname[4]);
if (uniformLoc != -1)
{
glUniform1iARB(uniformLoc, 4);
}
}
uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_TextureCoordinateOffset"); uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_TextureCoordinateOffset");
if (uniformLoc != -1) if (uniformLoc != -1)
{ {
@ -277,15 +309,24 @@ void RAS_2DFilterManager::EndShaderProgram()
void RAS_2DFilterManager::FreeTextures() void RAS_2DFilterManager::FreeTextures()
{ {
if(texname[0]!=(unsigned int)-1) // Update this when adding new textures!
for (int i=0; i<5; i++)
{
if(texname[i]!=(unsigned int)-1)
glDeleteTextures(1, (GLuint*)&texname[i]);
}
if(fbo != (unsigned int)-1)
glDeleteFramebuffersEXT(1, &fbo);
/*if(texname[0]!=(unsigned int)-1)
glDeleteTextures(1, (GLuint*)&texname[0]); glDeleteTextures(1, (GLuint*)&texname[0]);
if(texname[1]!=(unsigned int)-1) if(texname[1]!=(unsigned int)-1)
glDeleteTextures(1, (GLuint*)&texname[1]); glDeleteTextures(1, (GLuint*)&texname[1]);
if(texname[2]!=(unsigned int)-1) if(texname[2]!=(unsigned int)-1)
glDeleteTextures(1, (GLuint*)&texname[2]); glDeleteTextures(1, (GLuint*)&texname[2]);*/
} }
void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance) void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance, bool qrender, bool qdepth)
{ {
FreeTextures(); FreeTextures();
@ -321,6 +362,25 @@ void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
} }
if(qrender){
glGenTextures(1, (GLuint*)&texname[3]);
glBindTexture(GL_TEXTURE_2D, texname[3]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, texturewidth/2, textureheight/2, 0, GL_RGBA8,
GL_UNSIGNED_BYTE, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
glGenFramebuffersEXT(1, &fbo);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, texname[3], 0);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
}
} }
void RAS_2DFilterManager::UpdateOffsetMatrix(RAS_ICanvas* canvas) void RAS_2DFilterManager::UpdateOffsetMatrix(RAS_ICanvas* canvas)
@ -377,6 +437,8 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
{ {
bool need_depth=false; bool need_depth=false;
bool need_luminance=false; bool need_luminance=false;
bool need_qrender=false;
bool need_qdepth=false;
int num_filters = 0; int num_filters = 0;
int passindex; int passindex;
@ -392,7 +454,11 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
need_depth = true; need_depth = true;
if(texflag[passindex] & 0x2) if(texflag[passindex] & 0x2)
need_luminance = true; need_luminance = true;
if(need_depth && need_luminance) if(texflag[passindex] & 0x4)
need_qrender = true;
if(texflag[passindex] & 0x8)
need_qdepth = true;
if(need_depth && need_luminance && need_qrender && need_qdepth)
break; break;
} }
} }
@ -412,7 +478,7 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
if(need_tex_update) if(need_tex_update)
{ {
SetupTextures(need_depth, need_luminance); SetupTextures(need_depth, need_luminance, need_qrender, need_qdepth);
need_tex_update = false; need_tex_update = false;
} }
@ -428,6 +494,12 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0, 0, texturewidth,textureheight, 0); glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0, 0, texturewidth,textureheight, 0);
} }
if(need_qdepth){
glActiveTextureARB(GL_TEXTURE4);
glBindTexture(GL_TEXTURE_2D, texname[4]);
glCopyTexImage2D(GL_TEXTURE_2D, 1, GL_DEPTH_COMPONENT, 0, 0, texturewidth, textureheight, 0);
}
glViewport(0,0, texturewidth, textureheight); glViewport(0,0, texturewidth, textureheight);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
@ -448,6 +520,53 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
glActiveTextureARB(GL_TEXTURE0); glActiveTextureARB(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, texname[0]); glBindTexture(GL_TEXTURE_2D, texname[0]);
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, texturewidth, textureheight, 0); glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, texturewidth, textureheight, 0);
//glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, im_buff);
if(need_qrender){
//glActiveTextureARB(GL_TEXTURE3);
//glBindTexture(GL_TEXTURE_2D, texname[3]);
//glReadPixels(0, 0, texturewidth, textureheight, GL_RGB, GL_UNSIGNED_BYTE, im_buff);
//gluScaleImage(GL_RGB, texturewidth, textureheight, GL_UNSIGNED_BYTE, im_buff,
// texturewidth/2, textureheight/2, GL_UNSIGNED_BYTE, scaled_buff);
//glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texturewidth, textureheight, GL_RGBA, GL_UNSIGNED_BYTE, im_buff);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
if(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT) == GL_FRAMEBUFFER_COMPLETE_EXT) {
glPushAttrib(GL_VIEWPORT_BIT | GL_COLOR_BUFFER_BIT);
glViewport(0, 0, texturewidth/2, textureheight/2);
/* glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
gluOrtho2D(0, texturewidth/2, 0, textureheight/2);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();*/
glClearColor(0, 0, 0, 1);
glClear(GL_COLOR_BUFFER_BIT);
/*glBindTexture(GL_TEXTURE_2D, texname[0]);
glBegin(GL_QUADS);
glColor4f(0.f, 1.f, 1.f, 1.f);
glTexCoord2f(1.f, 1.f); glVertex2f(1,1);
glTexCoord2f(0.f, 1.f); glVertex2f(-1,1);
glTexCoord2f(0.f, 0.f); glVertex2f(-1,-1);
glTexCoord2f(1.f, 0.f); glVertex2f(1,-1);
glEnd();*/
glFlush();
//glPopMatrix();
//glMatrixMode(GL_PROJECTION);
//glPopMatrix();
glPopAttrib();
} else {
printf("Could not use the framebuffer\n");
}
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
}
glClearColor(1, 0, 1, 1);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glBegin(GL_QUADS); glBegin(GL_QUADS);

8
source/gameengine/Rasterizer/RAS_2DFilterManager.h
View File

@ -45,7 +45,7 @@ private:
void EndShaderProgram(); void EndShaderProgram();
void PrintShaderErrors(unsigned int shader, const char *task, const char *code); void PrintShaderErrors(unsigned int shader, const char *task, const char *code);
void SetupTextures(bool depth, bool luminance); void SetupTextures(bool depth, bool luminance, bool qrender, bool qdepth);
void FreeTextures(); void FreeTextures();
void UpdateOffsetMatrix(RAS_ICanvas* canvas); void UpdateOffsetMatrix(RAS_ICanvas* canvas);
@ -54,13 +54,15 @@ private:
float canvascoord[4]; float canvascoord[4];
float textureoffsets[18]; float textureoffsets[18];
float view[4]; float view[4];
/* texname[0] contains render to texture, texname[1] contains depth texture, texname[2] contains luminance texture*/ /* texname[0] contains render to texture, texname[1] contains depth texture, texname[2] contains luminance texture
unsigned int texname[3]; * texname[3] contains quartered render to texture, texname[4] contains quartered depth texture*/
unsigned int texname[5];
int texturewidth; int texturewidth;
int textureheight; int textureheight;
int canvaswidth; int canvaswidth;
int canvasheight; int canvasheight;
int numberoffilters; int numberoffilters;
unsigned int fbo;
/* bit 0: enable/disable depth texture /* bit 0: enable/disable depth texture
* bit 1: enable/disable luminance texture*/ * bit 1: enable/disable luminance texture*/
short texflag[MAX_RENDER_PASS]; short texflag[MAX_RENDER_PASS];

2
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@ -297,6 +297,7 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
m_last_frontface = true; m_last_frontface = true;
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
glEnable(GL_MULTISAMPLE_ARB);
m_2DCanvas->BeginFrame(); m_2DCanvas->BeginFrame();
@ -382,6 +383,7 @@ void RAS_OpenGLRasterizer::EndFrame()
FlushDebugLines(); FlushDebugLines();
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glDisable(GL_MULTISAMPLE_ARB);
m_2DCanvas->EndFrame(); m_2DCanvas->EndFrame();
} }