axiosengine Commit Details

Date:

2012-05-13 22:20:50 (12 years 5 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

33d46b0cd7ae7f7e4524445706deeaf315dc19d6

Parents:

f57659e2e10eefa89c5c02ae05b460ce9fd46387

Message:

+ * - Fixing path placement in Farseer * Fixing rectangle placement in Farseer + * - Moving base.draw to last in AxiosGameScreen to make sure Farseer debug information is visible

Changes:

File differences

-76
77 77
78 78
79
80
79 81
80 82
81 83
+ * - Adding support to load a Gleed2D level from a stream␍␊
 * - Adjusting units for Gleed2D position for Farseer bodies␍␊
 * - Modfying draw method in AxiosGameScreen to draw Gleed2D textures␍␊
 * - Fixing path placement in Farseer␍␊
 * - Moving base.draw to last in AxiosGameScreen to make sure Farseer debug information is visible␍␊
 * ␍␊
 */␍␊
␍␊
  * - Adding support to load a Gleed2D level from a stream␍␊
  * - Adjusting units for Gleed2D position for Farseer bodies␍␊
  * - Modfying draw method in AxiosGameScreen to draw Gleed2D textures␍␊
+ * - Fixing path placement in Farseer␍␊
+ * - Moving base.draw to last in AxiosGameScreen to make sure Farseer debug information is visible␍␊
  * ␍␊
  */␍␊
 ␍␊

-183
184 184
185 185
186 
186
187 187
188 188
189 189
... ...
191 191
192 192
193 193
194 
195 
194
195
196 196
197 197
198 198
... ...
206 206
207 207
208 208
209 
209
210 210
211 211
212 212
+␍␊
        public override void Draw(GameTime gameTime)␍␊
        {␍␊
            base.Draw(gameTime);␍␊
            ␍␊
␍␊
            if (Level != null)␍␊
            {␍␊

                {␍␊
                    Vector2 oldcameraposition = camera.Position;␍␊
                    camera.Position *= layer.ScrollSpeed;␍␊
␍␊
                    ScreenManager.SpriteBatch.Begin(0, null, null, null, null, null, camera.matrix);␍␊
                    ␍␊
                    ScreenManager.SpriteBatch.Begin(0, null, null, null, null, null, Camera.View);␍␊
                    layer.draw(ScreenManager.SpriteBatch);␍␊
                    ScreenManager.SpriteBatch.End();␍␊
␍␊

            foreach(AxiosUIObject g in (from x in _uiobjects orderby x.DrawOrder select x))␍␊
                ((IDrawableAxiosGameObject)g).Draw(this, gameTime);␍␊
␍␊
            //System.Diagnostics.Debugger.Break();␍␊
            base.Draw(gameTime); //This is placed at the end so that Farseer debug information is visible␍␊
            ␍␊
        }␍␊
␍␊
 ...
 ...
 ␍␊
         public override void Draw(GameTime gameTime)␍␊
         {␍␊
-            base.Draw(gameTime);␍␊
+            ␍␊
 ␍␊
             if (Level != null)␍␊
             {␍␊
                 {␍␊
                     Vector2 oldcameraposition = camera.Position;␍␊
                     camera.Position *= layer.ScrollSpeed;␍␊
-␍␊
-                    ScreenManager.SpriteBatch.Begin(0, null, null, null, null, null, camera.matrix);␍␊
+                    ␍␊
+                    ScreenManager.SpriteBatch.Begin(0, null, null, null, null, null, Camera.View);␍␊
                     layer.draw(ScreenManager.SpriteBatch);␍␊
                     ScreenManager.SpriteBatch.End();␍␊
 ␍␊
             foreach(AxiosUIObject g in (from x in _uiobjects orderby x.DrawOrder select x))␍␊
                 ((IDrawableAxiosGameObject)g).Draw(this, gameTime);␍␊
 ␍␊
-            //System.Diagnostics.Debugger.Break();␍␊
+            base.Draw(gameTime); //This is placed at the end so that Farseer debug information is visible␍␊
             ␍␊
         }␍␊
 ␍␊

-30
31 31
32 32
33 
34 
33
34
35 35
36 36
37 37
+        {␍␊
            base.load(cm, world, ref cache);␍␊
␍␊
            Vertices v = new Vertices(WorldPoints.Length);␍␊
            foreach (Vector2 vec in WorldPoints)␍␊
            Vertices v = new Vertices(LocalPoints.Length);␍␊
            foreach (Vector2 vec in LocalPoints)␍␊
                v.Add(new Vector2(ConvertUnits.ToSimUnits(vec.X), ConvertUnits.ToSimUnits(vec.Y)));␍␊
␍␊
            _body = BodyFactory.CreateLoopShape(world, v);␍␊
         {␍␊
             base.load(cm, world, ref cache);␍␊
 ␍␊
-            Vertices v = new Vertices(WorldPoints.Length);␍␊
-            foreach (Vector2 vec in WorldPoints)␍␊
+            Vertices v = new Vertices(LocalPoints.Length);␍␊
+            foreach (Vector2 vec in LocalPoints)␍␊
                 v.Add(new Vector2(ConvertUnits.ToSimUnits(vec.X), ConvertUnits.ToSimUnits(vec.Y)));␍␊
 ␍␊
             _body = BodyFactory.CreateLoopShape(world, v);␍␊

-28
29 29
30 30
31 
32 
31
32
33 33
34 34
35 35
+        {␍␊
            base.load(cm, world, ref cache);␍␊
␍␊
            _body = BodyFactory.CreateRectangle(world, Width, Height, 1f);␍␊
            _body.Position = ConvertUnits.ToSimUnits(Position);␍␊
            _body = BodyFactory.CreateRectangle(world, ConvertUnits.ToSimUnits(Width), ConvertUnits.ToSimUnits(Height), 1f);␍␊
            _body.Position = ConvertUnits.ToSimUnits(Position) + new Vector2(ConvertUnits.ToSimUnits(Width)/2, ConvertUnits.ToSimUnits(Height)/2);␍␊
            _body.UserData = this;␍␊
        }␍␊
    }␍␊
         {␍␊
             base.load(cm, world, ref cache);␍␊
 ␍␊
-            _body = BodyFactory.CreateRectangle(world, Width, Height, 1f);␍␊
-            _body.Position = ConvertUnits.ToSimUnits(Position);␍␊
+            _body = BodyFactory.CreateRectangle(world, ConvertUnits.ToSimUnits(Width), ConvertUnits.ToSimUnits(Height), 1f);␍␊
+            _body.Position = ConvertUnits.ToSimUnits(Position) + new Vector2(ConvertUnits.ToSimUnits(Width)/2, ConvertUnits.ToSimUnits(Height)/2);␍␊
             _body.UserData = this;␍␊
         }␍␊
     }␍␊

Download the corresponding diff file

axiosengine

File differences

Branches