Commit: 18affe39a53fb0c7e74c001b988fd953756a927d
Author: Benoit Bolsee
Date: Sat Jan 9 09:47:33 2016 +0100
Branches: decklink
https://developer.blender.org/rB18affe39a53fb0c7e74c001b988fd953756a927d
Merge remote-tracking branch 'origin/master' into decklink
===================================================================
===================================================================
diff --cc doc/python_api/rst/bge.logic.rst
index c197b77,3f35901..0967610
--- a/doc/python_api/rst/bge.logic.rst
+++ b/doc/python_api/rst/bge.logic.rst
@@@ -378,27 -378,76 +378,97 @@@ General function
Render next frame (if Python has control)
+.. function:: setRender(render)
+
+ Sets the global flag that controls the render of the scene.
+ If True, the render is done after the logic frame.
+ If False, the render is skipped and another logic frame starts immediately.
+
+ .. note::
+ GPU VSync no longer limits the number of frame per second when render
is off,
+ but the 'Use Frame Rate' option still regulates the fps. To run as many
frames
+ as possible, untick this option (Render Properties, System panel)
+
+ :arg render: the render flag
+ :type render: bool
+
+.. function:: getRender()
+
+ Get the current value of the global render flag
+
+ :return: The flag value
+ :rtype: bool
+
+ **********************
+ Time related functions
+ **********************
+
+ .. function:: getClockTime()
+
+ Get the current BGE render time, in seconds. The BGE render time is the
+ simulation time corresponding to the next scene that will be rendered.
+
+ :rtype: double
+
+ .. function:: getFrameTime()
+
+ Get the current BGE frame time, in seconds. The BGE frame time is the
+ simulation time corresponding to the current call of the logic system.
+ Generally speaking, it is what the user is interested in.
+
+ :rtype: double
+
+ .. function:: getRealTime()
+
+ Get the number of real (system-clock) seconds elapsed since the beginning
+ of the simulation.
+
+ :rtype: double
+
+ .. function:: getTimeScale()
+
+ Get the time multiplier between real-time and simulation time. The default
+ value is 1.0. A value greater than 1.0 means that the simulation is going
+ faster than real-time, a value lower than 1.0 means that the simulation is
+ going slower than real-time.
+
+ :rtype: double
+
+ .. function:: setTimeScale(time_scale)
+
+ Set the time multiplier between real-time and simulation time. A value
+ greater than 1.0 means that the simulation is going faster than real-time,
+ a value lower than 1.0 means that the simulation is going slower than
+ real-time. Note that a too large value may lead to some physics
+ instabilities.
+
+ :arg time_scale: The new time multiplier.
+
+ .. function:: getUseExternalClock()
+
+ Get if the BGE use the inner BGE clock, or rely or on an external
+ clock. The default is to use the inner BGE clock.
+
+ :rtype: bool
+
+ .. function:: setUseExternalClock(use_external_clock)
+
+ Set if the BGE use the inner BGE clock, or rely or on an external
+ clock. If the user selects the use of an external clock, he should call
+ regularly the setClockTime method.
+
+ :arg use_external_clock: the new setting
+
+ .. function:: setClockTime(new_time)
+
+ Set the next value of the simulation clock. It is preferable to use this
+ method from a custom main function in python, as calling it in the logic
+ block can easily lead to a blocked system (if the time does not advance
+ enough to run at least the next logic step).
+
+ :arg new_time: the next value of the BGE clock (in second).
+
+
*****************
Utility functions
*****************
diff --cc intern/CMakeLists.txt
index bba12de,f5f2d1c..1353af5
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@@ -30,13 -31,9 +31,13 @@@ add_subdirectory(libmv
add_subdirectory(memutil)
add_subdirectory(opencolorio)
add_subdirectory(mikktspace)
- add_subdirectory(raskter)
add_subdirectory(glew-mx)
+ add_subdirectory(eigen)
+if (WITH_DECKLINK)
+ add_subdirectory(decklink)
+endif()
+
if(WITH_AUDASPACE)
add_subdirectory(audaspace)
endif()
diff --cc intern/ghost/CMakeLists.txt
index 60f647c,d31e947..e549a48
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@@ -223,15 -223,11 +223,15 @@@ elseif(WITH_X11
)
endif()
+ if(WITH_X11_ALPHA)
+ add_definitions(-DWITH_X11_ALPHA)
+ endif()
+
if(WITH_INPUT_NDOF)
list(APPEND SRC
- intern/GHOST_NDOFManagerX11.cpp
+ intern/GHOST_NDOFManagerUnix.cpp
- intern/GHOST_NDOFManagerX11.h
+ intern/GHOST_NDOFManagerUnix.h
)
endif()
diff --cc intern/ghost/GHOST_Types.h
index 49e765c,29508a8..73d91ea
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@@ -57,9 -57,7 +57,8 @@@ typedef struct
typedef enum {
GHOST_glStereoVisual = (1 << 0),
- GHOST_glWarnSupport = (1 << 1),
- GHOST_glDebugContext = (1 << 2),
- GHOST_glAlphaBackground = (1 << 3),
- GHOST_glDebugContext = (1 << 1)
++ GHOST_glDebugContext = (1 << 1),
++ GHOST_glAlphaBackground = (1 << 2),
} GHOST_GLFlags;
diff --cc intern/ghost/intern/GHOST_SystemWin32.cpp
index 144bc8f,d8ec827..9a11c72
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@@ -241,8 -241,6 +241,7 @@@ GHOST_IWindow *GHOST_SystemWin32::creat
state,
type,
((glSettings.flags & GHOST_glStereoVisual) != 0),
- ((glSettings.flags & GHOST_glWarnSupport) != 0),
- ((glSettings.flags & GHOST_glAlphaBackground)
!= 0),
++ ((glSettings.flags & GHOST_glAlphaBackground) != 0),
glSettings.numOfAASamples,
parentWindow,
((glSettings.flags & GHOST_glDebugContext) != 0));
diff --cc intern/ghost/intern/GHOST_WindowWin32.cpp
index a81ea8c,7247753..4171fdc
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@@ -72,7 -70,7 +72,8 @@@ GHOST_WindowWin32::GHOST_WindowWin32(GH
GHOST_TUns32 height,
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
- bool wantStereoVisual, bool warnOld, bool alphaBackground,
- bool wantStereoVisual,
++ bool wantStereoVisual,
++ bool alphaBackground,
GHOST_TUns16 wantNumOfAASamples,
GHOST_TEmbedderWindowID parentwindowhwnd,
bool is_debug)
@@@ -85,7 -83,6 +86,7 @@@
m_hasGrabMouse(false),
m_nPressedButtons(0),
m_customCursor(0),
- m_wantAlphaBackground(alphaBackground),
++ m_wantAlphaBackground(alphaBackground),
m_wintab(NULL),
m_tabletData(NULL),
m_tablet(0),
@@@ -651,7 -623,6 +645,7 @@@ GHOST_Context *GHOST_WindowWin32::newDr
#if defined(WITH_GL_PROFILE_CORE)
GHOST_Context *context = new GHOST_ContextWGL(
m_wantStereoVisual,
- m_wantAlphaBackground,
++ m_wantAlphaBackground,
m_wantNumOfAASamples,
m_hWnd,
m_hDC,
@@@ -661,8 -632,7 +655,8 @@@
GHOST_OPENGL_WGL_RESET_NOTIFICATION_STRATEGY);
#elif defined(WITH_GL_PROFILE_ES20)
GHOST_Context *context = new GHOST_ContextWGL(
- m_wantStereoVisual,
- m_wantAlphaBackground,
+ m_wantStereoVisual,
++ m_wantAlphaBackground,
m_wantNumOfAASamples,
m_hWnd,
m_hDC,
@@@ -673,7 -643,6 +667,7 @@@
#elif defined(WITH_GL_PROFILE_COMPAT)
GHOST_Context *context = new GHOST_ContextWGL(
m_wantStereoVisual,
- m_wantAlphaBackground,
++ m_wantAlphaBackground,
m_wantNumOfAASamples,
m_hWnd,
m_hDC,
diff --cc intern/ghost/intern/GHOST_WindowWin32.h
index aa25dfc,b508c2f..a1cf58c
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@@ -89,8 -89,6 +89,7 @@@ public
GHOST_TWindowState state,
GHOST_TDrawingContextType type = GHOST_kDrawingContextTypeNone,
bool wantStereoVisual = false,
- bool warnOld = false,
- bool alphaBackground = false,
++ bool alphaBackground = false,
GHOST_TUns16 wantNumOfAASamples = 0,
GHOST_TEmbedderWindowID parentWindowHwnd = 0,
bool is_debug = false);
diff --cc source/blender/gpu/GPU_texture.h
index 0000000,5300061..d657b9b
mode 000000,100644..100644
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@@ -1,0 -1,104 +1,105 @@@
+ /*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+ /** \file GPU_texture.h
+ * \ingroup gpu
+ */
+
+ #ifndef __GPU_TEXTURE_H__
+ #define __GPU_TEXTURE_H__
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+ struct Image;
+ struct ImageUser;
+ struct PreviewImage;
+
+ struct GPUFrameBuffer;
+ typedef struct GPUTexture GPUTexture;
+
+ /* GPU Texture
+ * - always returns unsigned char RGBA textures
+ * - if texture with non square dimensions is created, depending on the
+ * graphics card capabilities the texture may actually be stored in a
+ * larger texture with power of two dimensions.
+ * - can use reference counting:
+ * - reference counter after GPU_texture_create is 1
+ * - GPU_texture_ref increases by one
+ * - GPU_texture_free decreases by one, and frees if 0
+ * - if created with from_blender, will not free the texture
+ */
+
+ typedef enum GPUHDRType {
+ GPU_HDR_NONE = 0,
+ GPU_HDR_HALF_FLOAT = 1,
+ GPU_HDR_FULL_FLOAT = (1 << 1),
+ } GPUHDRType;
+
+ GPUTexture *GPU_texture_create
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
