فهرست منبع

[csharp] Add audioPath to EventData and SkeletonData

pharan 7 سال پیش
والد
کامیت
83778a76c1
4فایلهای تغییر یافته به همراه16 افزوده شده و 3 حذف شده
  1. 2 1
      spine-csharp/src/EventData.cs
  2. 6 1
      spine-csharp/src/SkeletonBinary.cs
  3. 6 1
      spine-csharp/src/SkeletonData.cs
  4. 2 0
      spine-csharp/src/SkeletonJson.cs

+ 2 - 1
spine-csharp/src/EventData.cs

@@ -39,7 +39,8 @@ namespace Spine {
 		public string Name { get { return name; } }
 		public string Name { get { return name; } }
 		public int Int { get; set; }
 		public int Int { get; set; }
 		public float Float { get; set; }
 		public float Float { get; set; }
-		public string String { get; set; }
+		public string @String { get; set; }
+		public string AudioPath { get; set; }
 
 
 		public EventData (string name) {
 		public EventData (string name) {
 			if (name == null) throw new ArgumentNullException("name", "name cannot be null.");
 			if (name == null) throw new ArgumentNullException("name", "name cannot be null.");

+ 6 - 1
spine-csharp/src/SkeletonBinary.cs

@@ -151,8 +151,12 @@ namespace Spine {
 
 
 			if (nonessential) {
 			if (nonessential) {
 				skeletonData.fps = ReadFloat(input);
 				skeletonData.fps = ReadFloat(input);
+
 				skeletonData.imagesPath = ReadString(input);
 				skeletonData.imagesPath = ReadString(input);
-				if (skeletonData.imagesPath.Length == 0) skeletonData.imagesPath = null;
+				if (string.IsNullOrEmpty(skeletonData.imagesPath)) skeletonData.imagesPath = null;
+
+				skeletonData.audioPath = ReadString(input);
+				if (string.IsNullOrEmpty(skeletonData.audioPath)) skeletonData.audioPath = null;
 			}
 			}
 
 
 			// Bones.
 			// Bones.
@@ -280,6 +284,7 @@ namespace Spine {
 				data.Int = ReadVarint(input, false);
 				data.Int = ReadVarint(input, false);
 				data.Float = ReadFloat(input);
 				data.Float = ReadFloat(input);
 				data.String = ReadString(input);
 				data.String = ReadString(input);
+				data.AudioPath = ReadString(input);
 				skeletonData.events.Add(data);
 				skeletonData.events.Add(data);
 			}
 			}
 
 

+ 6 - 1
spine-csharp/src/SkeletonData.cs

@@ -49,7 +49,7 @@ namespace Spine {
 
 
 		// Nonessential.
 		// Nonessential.
 		internal float fps;
 		internal float fps;
-		internal string imagesPath;
+		internal string imagesPath, audioPath;
 
 
 		public string Name { get { return name; } set { name = value; } }
 		public string Name { get { return name; } set { name = value; } }
 
 
@@ -79,7 +79,12 @@ namespace Spine {
 		/// <summary>The Spine version used to export this data, or null.</summary>
 		/// <summary>The Spine version used to export this data, or null.</summary>
 		public string Version { get { return version; } set { version = value; } }
 		public string Version { get { return version; } set { version = value; } }
 		public string Hash { get { return hash; } set { hash = value; } }
 		public string Hash { get { return hash; } set { hash = value; } }
+
+		/// <summary>The path to the images directory as defined in Spine. Available only when nonessential data was exported. May be null</summary>
 		public string ImagesPath { get { return imagesPath; } set { imagesPath = value; } }
 		public string ImagesPath { get { return imagesPath; } set { imagesPath = value; } }
+		
+		/// <summary>The path to the audio directory defined in Spine. Available only when nonessential data was exported. May be null.</summary>
+		public string AudioPath { get { return audioPath; } set { audioPath = value; } }
 
 
 		/// <summary>
 		/// <summary>
 		/// The dopesheet FPS in Spine. Available only when nonessential data was exported.</summary>
 		/// The dopesheet FPS in Spine. Available only when nonessential data was exported.</summary>

+ 2 - 0
spine-csharp/src/SkeletonJson.cs

@@ -104,6 +104,7 @@ namespace Spine {
 				skeletonData.height = GetFloat(skeletonMap, "height", 0);
 				skeletonData.height = GetFloat(skeletonMap, "height", 0);
 				skeletonData.fps = GetFloat(skeletonMap, "fps", 0);
 				skeletonData.fps = GetFloat(skeletonMap, "fps", 0);
 				skeletonData.imagesPath = GetString(skeletonMap, "images", null);
 				skeletonData.imagesPath = GetString(skeletonMap, "images", null);
+				skeletonData.audioPath = GetString(skeletonMap, "audio", null);
 			}
 			}
 
 
 			// Bones.
 			// Bones.
@@ -293,6 +294,7 @@ namespace Spine {
 					data.Int = GetInt(entryMap, "int", 0);
 					data.Int = GetInt(entryMap, "int", 0);
 					data.Float = GetFloat(entryMap, "float", 0);
 					data.Float = GetFloat(entryMap, "float", 0);
 					data.String = GetString(entryMap, "string", string.Empty);
 					data.String = GetString(entryMap, "string", string.Empty);
+					data.AudioPath = GetString(entryMap, "audio", string.Empty);
 					skeletonData.events.Add(data);
 					skeletonData.events.Add(data);
 				}
 				}
 			}
 			}