Browse Source

Remove UI.__init call, remove unnecessary skin files

Josh Engebretson 10 years ago
parent
commit
74f9c2f024

+ 5 - 2
Basic3D/Resources/Scenes/Scene.scene

@@ -5,8 +5,8 @@
 	<attribute name="Smoothing Constant" value="50" />
 	<attribute name="Smoothing Constant" value="50" />
 	<attribute name="Snap Threshold" value="5" />
 	<attribute name="Snap Threshold" value="5" />
 	<attribute name="Elapsed Time" value="0" />
 	<attribute name="Elapsed Time" value="0" />
-	<attribute name="Next Replicated Node ID" value="366" />
-	<attribute name="Next Replicated Component ID" value="1979" />
+	<attribute name="Next Replicated Node ID" value="367" />
+	<attribute name="Next Replicated Component ID" value="1980" />
 	<attribute name="Next Local Node ID" value="16778496" />
 	<attribute name="Next Local Node ID" value="16778496" />
 	<attribute name="Next Local Component ID" value="16777216" />
 	<attribute name="Next Local Component ID" value="16777216" />
 	<attribute name="Variables" />
 	<attribute name="Variables" />
@@ -65,6 +65,9 @@
 			<attribute name="Material" value="Material;Models/Materials/DefaultMaterial.material" />
 			<attribute name="Material" value="Material;Models/Materials/DefaultMaterial.material" />
 		</component>
 		</component>
 		<component type="JSComponent" id="1976">
 		<component type="JSComponent" id="1976">
+			<attribute name="FieldValues">
+				<variant hash="273365031" type="Float" value="1" />
+			</attribute>
 			<attribute name="ComponentFile" value="JSComponentFile;Components/Spinner.js" />
 			<attribute name="ComponentFile" value="JSComponentFile;Components/Spinner.js" />
 		</component>
 		</component>
 	</node>
 	</node>

+ 2 - 5
CharacterAnimation2D/Resources/Components/UI.js

@@ -23,10 +23,7 @@ function createButton(self, text, event, layout) {
 }
 }
 
 
 exports.component = function(self) {
 exports.component = function(self) {
-
-    // TODO: fixme
-    Atomic.UI.__init();
-
+  
     // root view
     // root view
     self.uiView = new Atomic.UIView();
     self.uiView = new Atomic.UIView();
 
 
@@ -45,4 +42,4 @@ exports.component = function(self) {
     createButton(self, "Play Hit", "PlayHit", layout);
     createButton(self, "Play Hit", "PlayHit", layout);
     createButton(self, "Play Dead", "PlayDead", layout);
     createButton(self, "Play Dead", "PlayDead", layout);
 
 
-}
+}

+ 4 - 4
CharacterAnimation2D/Resources/Scenes/Scene.scene

@@ -5,10 +5,10 @@
 	<attribute name="Smoothing Constant" value="50" />
 	<attribute name="Smoothing Constant" value="50" />
 	<attribute name="Snap Threshold" value="5" />
 	<attribute name="Snap Threshold" value="5" />
 	<attribute name="Elapsed Time" value="0" />
 	<attribute name="Elapsed Time" value="0" />
-	<attribute name="Next Replicated Node ID" value="365" />
-	<attribute name="Next Replicated Component ID" value="1980" />
-	<attribute name="Next Local Node ID" value="16778503" />
-	<attribute name="Next Local Component ID" value="16777222" />
+	<attribute name="Next Replicated Node ID" value="366" />
+	<attribute name="Next Replicated Component ID" value="1981" />
+	<attribute name="Next Local Node ID" value="16778510" />
+	<attribute name="Next Local Component ID" value="16777228" />
 	<attribute name="Variables" />
 	<attribute name="Variables" />
 	<attribute name="Variable Names" value="" />
 	<attribute name="Variable Names" value="" />
 	<component type="PhysicsWorld" id="1" />
 	<component type="PhysicsWorld" id="1" />

+ 0 - 5
CharacterAnimation2D/Resources/Skin.asset

@@ -1,5 +0,0 @@
-{
-	"version": 1,
-	"guid": "899ba421d6d37345ba96f1045f8dd653",
-	"FolderImporter": {}
-}

+ 0 - 14
CharacterAnimation2D/Resources/Skin/skin.ui.txt

@@ -1,14 +0,0 @@
-elements
-	Spaceship
-		bitmap spaceship.png
-		pref-width 32
-		pref-height 32
-	SpaceGameContainer
-		type StretchBox
-		bitmap window.png
-		cut 16
-		expand 12
-		padding 8
-	SpaceText
-		text-color #00FF00
-

BIN
CharacterAnimation2D/Resources/Skin/spaceship.png


+ 0 - 5
CharacterAnimation2D/Resources/Skin/spaceship.png.asset

@@ -1,5 +0,0 @@
-{
-	"version": 1,
-	"guid": "fa084793c8f7c85ea355b64a531c7622",
-	"TextureImporter": {}
-}

BIN
CharacterAnimation2D/Resources/Skin/window.png


+ 0 - 5
CharacterAnimation2D/Resources/Skin/window.png.asset

@@ -1,5 +0,0 @@
-{
-	"version": 1,
-	"guid": "e2b0aed0e278aaa85124b142801c510a",
-	"TextureImporter": {}
-}

+ 1 - 4
CharacterAnimation3D/Resources/Components/UI.js

@@ -24,9 +24,6 @@ function createButton(self, text, event, layout) {
 
 
 exports.component = function(self) {
 exports.component = function(self) {
 
 
-    // TODO: fixme
-    Atomic.UI.__init();
-
     // root view
     // root view
     self.uiView = new Atomic.UIView();
     self.uiView = new Atomic.UIView();
 
 
@@ -44,4 +41,4 @@ exports.component = function(self) {
     createButton(self, "Play Run", "PlayRun", layout);
     createButton(self, "Play Run", "PlayRun", layout);
     createButton(self, "Play Attack", "PlayAttack", layout);
     createButton(self, "Play Attack", "PlayAttack", layout);
 
 
-}
+}

+ 0 - 5
CharacterAnimation3D/Resources/Skin.asset

@@ -1,5 +0,0 @@
-{
-	"version": 1,
-	"guid": "6bd83f9fd213e1f8761b81d7e81788b1",
-	"FolderImporter": {}
-}

+ 0 - 14
CharacterAnimation3D/Resources/Skin/skin.ui.txt

@@ -1,14 +0,0 @@
-elements
-	Spaceship
-		bitmap spaceship.png
-		pref-width 32
-		pref-height 32
-	SpaceGameContainer
-		type StretchBox
-		bitmap window.png
-		cut 16
-		expand 12
-		padding 8
-	SpaceText
-		text-color #00FF00
-

BIN
CharacterAnimation3D/Resources/Skin/spaceship.png


+ 0 - 5
CharacterAnimation3D/Resources/Skin/spaceship.png.asset

@@ -1,5 +0,0 @@
-{
-	"version": 1,
-	"guid": "fa084793c8f7c85ea355b64a531c7622",
-	"TextureImporter": {}
-}

BIN
CharacterAnimation3D/Resources/Skin/window.png


+ 0 - 5
CharacterAnimation3D/Resources/Skin/window.png.asset

@@ -1,5 +0,0 @@
-{
-	"version": 1,
-	"guid": "e2b0aed0e278aaa85124b142801c510a",
-	"TextureImporter": {}
-}