AxiosEngine-old Commit Details

Date:

2012-05-12 17:45:00 (12 years 7 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

746146cbe176

Parents:

ffcca9881813

Message:

Adding a cache for loading in textures

Splitting the code for Gleed2D into seperate files

Changes:

M	axios/Axios_settings.cs (1 diff)
M	axios/Engine/Glee2D/CircleItem.cs (1 diff)
M	axios/Engine/Glee2D/Item.cs (1 diff)
M	axios/Engine/Glee2D/Level.cs (3 diffs)
M	axios/Engine/Glee2D/PathItem.cs (1 diff)
M	axios/Engine/Glee2D/RectangleItem.cs (1 diff)
M	axios/Engine/Glee2D/TextureItem.cs (2 diffs)

File differences

-69
70 70
71 71
72 
72
73
74
73 75
74 76
75 77
+ * - Adding SplitFlat extension for Texture2D␍␊
 * - Removing uneeded Game Screen checking code␍␊
 * - Adding SplitFlat extension with offsets for Texture2D␍␊
 * - Adding support for Glee2D␍␊
 * - Adding support for Gleed2D␍␊
 * - Splitting the code for Gleed2D into seperate files␍␊
 * - Adding a cache for loading in textures for Gleed2D␍␊
 * ␍␊
 */␍␊
␍␊
  * - Adding SplitFlat extension for Texture2D␍␊
  * - Removing uneeded Game Screen checking code␍␊
  * - Adding SplitFlat extension with offsets for Texture2D␍␊
- * - Adding support for Glee2D␍␊
+ * - Adding support for Gleed2D␍␊
+ * - Splitting the code for Gleed2D into seperate files␍␊
+ * - Adding a cache for loading in textures for Gleed2D␍␊
  * ␍␊
  */␍␊
 ␍␊

-23
24 24
25 25
26 
26
27 27
28 
28
29 29
30 30
31 31
+        {␍␊
        }␍␊
␍␊
        public override void load(ContentManager cm, World world)␍␊
        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
        {␍␊
            base.load(cm, world);␍␊
            base.load(cm, world, ref cache);␍␊
␍␊
            _body = BodyFactory.CreateCircle(world, Radius, 1f);␍␊
            _body.Position = Position;␍␊
         {␍␊
         }␍␊
 ␍␊
-        public override void load(ContentManager cm, World world)␍␊
+        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
         {␍␊
-            base.load(cm, world);␍␊
+            base.load(cm, world, ref cache);␍␊
 ␍␊
             _body = BodyFactory.CreateCircle(world, Radius, 1f);␍␊
             _body.Position = Position;␍␊

-49
50 50
51 51
52 
52
53 53
54 54
55 55
+        /// Called by Level.FromFile(filename) on each Item after the deserialization process.␍␊
        /// Should be overriden and can be used to load anything needed by the Item (e.g. a texture).␍␊
        /// </summary>␍␊
        public virtual void load(ContentManager cm, World world)␍␊
        public virtual void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
        {␍␊
        }␍␊
␍␊
         /// Called by Level.FromFile(filename) on each Item after the deserialization process.␍␊
         /// Should be overriden and can be used to load anything needed by the Item (e.g. a texture).␍␊
         /// </summary>␍␊
-        public virtual void load(ContentManager cm, World world)␍␊
+        public virtual void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
         {␍␊
         }␍␊
 ␍␊

-26
27 27
28 28
29 
29
30 30
31 
31
32 32
33 33
34 34
+        {␍␊
        }␍␊
␍␊
        public override void load(ContentManager cm, World world)␍␊
        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
        {␍␊
            base.load(cm, world);␍␊
            base.load(cm, world, ref cache);␍␊
␍␊
            Vertices v = new Vertices(WorldPoints.Length);␍␊
            foreach (Vector2 vec in WorldPoints)␍␊
         {␍␊
         }␍␊
 ␍␊
-        public override void load(ContentManager cm, World world)␍␊
+        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
         {␍␊
-            base.load(cm, world);␍␊
+            base.load(cm, world, ref cache);␍␊
 ␍␊
             Vertices v = new Vertices(WorldPoints.Length);␍␊
             foreach (Vector2 vec in WorldPoints)␍␊

-24
25 25
26 26
27 
27
28 28
29 
29
30 30
31 31
32 32
+        {␍␊
        }␍␊
␍␊
        public override void load(ContentManager cm, World world)␍␊
        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
        {␍␊
            base.load(cm, world);␍␊
            base.load(cm, world, ref cache);␍␊
␍␊
            _body = BodyFactory.CreateRectangle(world, Width, Height, 1f);␍␊
            _body.Position = Position;␍␊
         {␍␊
         }␍␊
 ␍␊
-        public override void load(ContentManager cm, World world)␍␊
+        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
         {␍␊
-            base.load(cm, world);␍␊
+            base.load(cm, world, ref cache);␍␊
 ␍␊
             _body = BodyFactory.CreateRectangle(world, Width, Height, 1f);␍␊
             _body.Position = Position;␍␊

-77
78 78
79 79
80 
80
81 81
82 82
83 83
... ...
85 85
86 86
87 87
88 
88
89
90
91
92
93
89 94
90 95
91 96
+        /// You must provide your own implementation. However, you can rely on all public fields being␍␊
        /// filled by the level deserialization process.␍␊
        /// </summary>␍␊
        public override void load(ContentManager cm, World world)␍␊
        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
        {␍␊
            //throw new NotImplementedException();␍␊
␍␊

            //for example:␍␊
            //this.texture = Texture2D.FromFile(<GraphicsDevice>, texture_filename);␍␊
            //or by using the Content Pipeline:␍␊
            this.texture = cm.Load<Texture2D>(asset_name);␍␊
            if (!cache.ContainsKey(asset_name))␍␊
            {␍␊
                cache[asset_name] = cm.Load<Texture2D>(asset_name);   ␍␊
            }␍␊
            this.texture = cache[asset_name];␍␊
            //this.texture = cm.Load<Texture2D>(asset_name);␍␊
␍␊
        }␍␊
␍␊
 ...
         /// You must provide your own implementation. However, you can rely on all public fields being␍␊
         /// filled by the level deserialization process.␍␊
         /// </summary>␍␊
-        public override void load(ContentManager cm, World world)␍␊
+        public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)␍␊
         {␍␊
             //throw new NotImplementedException();␍␊
 ␍␊
             //for example:␍␊
             //this.texture = Texture2D.FromFile(<GraphicsDevice>, texture_filename);␍␊
             //or by using the Content Pipeline:␍␊
-            this.texture = cm.Load<Texture2D>(asset_name);␍␊
+            if (!cache.ContainsKey(asset_name))␍␊
+            {␍␊
+                cache[asset_name] = cm.Load<Texture2D>(asset_name);   ␍␊
+            }␍␊
+            this.texture = cache[asset_name];␍␊
+            //this.texture = cm.Load<Texture2D>(asset_name);␍␊
 ␍␊
         }␍␊
 ␍␊

Download the corresponding diff file

AxiosEngine-old

File differences

Branches

Tags