BearishSun 9 лет назад
Родитель
Сommit
f6815db6e9

+ 3 - 2
Source/BansheeEditor/Include/BsBuiltinEditorResources.h

@@ -18,7 +18,7 @@ namespace BansheeEngine
 	enum class ProjectIcon
 	{
 		Folder, Mesh, Font, Texture, PlainText, ScriptCode, SpriteTexture, Shader, ShaderInclude, Material, Prefab, GUISkin,
-		PhysicsMaterial, PhysicsMesh
+		PhysicsMaterial, PhysicsMesh, AudioClip, AnimationClip
 	};
 
 	/**	Types of icons that may be displayed on the tool bar. */
@@ -253,7 +253,8 @@ namespace BansheeEngine
 		static const WString GUISkinIconTex;
 		static const WString PhysicsMaterialIconTex;
 		static const WString PhysicsMeshIconTex;
-
+		static const WString AudioClipIconTex;
+		static const WString AnimationClipIconTex;
 
 		static const WString WindowBackgroundTex;
 

+ 9 - 1
Source/BansheeEditor/Source/BsBuiltinEditorResources.cpp

@@ -82,6 +82,8 @@ namespace BansheeEngine
 	const WString BuiltinEditorResources::GUISkinIconTex = L"GUISkinIcon.psd";
 	const WString BuiltinEditorResources::PhysicsMaterialIconTex = L"PhysicsMaterialIcon.psd";
 	const WString BuiltinEditorResources::PhysicsMeshIconTex = L"PhysicsMeshIcon.psd";
+	const WString BuiltinEditorResources::AudioClipIconTex = L"AudioClipIcon.psd";
+	const WString BuiltinEditorResources::AnimationClipIconTex = L"AnimationClipIcon.psd";
 
 	const WString BuiltinEditorResources::ButtonNormalTex = L"ButtonNormal.png";
 	const WString BuiltinEditorResources::ButtonHoverTex = L"ButtonHover.png";
@@ -415,7 +417,7 @@ namespace BansheeEngine
 
 		WString iconsToProcess[] = { FolderIconTex, FontIconTex, MeshIconTex, TextureIconTex, PlainTextIconTex, 
 			ScriptCodeIconTex, ShaderIconTex, ShaderIncludeIconTex, MaterialIconTex, SpriteTextureIconTex, PrefabIconTex,
-			GUISkinIconTex, PhysicsMaterialIconTex, PhysicsMeshIconTex };
+			GUISkinIconTex, PhysicsMaterialIconTex, PhysicsMeshIconTex, AudioClipIconTex, AnimationClipIconTex };
 
 		SPtr<PixelData> srcData[sizeof(iconsToProcess)/sizeof(iconsToProcess[0])];
 
@@ -2107,6 +2109,12 @@ namespace BansheeEngine
 		case ProjectIcon::PhysicsMesh:
 			iconName = PhysicsMeshIconTex;
 			break;
+		case ProjectIcon::AudioClip:
+			iconName = AudioClipIconTex;
+			break;
+		case ProjectIcon::AnimationClip:
+			iconName = AnimationClipIconTex;
+			break;
 		}
 
 		if (iconName.empty())

+ 2 - 2
Source/MBansheeEditor/Utility/EditorBuiltin.cs

@@ -49,8 +49,8 @@ namespace BansheeEditor
     public enum LibraryItemIcon // Note: Must match C++ enum ProjectIcon
 	{
 		Folder, Mesh, Font, Texture, PlainText, ScriptCode, SpriteTexture, Shader, ShaderInclude, Material, Prefab, GUISkin,
-        PhysicsMaterial, PhysicsMesh
-	};
+        PhysicsMaterial, PhysicsMesh, AudioClip, AnimationClip
+    };
 
     /// <summary>
     /// Types of icons that can be used for displaying types of log messages.

+ 2 - 0
Source/MBansheeEditor/Windows/Library/LibraryGUIEntry.cs

@@ -484,6 +484,8 @@ namespace BansheeEditor
                         return EditorBuiltin.GetLibraryItemIcon(LibraryItemIcon.PhysicsMaterial, size);
                     case ResourceType.PhysicsMesh:
                         return EditorBuiltin.GetLibraryItemIcon(LibraryItemIcon.PhysicsMesh, size);
+                    case ResourceType.AudioClip:
+                        return EditorBuiltin.GetLibraryItemIcon(LibraryItemIcon.AudioClip, size);
                 }
             }
 

+ 1 - 1
Source/MBansheeEditor/Windows/Library/ProjectLibrary.cs

@@ -453,7 +453,7 @@ namespace BansheeEditor
     public enum ResourceType // Note: Must match the C++ enum ScriptResourceType
     {
         Texture, SpriteTexture, Mesh, Font, Shader, ShaderInclude, Material, Prefab, PlainText, 
-        ScriptCode, StringTable, GUISkin, PhysicsMaterial, PhysicsMesh, Undefined
+        ScriptCode, StringTable, GUISkin, PhysicsMaterial, PhysicsMesh, AudioClip, Undefined
     }
 
     /// <summary>