axiosengine Commit Details

Date:

2014-11-30 11:50:21 (9 years 10 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

ba49c70a91180d0f93d428ec3adbbcf195a0e690

Parents:

00bc0f4fa4b87a7b4edb997ce134c5fcc58b65d4

Message:

Adding mono project adding game services static class to make it easier to access graphics device adding axiosengine factory with extension to create texture from list of textures

Changes:

File differences

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
+Original GameServices class written by Roy Triesscheijn␊
http://roy-t.nl/index.php/about-2/␊
http://roy-t.nl/index.php/2010/08/25/xna-accessing-contentmanager-and-graphicsdevice-anywhere-anytime-the-gameservicecontainer/␊
␊
This license governs use of the accompanying software. If you use the software, you␊
accept this license. If you do not accept the license, do not use the software.␊
␊
1. Definitions␊
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the␊
same meaning here as under U.S. copyright law.␊
A "contribution" is the original software, or any additions or changes to the software.␊
A "contributor" is any person that distributes its contribution under this license.␊
"Licensed patents" are a contributor's patent claims that read directly on its contribution.␊
␊
2. Grant of Rights␊
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.␊
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.␊
␊
3. Conditions and Limitations␊
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.␊
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.␊
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.␊
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.␊
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
+Original GameServices class written by Roy Triesscheijn␊
+http://roy-t.nl/index.php/about-2/␊
+http://roy-t.nl/index.php/2010/08/25/xna-accessing-contentmanager-and-graphicsdevice-anywhere-anytime-the-gameservicecontainer/␊
+␊
+This license governs use of the accompanying software. If you use the software, you␊
+accept this license. If you do not accept the license, do not use the software.␊
+␊
+. Definitions␊
+The terms "reproduce," "reproduction," "derivative works," and "distribution" have the␊
+same meaning here as under U.S. copyright law.␊
+A "contribution" is the original software, or any additions or changes to the software.␊
+A "contributor" is any person that distributes its contribution under this license.␊
+"Licensed patents" are a contributor's patent claims that read directly on its contribution.␊
+␊
+. Grant of Rights␊
+(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.␊
+(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.␊
+␊
+. Conditions and Limitations␊
+(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.␊
+(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.␊
+(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.␊
+(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.␊
+(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

-69
70 70
71 71
72 
72
73
74
75
76
77
+Portions of this product are (C) 2009-2011 JRTwine Software, LLC␍␊
␍␊
Prompt Factory - By Blaze Phoenix␍␊
http://stackoverflow.com/a/17260476/195722␍␊
␍␊
␉ http://stackoverflow.com/a/17260476/195722␍␊
␍␊
Game Services - See Game.Services.License.txt␍␊
␍␊
␉ http://roy-t.nl/index.php/2010/08/25/xna-accessing-contentmanager-and-graphicsdevice-anywhere-anytime-the-gameservicecontainer/
 Portions of this product are (C) 2009-2011 JRTwine Software, LLC␍␊
 ␍␊
 Prompt Factory - By Blaze Phoenix␍␊
-http://stackoverflow.com/a/17260476/195722␍␊
+␍␊
+␉ http://stackoverflow.com/a/17260476/195722␍␊
+␍␊
+Game Services - See Game.Services.License.txt␍␊
+␍␊
+␉ http://roy-t.nl/index.php/2010/08/25/xna-accessing-contentmanager-and-graphicsdevice-anywhere-anytime-the-gameservicecontainer/

-1
2 2
3 3
4 
4
5 5
6 6
+<?xml version="1.0" encoding="utf-8"?>␍␊
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">␍␊
  <PropertyGroup>␍␊
    <ProjectView>ShowAllFiles</ProjectView>␍␊
    <ProjectView>ProjectFiles</ProjectView>␍␊
  </PropertyGroup>␍␊
</Project>
 <?xml version="1.0" encoding="utf-8"?>␍␊
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">␍␊
   <PropertyGroup>␍␊
-    <ProjectView>ShowAllFiles</ProjectView>␍␊
+    <ProjectView>ProjectFiles</ProjectView>␍␊
   </PropertyGroup>␍␊
 </Project>

-129
130 130
131 131
132
133
134
132 135
133 136
134 137
+ * - Adding prompt factory class to generate a Final Fantasy type text prompt␍␊
 * - Updating Gleed2D support to work with latest version of Gleed2D␍␊
 * ␍␊
 * 1.0.1.11 - ␍␊
 * - Adding game services static class␍␊
 * ␍␊
 */␍␊
#endregion␍␊
␍␊
  * - Adding prompt factory class to generate a Final Fantasy type text prompt␍␊
  * - Updating Gleed2D support to work with latest version of Gleed2D␍␊
  * ␍␊
+ * 1.0.1.11 - ␍␊
+ * - Adding game services static class␍␊
+ * ␍␊
  */␍␊
 #endregion␍␊
 ␍␊

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
+using Microsoft.Xna.Framework;␊
using Microsoft.Xna.Framework.Graphics;␊
using System.Collections.Generic;␊
␊
namespace Axios.Engine.Factories␊
{␊
    public class Texture2DFactory␊
    {␊
        public static Texture2D CreateFromList(List<Texture2D> textures, int width, int height)␊
        {␊
            if (textures.Count <= 0)␊
                return (Texture2D)null;␊
            Texture2D texture2D1 = new Texture2D(textures[0].GraphicsDevice, width, height);␊
            Color[] data1 = new Color[width * height];␊
            texture2D1.GetData<Color>(data1);␊
            Rectangle rectangle = new Rectangle(0, 0, textures[0].Width, textures[0].Height);␊
            foreach (Texture2D texture2D2 in textures)␊
            {␊
                Color[] data2 = new Color[texture2D2.Width * texture2D2.Height];␊
                texture2D2.GetData<Color>(data2);␊
                texture2D1.SetData<Color>(0, new Rectangle?(rectangle), data2, 0, texture2D2.Width * texture2D2.Height);␊
                rectangle.X += texture2D2.Width;␊
                if (rectangle.X >= width)␊
                {␊
                    rectangle.X = 0;␊
                    rectangle.Y += texture2D2.Height;␊
                }␊
            }␊
            return texture2D1;␊
        }␊
    }␊
}␊
+using Microsoft.Xna.Framework;␊
+using Microsoft.Xna.Framework.Graphics;␊
+using System.Collections.Generic;␊
+␊
+namespace Axios.Engine.Factories␊
+{␊
+    public class Texture2DFactory␊
+    {␊
+        public static Texture2D CreateFromList(List<Texture2D> textures, int width, int height)␊
+        {␊
+            if (textures.Count <= 0)␊
+                return (Texture2D)null;␊
+            Texture2D texture2D1 = new Texture2D(textures[0].GraphicsDevice, width, height);␊
+            Color[] data1 = new Color[width * height];␊
+            texture2D1.GetData<Color>(data1);␊
+            Rectangle rectangle = new Rectangle(0, 0, textures[0].Width, textures[0].Height);␊
+            foreach (Texture2D texture2D2 in textures)␊
+            {␊
+                Color[] data2 = new Color[texture2D2.Width * texture2D2.Height];␊
+                texture2D2.GetData<Color>(data2);␊
+                texture2D1.SetData<Color>(0, new Rectangle?(rectangle), data2, 0, texture2D2.Width * texture2D2.Height);␊
+                rectangle.X += texture2D2.Width;␊
+                if (rectangle.X >= width)␊
+                {␊
+                    rectangle.X = 0;␊
+                    rectangle.Y += texture2D2.Height;␊
+                }␊
+            }␊
+            return texture2D1;␊
+        }␊
+    }␊
+}␊

-78
79 79
80 80
81 
81
82
82 83
83 84
84 85
+            this._uiobjects = new List<AxiosUIObject>();␍␊
            prevuiobj = null;␍␊
            prevuifocusobj = null;␍␊
            ␍␊
            GameServices.AddService<GraphicsDevice>(this.ScreenManager.GraphicsDevice);␍␊
            GameServices.AddService<ContentManager>(this.ScreenManager.Game.Content);␍␊
        }␍␊
␍␊
        public void LoadLevelFromStream(Stream s)␍␊
             this._uiobjects = new List<AxiosUIObject>();␍␊
             prevuiobj = null;␍␊
             prevuifocusobj = null;␍␊
-            ␍␊
+            GameServices.AddService<GraphicsDevice>(this.ScreenManager.GraphicsDevice);␍␊
+            GameServices.AddService<ContentManager>(this.ScreenManager.Game.Content);␍␊
         }␍␊
 ␍␊
         public void LoadLevelFromStream(Stream s)␍␊

Download the corresponding diff file

axiosengine

File differences

Branches