Merge branch 'master' of https://github.com/mono/CocosSharp into text…

…field

TestWin8Phone/TestWin8Phone.csproj

@@ -617,6 +617,9 @@
     <Compile Include="..\tests\tests\classes\tests\LabelTestNew\LabelFNTUNICODELanguages.cs">
       <Link>classes\tests\LabelTestNew\LabelFNTUNICODELanguages.cs</Link>
     </Compile>
+    <Compile Include="..\tests\tests\classes\tests\LabelTestNew\LabelFSTextureView.cs">
+      <Link>classes\tests\LabelTestNew\LabelFSTextureView.cs</Link>
+    </Compile>
     <Compile Include="..\tests\tests\classes\tests\LabelTestNew\LabelSFAlignmentTest.cs">
       <Link>classes\tests\LabelTestNew\LabelSFAlignmentTest.cs</Link>
     </Compile>

src/CocosSharp.iOS.csproj

@@ -29,6 +29,7 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchUseArmv7>false</MtouchUseArmv7>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -39,6 +40,7 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>IPHONE;IOS;GLES;OPENGL;MONOGAME</DefineConstants>
     <MtouchUseArmv7>false</MtouchUseArmv7>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>True</DebugSymbols>
@@ -53,6 +55,7 @@
     <MtouchDebug>True</MtouchDebug>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <DocumentationFile>bin\iPhone\Debug\CocosSharp.XML</DocumentationFile>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -64,6 +67,7 @@
     <DefineConstants>IPHONE;IOS;GLES;OPENGL;MONOGAME</DefineConstants>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <DocumentationFile>bin\iPhone\Release\CocosSharp.XML</DocumentationFile>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

src/sprite_nodes/CCSprite.cs

@@ -232,7 +232,14 @@ protected internal CCSize UntrimmedSizeInPixels
                 return untrimmedSizeInPixels;
             }
 
-            set { untrimmedSizeInPixels = value; }
+            set 
+            { 
+                if (untrimmedSizeInPixels != value)
+                {
+                    untrimmedSizeInPixels = value; 
+                    texQuadDirty = true; 
+                }
+            }
         }
 
         protected internal CCV3F_C4B_T2F_Quad Quad 

testWin8Store/TestWin8Store.csproj

@@ -401,6 +401,9 @@
     <Compile Include="..\tests\tests\classes\tests\LabelTestNew\LabelFNTUNICODELanguages.cs">
       <Link>classes\tests\LabelTestNew\LabelFNTUNICODELanguages.cs</Link>
     </Compile>
+    <Compile Include="..\tests\tests\classes\tests\LabelTestNew\LabelFSTextureView.cs">
+      <Link>classes\tests\LabelTestNew\LabelFSTextureView.cs</Link>
+    </Compile>
     <Compile Include="..\tests\tests\classes\tests\LabelTestNew\LabelSFAlignmentTest.cs">
       <Link>classes\tests\LabelTestNew\LabelSFAlignmentTest.cs</Link>
     </Compile>

tests/tests/WindowsPhone81/CocosSharp.Tests.WindowsPhone81.csproj

@@ -101,6 +101,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\classes\tests\LabelTestNew\LabelFSTextureView.cs">
+      <Link>classes\tests\LabelTestNew\LabelFSTextureView.cs</Link>
+    </Compile>
     <Compile Include="..\classes\tests\LabelTestNew\LabelSystemFontColorAndOpacity.cs">
       <Link>classes\tests\LabelTestNew\LabelSystemFontColorAndOpacity.cs</Link>
     </Compile>

tests/tests/classes/tests/LabelTestNew/AtlasTestSceneNew.cs

@@ -91,9 +91,11 @@ public static CCLayer restartAtlasAction()
                 () => new LabelSFContentSizeRatios(),
                 () => new LabelSystemFont168(),
                 () => new LabelSystemFontRenderTexture(),
+
 #if !WINDOWS_PHONE8
                 () => new LabelFNTFromHTTP(),
 #endif
+                () => new LabelSFTextureView(),
         };
 
         public static CCLayer createAtlasLayer(int index)

tests/tests/classes/tests/LabelTestNew/LabelFSTextureView.cs

@@ -0,0 +1,115 @@
+using System;
+using CocosSharp;
+
+namespace tests
+{
+    public class LabelSFTextureView : AtlasDemoNew
+    {
+        CCNode spriteFontNode;
+
+        public LabelSFTextureView()
+        {
+            Color = new CCColor3B(128, 128, 128);
+            Opacity = 255;
+
+
+        }
+
+        public override void OnEnter ()
+        {
+            base.OnEnter ();
+
+            var origin = Layer.VisibleBoundsWorldspace.Size;
+
+            var label1 = new CCLabel(string.Empty, "debuguncompressed", 0, CCLabelFormat.SpriteFont);
+
+            var texture = label1.TextureAtlas != null ? label1.TextureAtlas.Texture : null;
+
+            if (texture != null) {
+                spriteFontNode = new CCSprite (texture);
+                spriteFontNode.Scale = 2;
+            }
+            else
+            {
+                spriteFontNode = new CCLabel("Texture can not be loaded", "arial", 24, CCLabelFormat.SpriteFont);
+            }
+            //spriteFontNode.Color = CCColor3B.Magenta;
+            spriteFontNode.Position = origin.Center;
+
+
+            AddChild (spriteFontNode);
+
+            var itemUncompressed = new CCMenuItemLabel(new CCLabel("Uncompressed", "fonts/arial", 24, CCLabelFormat.SpriteFont));
+            var itemCompressed = new CCMenuItemLabel(new CCLabel("Compressed", "fonts/arial", 24, CCLabelFormat.SpriteFont));
+            itemUncompressed.AnchorPoint = CCPoint.AnchorMiddleLeft;
+            itemCompressed.AnchorPoint = CCPoint.AnchorMiddleLeft;
+            var mi1 = new CCMenuItemToggle(OnToggle, itemUncompressed, itemCompressed);
+            var menu = new CCMenu(mi1);
+
+            AddChild(menu);
+            menu.Position = VisibleBoundsWorldspace.Left();
+        }
+
+        void OnToggle(object sender)
+        {
+            var toggle = sender as CCMenuItemToggle;
+            if (toggle == null)
+                return;
+
+            var origin = Layer.VisibleBoundsWorldspace.Size;
+            spriteFontNode.RemoveFromParent (true);
+
+            switch(toggle.SelectedIndex)
+            {
+            case 0:
+                var label1 = new CCLabel (string.Empty, "debuguncompressed", 0, CCLabelFormat.SpriteFont);
+
+                var texture = label1.TextureAtlas != null ? label1.TextureAtlas.Texture : null;
+
+                if (texture != null) {
+                    spriteFontNode.RemoveFromParent (true);
+                    spriteFontNode = new CCSprite (texture);
+                    spriteFontNode.Scale = 2;
+                } else {
+                    spriteFontNode = new CCLabel ("Texture can not be loaded", "arial", 24, CCLabelFormat.SpriteFont);
+                }
+                break;
+            case 1:
+                label1 = new CCLabel (string.Empty, "debugcompressed", 0, CCLabelFormat.SpriteFont);
+
+                texture = label1.TextureAtlas != null ? label1.TextureAtlas.Texture : null;
+
+                if (texture != null) {
+                    spriteFontNode.RemoveFromParent (true);
+                    spriteFontNode = new CCSprite (texture);
+                    spriteFontNode.Scale = 2;
+                } else {
+                    spriteFontNode = new CCLabel ("Texture can not be loaded", "arial", 24, CCLabelFormat.SpriteFont);
+                }
+                break;
+
+            }
+
+            AddChild (spriteFontNode);
+            //spriteFontNode.Color = CCColor3B.Magenta;
+            spriteFontNode.Position = origin.Center;
+
+
+        }
+
+        public override string Title
+        {
+            get {
+                return "SpriteFont TextureAtlas";
+            }
+        }
+
+        public override string Subtitle
+        {
+            get {
+                return string.Empty;
+            }
+        }
+    }
+}
+

tests/tests/classes/tests/SpriteTest/SpriteSubclass.cs

@@ -60,12 +60,10 @@ public override string Subtitle
         public SpriteSubclass()
         {
             CCSpriteFrameCache.SharedSpriteFrameCache.AddSpriteFrames("animations/ghosts.plist");
-            CCSpriteBatchNode aParent = new CCSpriteBatchNode("animations/ghosts");
 
             // MySprite1
             sprite = MySprite1.Create("father.gif");
-            aParent.AddChild(sprite);
-            AddChild(aParent);
+            AddChild(sprite);
 
             // MySprite2
             sprite2 = new MySprite2("Images/grossini");
@@ -86,4 +84,85 @@ public override void OnEnter()
 
         #endregion Setup content
     }
+
+
+    public class SpriteUntrimmedSizeInPixels : SpriteTestDemo
+    {
+
+        // Create new CCSprite to access the protected property UntrimmedSizeInPixels
+        class MySprite3 : CCSprite
+        {
+
+            public MySprite3(string fileName): base(fileName)
+            {   }
+
+            public CCSize UntrimmedSizeInPixels
+            {
+                get { return base.UntrimmedSizeInPixels; }
+                set 
+                { 
+                    base.UntrimmedSizeInPixels = value;
+                }
+            }
+        }
+
+
+        MySprite3 sprite3;
+
+        #region Properties
+
+        public override string Title
+        {
+            get { return "Sprite subclass"; }
+        }
+
+        public override string Subtitle
+        {
+            get { return "Testing UntrimmedSizeInPixels\ntouch and drag on the screen\nto see sprite resize."; }
+        }
+
+        #endregion Properties
+
+
+        #region Constructors
+
+        public SpriteUntrimmedSizeInPixels()
+        {
+            // MySprite3
+            sprite3 = new MySprite3("Images/grossini");
+            AddChild(sprite3);
+
+            // Register Touch Event
+            var touchListener = new CCEventListenerTouchAllAtOnce();
+            touchListener.OnTouchesMoved = OnTouchesMoved;
+
+            AddEventListener(touchListener);
+        }
+
+        #endregion Constructors
+
+
+        #region Setup content
+
+        public override void OnEnter()
+        {
+            base.OnEnter(); 
+            CCSize windowSize = Layer.VisibleBoundsWorldspace.Size;
+            sprite3.Position = windowSize.Center;
+        }
+
+        #endregion Setup content
+
+        void OnTouchesMoved(List<CCTouch> touches, CCEvent touchEvent)
+        {
+            foreach (CCTouch touch in touches)
+            {
+                var delta = -touch.Delta;
+                var newWidth = sprite3.UntrimmedSizeInPixels.Width + delta.X;
+                var newHeight = sprite3.UntrimmedSizeInPixels.Height + delta.Y;
+                var newSize = new CCSize(newWidth, newHeight);
+                sprite3.UntrimmedSizeInPixels = newSize;
+            }
+        }
+    }
 }