[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59194] trunk/blender/source: BGE: Flipping vsync constants so VSYNC_ON is 0.

[Mitchell Stokes]

Revision: 59194
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59194
Author:   moguri
Date:     2013-08-17 02:06:45 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
BGE: Flipping vsync constants so VSYNC_ON is 0.

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.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2013-08-16 14:18:54 UTC (rev 59193)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2013-08-17 02:06:45 UTC (rev 59194)
@@ -693,8 +693,8 @@
 #define RAS_STORE_VBO		3
 
 /* vsync */
-#define VSYNC_OFF	0
-#define VSYNC_ON	1
+#define VSYNC_ON	0
+#define VSYNC_OFF	1
 #define VSYNC_ADAPTIVE	2
 
 /* GameData.flag */

Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp	2013-08-16 14:18:54 UTC (rev 59193)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp	2013-08-17 02:06:45 UTC (rev 59194)
@@ -290,7 +290,7 @@
 		if (startscene->gm.vsync == VSYNC_ADAPTIVE)
 			canvas->SetSwapInterval(-1);
 		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_IRasterizer* rasterizer = NULL;

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2013-08-16 14:18:54 UTC (rev 59193)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2013-08-17 02:06:45 UTC (rev 59194)
@@ -586,7 +586,7 @@
 		if (gm->vsync == VSYNC_ADAPTIVE)
 			m_canvas->SetSwapInterval(-1);
 		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();
 		if (gm->flag & GAME_SHOW_MOUSE)

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2013-08-16 14:18:54 UTC (rev 59193)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2013-08-17 02:06:45 UTC (rev 59194)
@@ -1378,14 +1378,14 @@
 	if (!PyArg_ParseTuple(args, "i:setVsync", &interval))
 		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");
 		return NULL;
 	}
 
 	if (interval == VSYNC_ADAPTIVE)
 		interval = -1;
-	gp_Canvas->SetSwapInterval(interval);
+	gp_Canvas->SetSwapInterval(!interval); // VSYNC_OFF == 1, VSYNC_ON == 0, so this works
 	Py_RETURN_NONE;
 }