AxiosEngine-old Commit Details

Date:

2012-06-03 15:39:00 (12 years 6 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

9e5a38542239

Parents:

9d0d0767a8cf

Message:

+ * - Adding rotation to DrawableAxiosGameObject

+ * - Adding InputState extensions to test for input agaisnt Player One

Changes:

M	axios/Axios_WP7.csproj (1 diff)
M	axios/Axios_Windows.csproj (1 diff)
M	axios/Axios_Xbox_360.csproj (1 diff)
M	axios/Axios_settings.cs (1 diff)
M	axios/Engine/DrawableAxiosGameObject.cs (2 diffs)
M	axios/Engine/Extensions/Contact.cs (1 diff)
M	axios/ScreenSystem/InputState.cs (3 diffs)

File differences

-169
170 170
171 171
172
172 173
173 174
174 175
+    <Compile Include="Engine\DrawableBreakableAxiosGameObject.cs" />␍␊
    <Compile Include="Engine\Extensions\Bitmap.cs" />␍␊
    <Compile Include="Engine\Extensions\Contact.cs" />␍␊
    <Compile Include="Engine\Extensions\InputState.cs" />␍␊
    <Compile Include="Engine\Extensions\String.cs" />␍␊
    <Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
    <Compile Include="Engine\File\AxiosFile.cs" />␍␊
     <Compile Include="Engine\DrawableBreakableAxiosGameObject.cs" />␍␊
     <Compile Include="Engine\Extensions\Bitmap.cs" />␍␊
     <Compile Include="Engine\Extensions\Contact.cs" />␍␊
+    <Compile Include="Engine\Extensions\InputState.cs" />␍␊
     <Compile Include="Engine\Extensions\String.cs" />␍␊
     <Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
     <Compile Include="Engine\File\AxiosFile.cs" />␍␊

-212
213 213
214 214
215
215 216
216 217
217 218
+    <Compile Include="Engine\DrawableBreakableAxiosGameObject.cs" />␍␊
    <Compile Include="Engine\Extensions\Bitmap.cs" />␍␊
    <Compile Include="Engine\Extensions\Contact.cs" />␍␊
    <Compile Include="Engine\Extensions\InputState.cs" />␍␊
    <Compile Include="Engine\Extensions\String.cs" />␍␊
    <Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
    <Compile Include="Engine\File\AxiosFile.cs" />␍␊
     <Compile Include="Engine\DrawableBreakableAxiosGameObject.cs" />␍␊
     <Compile Include="Engine\Extensions\Bitmap.cs" />␍␊
     <Compile Include="Engine\Extensions\Contact.cs" />␍␊
+    <Compile Include="Engine\Extensions\InputState.cs" />␍␊
     <Compile Include="Engine\Extensions\String.cs" />␍␊
     <Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
     <Compile Include="Engine\File\AxiosFile.cs" />␍␊

-162
163 163
164 164
165
165 166
166 167
167 168
+    <Compile Include="Engine\DrawableBreakableAxiosGameObject.cs" />␍␊
    <Compile Include="Engine\Extensions\Bitmap.cs" />␍␊
    <Compile Include="Engine\Extensions\Contact.cs" />␍␊
    <Compile Include="Engine\Extensions\InputState.cs" />␍␊
    <Compile Include="Engine\Extensions\String.cs" />␍␊
    <Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
    <Compile Include="Engine\File\AxiosFile.cs" />␍␊
     <Compile Include="Engine\DrawableBreakableAxiosGameObject.cs" />␍␊
     <Compile Include="Engine\Extensions\Bitmap.cs" />␍␊
     <Compile Include="Engine\Extensions\Contact.cs" />␍␊
+    <Compile Include="Engine\Extensions\InputState.cs" />␍␊
     <Compile Include="Engine\Extensions\String.cs" />␍␊
     <Compile Include="Engine\Extensions\Texture2D.cs" />␍␊
     <Compile Include="Engine\File\AxiosFile.cs" />␍␊

-97
98 98
99 99
100
101
100 102
101 103
102 104
+ * - Upon some testing - developers will need to use #if WINDOWS/#endif tags to make sure they can't use XNACC in WP7/Xbox360␍␊
 * - Adding axioslog command to output AxiosLog␍␊
 * - Changing variables in CommandConsoleBase to be non-static␍␊
 * - Adding rotation to DrawableAxiosGameObject␍␊
 * - Adding InputState extensions to test for input agaisnt Player One␍␊
 * ␍␊
 * ␍␊
 */␍␊
  * - Upon some testing - developers will need to use #if WINDOWS/#endif tags to make sure they can't use XNACC in WP7/Xbox360␍␊
  * - Adding axioslog command to output AxiosLog␍␊
  * - Changing variables in CommandConsoleBase to be non-static␍␊
+ * - Adding rotation to DrawableAxiosGameObject␍␊
+ * - Adding InputState extensions to test for input agaisnt Player One␍␊
  * ␍␊
  * ␍␊
  */␍␊

-16
17 17
18 18
19
20
21
22
23
24
25
26
19 27
20 28
21 29
... ...
43 51
44 52
45 53
46 
54
47 55
48 
56
49 57
50 58
51 59
+        protected bool _adjustunits = true;␍␊
        protected bool _relativetocamera = true;␍␊
␍␊
        protected float _rotation;␍␊
␍␊
        public float Rotation␍␊
        {␍␊
            get { return _rotation; }␍␊
            set { _rotation = value; }␍␊
        }␍␊
␍␊
        public bool AdjustUnits //if value changed - change position depending on adjusting the units␍␊
        {␍␊
            get { return _adjustunits; }␍␊

            else␍␊
                gameScreen.ScreenManager.SpriteBatch.Begin();␍␊
            if (_adjustunits)␍␊
                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, ConvertUnits.ToDisplayUnits(Position), null, Color.White, 0, Origin, _scale, SpriteEffects.None, 0);␍␊
                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, ConvertUnits.ToDisplayUnits(Position), null, Color.White, _rotation, Origin, _scale, SpriteEffects.None, 0);␍␊
            else␍␊
                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, Position, null, Color.White, 0, Origin, _scale, SpriteEffects.None, 0);␍␊
                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, Position, null, Color.White, _rotation, Origin, _scale, SpriteEffects.None, 0);␍␊
            gameScreen.ScreenManager.SpriteBatch.End();␍␊
        }␍␊
␍␊
 ...
         protected bool _adjustunits = true;␍␊
         protected bool _relativetocamera = true;␍␊
 ␍␊
+        protected float _rotation;␍␊
+␍␊
+        public float Rotation␍␊
+        {␍␊
+            get { return _rotation; }␍␊
+            set { _rotation = value; }␍␊
+        }␍␊
+␍␊
         public bool AdjustUnits //if value changed - change position depending on adjusting the units␍␊
         {␍␊
             get { return _adjustunits; }␍␊
             else␍␊
                 gameScreen.ScreenManager.SpriteBatch.Begin();␍␊
             if (_adjustunits)␍␊
-                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, ConvertUnits.ToDisplayUnits(Position), null, Color.White, 0, Origin, _scale, SpriteEffects.None, 0);␍␊
+                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, ConvertUnits.ToDisplayUnits(Position), null, Color.White, _rotation, Origin, _scale, SpriteEffects.None, 0);␍␊
             else␍␊
-                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, Position, null, Color.White, 0, Origin, _scale, SpriteEffects.None, 0);␍␊
+                gameScreen.ScreenManager.SpriteBatch.Draw(Texture, Position, null, Color.White, _rotation, Origin, _scale, SpriteEffects.None, 0);␍␊
             gameScreen.ScreenManager.SpriteBatch.End();␍␊
         }␍␊
 ␍␊

-46
47 47
48 48
49 
50 
51 49
52 50
53 51
+                    ␍␊
            }␍␊
␍␊
␍␊
␍␊
            return direction;␍␊
        }␍␊
    }␍␊
                     ␍␊
             }␍␊
 ␍␊
-␍␊
-␍␊
             return direction;␍␊
         }␍␊
     }␍␊

-473
474 474
475 475
476 
477 476
478 477
479 478
... ...
501 500
502 501
503 502
504 
505 503
506 504
507 505
... ...
552 550
553 551
554 552
555 
556 553
557 554
558 555
+            }␍␊
        }␍␊
␍␊
␍␊
        /// <summary>␍␊
        /// Helper for checking if a button was pressed during this update.␍␊
        /// The controllingPlayer parameter specifies which player to read input for.␍␊

            }␍␊
        }␍␊
␍␊
␍␊
        /// <summary>␍␊
        /// Helper for checking if a key was newly pressed during this update. The␍␊
        /// controllingPlayer parameter specifies which player to read input for.␍␊

            }␍␊
        }␍␊
␍␊
␍␊
        /// <summary>␍␊
        /// Helper for checking if a button was newly pressed during this update.␍␊
        /// The controllingPlayer parameter specifies which player to read input for.␍␊
 ...
 ...
             }␍␊
         }␍␊
 ␍␊
-␍␊
         /// <summary>␍␊
         /// Helper for checking if a button was pressed during this update.␍␊
         /// The controllingPlayer parameter specifies which player to read input for.␍␊
             }␍␊
         }␍␊
 ␍␊
-␍␊
         /// <summary>␍␊
         /// Helper for checking if a key was newly pressed during this update. The␍␊
         /// controllingPlayer parameter specifies which player to read input for.␍␊
             }␍␊
         }␍␊
 ␍␊
-␍␊
         /// <summary>␍␊
         /// Helper for checking if a button was newly pressed during this update.␍␊
         /// The controllingPlayer parameter specifies which player to read input for.␍␊

Download the corresponding diff file

AxiosEngine-old

File differences

Branches

Tags