axiosengine Commit Details

Date:

2015-01-04 16:40:19 (9 years 11 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

e23503cd007430a84fe718634598f4f850cae726

Parents:

d924498cb603cf18dd465dc59dd4b5e14876c59e

Message:

Adding Deactivate event for when the screen leaves focus Added flag to enable/disable moving camera with gamepad

Changes:

File differences

-140
141 141
142 142
143
144
143 145
144 146
145 147
+ * - Adding dispose methods to AxiosFile objects␍␊
 * - Adding extended log to AxiosLog␍␊
 * - Fixing issue in CommandConsole where the first line would not be displayed␍␊
 * - Adding Deactivate event for when the screen leaves focus␍␊
 * - Added flag to enable/disable moving camera with gamepad␍␊
 * ␍␊
 */␍␊
#endregion␍␊
  * - Adding dispose methods to AxiosFile objects␍␊
  * - Adding extended log to AxiosLog␍␊
  * - Fixing issue in CommandConsole where the first line would not be displayed␍␊
+ * - Adding Deactivate event for when the screen leaves focus␍␊
+ * - Added flag to enable/disable moving camera with gamepad␍␊
  * ␍␊
  */␍␊
 #endregion␍␊

-330
331 331
332 332
333 
333
334 334
335 335
336
336 337
337 338
338 339
... ...
508 509
509 510
510 511
511 
512 512
513 513
514 514
... ...
538 538
539 539
540 540
541
541 542
542 543
543 544
+␍␊
        public override void Update(GameTime gameTime, bool otherScreenHasFocus, bool coveredByOtherScreen)␍␊
        {␍␊
            if (otherScreenHasFocus)␍␊
            if (otherScreenHasFocus && !screenHidden)␍␊
            {␍␊
                screenHidden = true;␍␊
                this.Deactivate();␍␊
            }␍␊
␍␊
            if (screenHidden && !otherScreenHasFocus)␍␊

        {␍␊
            //this.IsExiting = true;␍␊
            //System.Diagnostics.Debugger.Break();␍␊
            base.Deactivate();␍␊
            ScreenState = GameStateManagement.ScreenState.TransitionOff;␍␊
            AxiosLog.Instance.AddLine("Memory usage before cleanup: " + GC.GetTotalMemory(true).ToString(), LoggingFlag.DEBUG);␍␊
            foreach (AxiosGameObject g in _gameObjects)␍␊

            }␍␊
#endif␍␊
            ␍␊
            ␍␊
        }␍␊
␍␊
␍␊
 ...
 ...
 ␍␊
         public override void Update(GameTime gameTime, bool otherScreenHasFocus, bool coveredByOtherScreen)␍␊
         {␍␊
-            if (otherScreenHasFocus)␍␊
+            if (otherScreenHasFocus && !screenHidden)␍␊
             {␍␊
                 screenHidden = true;␍␊
+                this.Deactivate();␍␊
             }␍␊
 ␍␊
             if (screenHidden && !otherScreenHasFocus)␍␊
         {␍␊
             //this.IsExiting = true;␍␊
             //System.Diagnostics.Debugger.Break();␍␊
-            base.Deactivate();␍␊
             ScreenState = GameStateManagement.ScreenState.TransitionOff;␍␊
             AxiosLog.Instance.AddLine("Memory usage before cleanup: " + GC.GetTotalMemory(true).ToString(), LoggingFlag.DEBUG);␍␊
             foreach (AxiosGameObject g in _gameObjects)␍␊
             }␍␊
 #endif␍␊
             ␍␊
+            ␍␊
         }␍␊
 ␍␊
 ␍␊

-104
105 105
106 106
107
107 108
108 109
109 110
... ...
391 392
392 393
393 394
394 
395
395 396
396 397
397 398
+         *  -- Nathan Adams [adamsna@datanethost.net] - 4/12/2012␍␊
         */␍␊
␍␊
        public bool MoveCursorWithController = false;␍␊
␍␊
        /*␍␊
         * Adding variables for the cursor ␍␊

            // Update cursor␍␊
            Vector2 oldCursor = _cursor;␍␊
␍␊
            if (CurrentGamePadStates[0].IsConnected && CurrentGamePadStates[0].ThumbSticks.Left != Vector2.Zero)␍␊
            if (CurrentGamePadStates[0].IsConnected && CurrentGamePadStates[0].ThumbSticks.Left != Vector2.Zero && MoveCursorWithController)␍␊
            {␍␊
                Vector2 temp = CurrentGamePadStates[0].ThumbSticks.Left;␍␊
                _cursor += temp * new Vector2(300f, -300f) * (float)gameTime.ElapsedGameTime.TotalSeconds;␍␊
 ...
          *  -- Nathan Adams [adamsna@datanethost.net] - 4/12/2012␍␊
          */␍␊
 ␍␊
+        public bool MoveCursorWithController = false;␍␊
 ␍␊
         /*␍␊
          * Adding variables for the cursor ␍␊
             // Update cursor␍␊
             Vector2 oldCursor = _cursor;␍␊
 ␍␊
-            if (CurrentGamePadStates[0].IsConnected && CurrentGamePadStates[0].ThumbSticks.Left != Vector2.Zero)␍␊
+            if (CurrentGamePadStates[0].IsConnected && CurrentGamePadStates[0].ThumbSticks.Left != Vector2.Zero && MoveCursorWithController)␍␊
             {␍␊
                 Vector2 temp = CurrentGamePadStates[0].ThumbSticks.Left;␍␊
                 _cursor += temp * new Vector2(300f, -300f) * (float)gameTime.ElapsedGameTime.TotalSeconds;␍␊

Download the corresponding diff file

axiosengine

File differences

Branches