Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BGE: Flipping vsync constants so VSYNC_ON is 0.

Browse Source 
This will make transitions from older versions of Blender easier since VSYNC_ON
will be the default. This could have been changed in a do_version, but the vsync
code has yet to see an official release, so I figured this would be a bit nicer.
Also, this makes VSYNC_ON the default for new scenes as well.
This commit is contained in:
Mitchell Stokes
2013-08-17 02:06:45 +00:00
parent ef8ea14f45
commit 51bca0d7dc
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesdna/DNA_scene_types.h
View File

@@ -693,8 +693,8 @@ typedef struct GameData {
#define RAS_STORE_VBO 3 #define RAS_STORE_VBO 3
/* vsync */ /* vsync */
#define VSYNC_OFF 0 #define VSYNC_ON 0
#define VSYNC_ON 1 #define VSYNC_OFF 1
#define VSYNC_ADAPTIVE 2 #define VSYNC_ADAPTIVE 2
/* GameData.flag */ /* GameData.flag */

2
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
View File

@@ -290,7 +290,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
if (startscene->gm.vsync == VSYNC_ADAPTIVE) if (startscene->gm.vsync == VSYNC_ADAPTIVE)
canvas->SetSwapInterval(-1); canvas->SetSwapInterval(-1);
else else
canvas->SetSwapInterval(startscene->gm.vsync); // VSYNC_OFF == 0, VSYNC_ON == 1, so this works canvas->SetSwapInterval(!startscene->gm.vsync); // VSYNC_OFF == 1, VSYNC_ON == 0, so this works
RAS_IRenderTools* rendertools = new KX_BlenderRenderTools(); RAS_IRenderTools* rendertools = new KX_BlenderRenderTools();
RAS_IRasterizer* rasterizer = NULL; RAS_IRasterizer* rasterizer = NULL;

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

@@ -586,7 +586,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
if (gm->vsync == VSYNC_ADAPTIVE) if (gm->vsync == VSYNC_ADAPTIVE)
m_canvas->SetSwapInterval(-1); m_canvas->SetSwapInterval(-1);
else else
m_canvas->SetSwapInterval(gm->vsync); // VSYNC_OFF == 0, VSYNC_ON == 1, so this works m_canvas->SetSwapInterval(!gm->vsync); // VSYNC_OFF == 1, VSYNC_ON == 0, so this works
m_canvas->Init(); m_canvas->Init();
if (gm->flag & GAME_SHOW_MOUSE) if (gm->flag & GAME_SHOW_MOUSE)

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

@@ -1378,14 +1378,14 @@ static PyObject *gPySetVsync(PyObject *, PyObject *args)
if (!PyArg_ParseTuple(args, "i:setVsync", &interval)) if (!PyArg_ParseTuple(args, "i:setVsync", &interval))
return NULL; return NULL;
if (interval < VSYNC_OFF || interval > VSYNC_ADAPTIVE) { if (interval < 0 || interval > VSYNC_ADAPTIVE) {
PyErr_SetString(PyExc_ValueError, "Rasterizer.setVsync(value): value must be VSYNC_OFF, VSYNC_ON, or VSYNC_ADAPTIVE"); PyErr_SetString(PyExc_ValueError, "Rasterizer.setVsync(value): value must be VSYNC_OFF, VSYNC_ON, or VSYNC_ADAPTIVE");
return NULL; return NULL;
} }
if (interval == VSYNC_ADAPTIVE) if (interval == VSYNC_ADAPTIVE)
interval = -1; interval = -1;
gp_Canvas->SetSwapInterval(interval); gp_Canvas->SetSwapInterval(!interval); // VSYNC_OFF == 1, VSYNC_ON == 0, so this works
Py_RETURN_NONE; Py_RETURN_NONE;
} }