Selaa lähdekoodia

Update MultiScript and TestInspectorFields examples

Josh Engebretson 10 vuotta sitten
vanhempi
sitoutus
8968f2e872

+ 0 - 1
MultiScript/Resources/Components.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "7f36439132474379a380efcdaa72fce1",
 	"guid": "7f36439132474379a380efcdaa72fce1",
-	"timestamp": 1436890665,
 	"FolderImporter": {}
 	"FolderImporter": {}
 }
 }

+ 1 - 0
MultiScript/Resources/Components/CoffeeSpinner.coffee

@@ -1,5 +1,6 @@
 
 
 # CoffeeScript component
 # CoffeeScript component
+'atomic component'
 
 
 inspectorFields = {
 inspectorFields = {
   speed: 1.0
   speed: 1.0

+ 2 - 0
MultiScript/Resources/Components/InstantiatedSpinner.js

@@ -1,6 +1,8 @@
 
 
 // Script instantianted "child" component
 // Script instantianted "child" component
 
 
+'atomic component';
+
 var inspectorFields = {
 var inspectorFields = {
   speed: 1.0
   speed: 1.0
 }
 }

+ 1 - 2
MultiScript/Resources/Components/InstantiatedSpinner.js.asset

@@ -1,8 +1,7 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "321f35ca69ac311f4b42aaa41a9e6438",
 	"guid": "321f35ca69ac311f4b42aaa41a9e6438",
-	"timestamp": 1436890665,
 	"JavascriptImporter": {
 	"JavascriptImporter": {
-		"IsComponentFile": false
+		"IsComponentFile": true
 	}
 	}
 }
 }

+ 2 - 0
MultiScript/Resources/Components/ProtoSpinner.js

@@ -1,6 +1,8 @@
 
 
 // JavaScript prototype inheritance Component
 // JavaScript prototype inheritance Component
 
 
+'atomic component';
+
 var inspectorFields = {
 var inspectorFields = {
   speed: 1.0
   speed: 1.0
 }
 }

+ 1 - 2
MultiScript/Resources/Components/ProtoSpinner.js.asset

@@ -1,8 +1,7 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "02fc18c12d8dac7f57d2ad559731d610",
 	"guid": "02fc18c12d8dac7f57d2ad559731d610",
-	"timestamp": 1436890665,
 	"JavascriptImporter": {
 	"JavascriptImporter": {
-		"IsComponentFile": false
+		"IsComponentFile": true
 	}
 	}
 }
 }

+ 2 - 0
MultiScript/Resources/Components/Spinner.js

@@ -1,6 +1,8 @@
 
 
 // Javascript "flat" component
 // Javascript "flat" component
 
 
+'atomic component';
+
 var inspectorFields = {
 var inspectorFields = {
   speed: 1.0
   speed: 1.0
 }
 }

+ 1 - 2
MultiScript/Resources/Components/Spinner.js.asset

@@ -1,8 +1,7 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "06495d0f70cbdebc91113550acbfda49",
 	"guid": "06495d0f70cbdebc91113550acbfda49",
-	"timestamp": 1436890665,
 	"JavascriptImporter": {
 	"JavascriptImporter": {
-		"IsComponentFile": false
+		"IsComponentFile": true
 	}
 	}
 }
 }

+ 2 - 0
MultiScript/Resources/Components/TypeScriptSpinner.ts

@@ -1,6 +1,8 @@
 
 
 // TypeScript inheritance Component
 // TypeScript inheritance Component
 
 
+'atomic component';
+
 /// <reference path="../TypeScript/Atomic.d.ts" />
 /// <reference path="../TypeScript/Atomic.d.ts" />
 
 
 class Spinner extends Atomic.JSComponent {
 class Spinner extends Atomic.JSComponent {

+ 0 - 1
MultiScript/Resources/Models.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "2455f05ca34213df84302fd34086600a",
 	"guid": "2455f05ca34213df84302fd34086600a",
-	"timestamp": 1436890665,
 	"FolderImporter": {}
 	"FolderImporter": {}
 }
 }

+ 0 - 1
MultiScript/Resources/Models/Materials.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "69f33ac142a5ef7d284c274274536526",
 	"guid": "69f33ac142a5ef7d284c274274536526",
-	"timestamp": 1436890665,
 	"FolderImporter": {}
 	"FolderImporter": {}
 }
 }

+ 0 - 1
MultiScript/Resources/Scenes.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "7adf19467409e3c2c70da12ef96c9199",
 	"guid": "7adf19467409e3c2c70da12ef96c9199",
-	"timestamp": 1436890665,
 	"FolderImporter": {}
 	"FolderImporter": {}
 }
 }

+ 2 - 2
MultiScript/Resources/Scenes/TheScene.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="370" />
-	<attribute name="Next Replicated Component ID" value="1987" />
+	<attribute name="Next Replicated Node ID" value="371" />
+	<attribute name="Next Replicated Component ID" value="1988" />
 	<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" />

+ 0 - 1
MultiScript/Resources/Scenes/TheScene.scene.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "c5c4f189efd61b5a9fae1d9a15775ea6",
 	"guid": "c5c4f189efd61b5a9fae1d9a15775ea6",
-	"timestamp": 1436890665,
 	"SceneImporter": {}
 	"SceneImporter": {}
 }
 }

+ 0 - 1
MultiScript/Resources/Scripts.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "2c62ec70d098ab568c5817cc2f6cef24",
 	"guid": "2c62ec70d098ab568c5817cc2f6cef24",
-	"timestamp": 1436890665,
 	"FolderImporter": {}
 	"FolderImporter": {}
 }
 }

+ 0 - 1
MultiScript/Resources/Textures.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "f07fe552ccd956393028c378dff3e49e",
 	"guid": "f07fe552ccd956393028c378dff3e49e",
-	"timestamp": 1436890665,
 	"FolderImporter": {}
 	"FolderImporter": {}
 }
 }

+ 0 - 1
MultiScript/Resources/TypeScript.asset

@@ -1,6 +1,5 @@
 {
 {
 	"version": 1,
 	"version": 1,
 	"guid": "56d0da4db9c66a839746e0e2300cbdd5",
 	"guid": "56d0da4db9c66a839746e0e2300cbdd5",
-	"timestamp": 1436890665,
 	"FolderImporter": {}
 	"FolderImporter": {}
 }
 }

+ 2 - 2
TestInspectorFields/Resources/Components/Star.js

@@ -4,14 +4,14 @@ var inspectorFields = {
   booleanField: true,
   booleanField: true,
   numberField: 1.0,
   numberField: 1.0,
   stringField: "Hello",
   stringField: "Hello",
+  intEnumField: [Atomic.VAR_INT, ["Peaceful", "Friendly", "Aggressive"], 0],
   varField: [Atomic.VAR_INT, 42],
   varField: [Atomic.VAR_INT, 42],
   vector2Field: [Atomic.VAR_VECTOR2, [1, 2]],
   vector2Field: [Atomic.VAR_VECTOR2, [1, 2]],
   vector3Field: [Atomic.VAR_VECTOR3, [1, 2, 3]],
   vector3Field: [Atomic.VAR_VECTOR3, [1, 2, 3]],
   quaternionField: [Atomic.VAR_QUATERNION, [1, 0, 0, 0]],
   quaternionField: [Atomic.VAR_QUATERNION, [1, 0, 0, 0]],
   colorField: [Atomic.VAR_COLOR, [1, 2, 3, 4]],
   colorField: [Atomic.VAR_COLOR, [1, 2, 3, 4]],
   texture2DNoDefault: ["Texture2D"],
   texture2DNoDefault: ["Texture2D"],
-  sprite2D: ["Sprite2D", "Sprites/star.png"],
-  intEnumField: [Atomic.VAR_INT, { 0: "Peaceful", 1: "Friendly", 2: "Aggressive"}, 0]
+  sprite2D: ["Sprite2D", "Sprites/star.png"]
 }
 }
 
 
 module.exports = function(self) {
 module.exports = function(self) {

+ 5 - 2
TestInspectorFields/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="364" />
-	<attribute name="Next Replicated Component ID" value="1978" />
+	<attribute name="Next Replicated Node ID" value="366" />
+	<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" />
@@ -39,6 +39,9 @@
 			<attribute name="Sprite" value="Sprite2D;Sprites/star.png" />
 			<attribute name="Sprite" value="Sprite2D;Sprites/star.png" />
 		</component>
 		</component>
 		<component type="JSComponent" id="1977">
 		<component type="JSComponent" id="1977">
+			<attribute name="FieldValues">
+				<variant hash="3593466666" type="Float" value="1" />
+			</attribute>
 			<attribute name="ComponentFile" value="JSComponentFile;Components/Star.js" />
 			<attribute name="ComponentFile" value="JSComponentFile;Components/Star.js" />
 		</component>
 		</component>
 	</node>
 	</node>