[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40845] branches/soc-2011-cucumber/source: remove desktop and fullscreen properties.

Dalai Felinto dfelinto at gmail.com
Fri Oct 7 09:43:24 CEST 2011


Revision: 40845
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40845
Author:   dfelinto
Date:     2011-10-07 07:43:23 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
remove desktop and fullscreen properties. They are both part of playerflag now
also I removed the fullscreen from the DNA completely. I don't think we need doversion that..

Modified Paths:
--------------
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c	2011-10-07 06:57:18 UTC (rev 40844)
+++ branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c	2011-10-07 07:43:23 UTC (rev 40845)
@@ -10448,7 +10448,6 @@
 			sce->gm.dome.warptext = sce->r.dometext;
 
 			//Stand Alone
-			sce->gm.fullscreen = sce->r.fullscreen;
 			sce->gm.xplay = sce->r.xplay;
 			sce->gm.yplay = sce->r.yplay;
 			sce->gm.freqplay = sce->r.freqplay;

Modified: branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h	2011-10-07 06:57:18 UTC (rev 40844)
+++ branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h	2011-10-07 07:43:23 UTC (rev 40845)
@@ -447,9 +447,9 @@
 
 	/*  standalone player */
 	struct GameFraming framing;
-	short fullscreen, xplay, yplay, freqplay;
+	short playerflag, xplay, yplay, freqplay;
 	short depth, attrib, rt1, rt2;
-	short aasamples, use_desktop, pad4[2];
+	short aasamples, pad4[3];
 
 	/* stereo/dome mode */
 	struct GameDome dome;
@@ -480,6 +480,7 @@
 	short raster_storage;
 	short exitkey;
 	float levelHeight;
+	float pad2;
 
 	/* Dynamic Lights */
 	short dynpoints;
@@ -542,6 +543,10 @@
 #define GAME_SHOW_OBSTACLE_SIMULATION		(1 << 16)
 /* Note: GameData.flag is now an int (max 32 flags). A short could only take 16 flags */
 
+/* GameData.playerflag */
+#define GAME_PLAYER_FULLSCREEN				(1 << 0)
+#define GAME_PLAYER_DESKTOP_RESOLUTION		(1 << 1)
+
 /* GameData.matmode */
 #define GAME_MAT_TEXFACE	0
 #define GAME_MAT_MULTITEX	1

Modified: branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c	2011-10-07 06:57:18 UTC (rev 40844)
+++ branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c	2011-10-07 07:43:23 UTC (rev 40845)
@@ -1923,12 +1923,12 @@
 	RNA_def_property_update(prop, NC_SCENE, NULL);
 	
 	prop= RNA_def_property(srna, "show_fullscreen", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "fullscreen", 1.0);
+	RNA_def_property_boolean_sdna(prop, NULL, "playerflag", GAME_PLAYER_FULLSCREEN);
 	RNA_def_property_ui_text(prop, "Fullscreen", "Start player in a new fullscreen display");
 	RNA_def_property_update(prop, NC_SCENE, NULL);
 
 	prop= RNA_def_property(srna, "use_desktop", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "use_desktop", 1.0);
+	RNA_def_property_boolean_sdna(prop, NULL, "playerflag", GAME_PLAYER_DESKTOP_RESOLUTION);
 	RNA_def_property_ui_text(prop, "Desktop", "Uses the current desktop resultion in fullscreen mode");
 	RNA_def_property_update(prop, NC_SCENE, NULL);
 

Modified: branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c	2011-10-07 06:57:18 UTC (rev 40844)
+++ branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c	2011-10-07 07:43:23 UTC (rev 40845)
@@ -281,7 +281,7 @@
 		}
 
 		/* Fullscreen */
-		if(scene->gm.fullscreen) {
+		if((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) {
 			WM_operator_name_call(C, "WM_OT_window_fullscreen_toggle", WM_OP_EXEC_DEFAULT, NULL);
 			wm_get_screensize(&ar->winrct.xmax, &ar->winrct.ymax);
 			ar->winx = ar->winrct.xmax + 1;

Modified: branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-10-07 06:57:18 UTC (rev 40844)
+++ branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-10-07 07:43:23 UTC (rev 40845)
@@ -833,7 +833,7 @@
 						if ((!fullScreenParFound) && (!windowParFound))
 						{
 							// Only use file settings when command line did not override
-							if (scene->gm.fullscreen) {
+							if ((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) {
 								//printf("fullscreen option found in Blender file\n");
 								fullScreen = true;
 								fullScreenWidth= scene->gm.xplay;
@@ -910,7 +910,7 @@
 #endif
 								{
 									app.startFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency,
-										stereoWindow, stereomode, aasamples, scene->gm.use_desktop);
+										stereoWindow, stereomode, aasamples, (scene->gm.playerflag & GAME_PLAYER_DESKTOP_RESOLUTION));
 								}
 							}
 							else




More information about the Bf-blender-cvs mailing list