AssetManager

In addition to images and animations, you can now inspect fonts, particles and audio assets.

editor/AssetAdmin/AssetAdmin.cs

@@ -26,9 +26,11 @@ function AssetAdmin::create(%this)
 	exec("./AssetWindow.cs");
 	exec("./AssetDictionaryButton.cs");
 	exec("./AssetInspector.cs");
+	exec("./AssetAudioPlayButton.cs");
 
 	%this.guiPage = EditorCore.RegisterEditor("Asset Manager", %this);
 	%this.guiPage.add(%this.buildAssetWindow());
+	%this.guiPage.add(%this.buildAudioPlayButton());
 	%this.guiPage.add(%this.buildLibrary());
 	%this.guiPage.add(%this.buildInspector());
 
@@ -70,6 +72,10 @@ function AssetAdmin::buildLibrary(%this)
 
 	%this.dictionaryList.add(%this.buildDictionary("Images", "ImageAsset"));
 	%this.dictionaryList.add(%this.buildDictionary("Animations", "AnimationAsset"));
+	%this.dictionaryList.add(%this.buildDictionary("Particle Effects", "ParticleAsset"));
+	%this.dictionaryList.add(%this.buildDictionary("Fonts", "FontAsset"));
+	%this.dictionaryList.add(%this.buildDictionary("Audio", "AudioAsset"));
+	//%this.dictionaryList.add(%this.buildDictionary("Spines", "SpineAsset"));
 
 	return %this.libScroller;
 }
@@ -134,6 +140,32 @@ function AssetAdmin::buildAssetWindow(%this)
 	return %this.assetWindow;
 }
 
+function AssetAdmin::buildAudioPlayButton(%this)
+{
+	%container = new GuiControl()
+	{
+		position = "0 0";
+		extent = "700 444";
+		HorizSizing="width";
+		VertSizing="height";
+	};
+	ThemeManager.setProfile(%container, "emptyProfile");
+
+	%this.audioPlayButton = new GuiButtonCtrl()
+	{
+		class="AssetAudioPlayButton";
+		HorizSizing="center";
+		VertSizing="center";
+		Extent="100 48";
+		Visible="0";
+		Text = "Play";
+	};
+	ThemeManager.setProfile(%this.audioPlayButton, "buttonProfile");
+	%container.add(%this.audioPlayButton);
+
+	return %container;
+}
+
 function AssetAdmin::destroy(%this)
 {
 
@@ -143,6 +175,10 @@ function AssetAdmin::open(%this)
 {
 	%this.Dictionary["ImageAsset"].load();
 	%this.Dictionary["AnimationAsset"].load();
+	%this.Dictionary["ParticleAsset"].load();
+	%this.Dictionary["FontAsset"].load();
+	%this.Dictionary["AudioAsset"].load();
+	//%this.Dictionary["SpineAsset"].load();
 
 	%this.assetScene.setScenePause(false);
 	%this.isOpen = true;
@@ -152,6 +188,10 @@ function AssetAdmin::close(%this)
 {
 	%this.Dictionary["ImageAsset"].unload();
 	%this.Dictionary["AnimationAsset"].unload();
+	%this.Dictionary["ParticleAsset"].unload();
+	%this.Dictionary["FontAsset"].unload();
+	%this.Dictionary["AudioAsset"].unload();
+	//%this.Dictionary["SpineAsset"].unload();
 
 	%this.assetScene.setScenePause(true);
 	%this.isOpen = false;

editor/AssetAdmin/AssetAudioPlayButton.cs

@@ -0,0 +1,40 @@
+
+function AssetAudioPlayButton::onClick(%this)
+{
+	if(alxIsPlaying(%this.sound))
+	{
+		%this.resetSound();
+	}
+	else
+	{
+		%this.sound = alxPlay(%this.assetID);
+		%this.setText("Stop");
+
+		if(!%this.asset.Looping)
+		{
+			%this.soundSchedule = %this.schedule(100, "testSound");
+		}
+	}
+}
+
+function AssetAudioPlayButton::testSound(%this)
+{
+	if(alxIsPlaying(%this.sound))
+	{
+		%this.soundSchedule = %this.schedule(100, "testSound");
+	}
+	else
+	{
+		%this.setText("Play");
+	}
+}
+
+function AssetAudioPlayButton::resetSound(%this)
+{
+	if(alxIsPlaying(%this.sound))
+	{
+		alxStop(%this.sound);
+		%this.setText("Play");
+		cancel(%this.soundSchedule);
+	}
+}

editor/AssetAdmin/AssetDictionary.cs

@@ -54,6 +54,7 @@ function AssetDictionary::load(%this)
 				Class = AssetDictionaryButton;
 				HorizSizing="center";
 				VertSizing="center";
+				Extent = "100 100";
 				Tooltip = AssetDatabase.getAssetName(%assetID);
 				Text = "";
 				AssetID = %assetID;

editor/AssetAdmin/AssetDictionaryButton.cs

@@ -30,8 +30,7 @@ function AssetDictionaryButton::loadImageAsset(%this, %assetID)
 {
 	%imageAsset = AssetDatabase.acquireAsset(%assetID);
 
-	%extent = %this.getIconExtent(%imageAsset.getFrameSize(0));
-	%texture = %this.buildIcon(%extent);
+	%texture = %this.buildIcon();
 	%texture.setImage(%assetID);
 
 	%this.ImageAsset = %imageAsset;
@@ -46,8 +45,7 @@ function AssetDictionaryButton::loadAnimationAsset(%this, %assetID)
 	%imageAssetID = %animationAsset.getImage();
 	%imageAsset = AssetDatabase.acquireAsset(%imageAssetID);
 
-	%extent = %this.getIconExtent(%imageAsset.getFrameSize(0));
-	%texture = %this.buildIcon(%extent);
+	%texture = %this.buildIcon();
 	%texture.setAnimation(%assetID);
 
 	%this.ImageAsset = %imageAsset;
@@ -58,20 +56,71 @@ function AssetDictionaryButton::loadAnimationAsset(%this, %assetID)
 	%this.add(%texture);
 }
 
-function AssetDictionaryButton::getIconExtent(%this, %size)
+function AssetDictionaryButton::loadParticleAsset(%this, %assetID)
 {
-	return "50 50";
+	%particleAsset = AssetDatabase.acquireAsset(%assetID);
+
+	%texture = %this.buildIcon();
+	%texture.setImage("AssetAdmin:assetIcons");
+	%texture.setImageFrame(0);
+
+	%this.particleAsset = %particleAsset;
+	%this.particleAssetID = %assetID;
+
+	%this.add(%texture);
 }
 
-function AssetDictionaryButton::buildIcon(%this, %extent)
+function AssetDictionaryButton::loadFontAsset(%this, %assetID)
+{
+	%fontAsset = AssetDatabase.acquireAsset(%assetID);
+
+	%texture = %this.buildIcon();
+	%texture.setImage("AssetAdmin:assetIcons");
+	%texture.setImageFrame(1);
+
+	%this.fontAsset = %fontAsset;
+	%this.fontAssetID = %assetID;
+
+	%this.add(%texture);
+}
+
+function AssetDictionaryButton::loadAudioAsset(%this, %assetID)
+{
+	%audioAsset = AssetDatabase.acquireAsset(%assetID);
+
+	%texture = %this.buildIcon();
+	%texture.setImage("AssetAdmin:assetIcons");
+	%texture.setImageFrame(3);
+
+	%this.audioAsset = %audioAsset;
+	%this.audioAssetID = %assetID;
+
+	%this.add(%texture);
+}
+
+function AssetDictionaryButton::loadSpineAsset(%this, %assetID)
+{
+	%spineAsset = AssetDatabase.acquireAsset(%assetID);
+
+	%texture = %this.buildIcon();
+	%texture.setImage("AssetAdmin:assetIcons");
+	%texture.setImageFrame(2);
+
+	%this.spineAsset = %spineAsset;
+	%this.spineAssetID = %assetID;
+
+	%this.add(%texture);
+}
+
+function AssetDictionaryButton::buildIcon(%this)
 {
 	%texture = new GuiSpriteCtrl()
 	{
 		class = "AssetDictionarySprite";
 		HorizSizing="center";
 		VertSizing="center";
-		Extent = %extent;
-		minExtent=%extent;
+		Extent = "50 50";
+		minExtent = "50 50";
 		Position = "0 0";
 		constrainProportions = "1";
 		fullSize = "1";
@@ -82,6 +131,18 @@ function AssetDictionaryButton::buildIcon(%this, %extent)
 
 function AssetDictionaryButton::onClick(%this)
 {
+	if(AssetAdmin.chosenButton != %this)
+	{
+		if(isObject(AssetAdmin.chosenButton))
+		{
+			ThemeManager.setProfile(AssetAdmin.chosenButton, "itemSelectProfile");
+		}
+		ThemeManager.setProfile(%this, "itemSelectedProfile");
+	}
+
+	AssetAdmin.audioPlayButton.setVisible(false);
+	AssetAdmin.AssetWindow.setVisible(true);
+
 	if(isObject(%this.AnimationAsset) && %this.AnimationAssetID !$= "")
 	{
 		AssetAdmin.AssetWindow.displayAnimationAsset(%this.imageAsset, %this.AnimationAsset, %this.AnimationAssetID);
@@ -92,6 +153,26 @@ function AssetDictionaryButton::onClick(%this)
 		AssetAdmin.AssetWindow.displayImageAsset(%this.ImageAsset, %this.ImageAssetID);
 		AssetAdmin.inspector.loadImageAsset(%this.ImageAsset, %this.ImageAssetID);
 	}
+	else if(isObject(%this.ParticleAsset) && %this.ParticleAssetID !$= "")
+	{
+		AssetAdmin.AssetWindow.displayParticleAsset(%this.ParticleAsset, %this.ParticleAssetID);
+		AssetAdmin.inspector.loadParticleAsset(%this.ParticleAsset, %this.ParticleAssetID);
+	}
+	else if(isObject(%this.FontAsset) && %this.FontAssetID !$= "")
+	{
+		AssetAdmin.AssetWindow.displayFontAsset(%this.FontAsset, %this.FontAssetID);
+		AssetAdmin.inspector.loadFontAsset(%this.FontAsset, %this.FontAssetID);
+	}
+	else if(isObject(%this.AudioAsset) && %this.AudioAssetID !$= "")
+	{
+		AssetAdmin.AssetWindow.displayAudioAsset(%this.AudioAsset, %this.AudioAssetID);
+		AssetAdmin.inspector.loadAudioAsset(%this.AudioAsset, %this.AudioAssetID);
+	}
+	else if(isObject(%this.SpineAsset) && %this.SpineAssetID !$= "")
+	{
+		AssetAdmin.AssetWindow.displaySpineAsset(%this.SpineAsset, %this.SpineAssetID);
+		AssetAdmin.inspector.loadSpineAsset(%this.SpineAsset, %this.SpineAssetID);
+	}
 
 	AssetAdmin.chosenButton = %this;
 }

editor/AssetAdmin/AssetInspector.cs

@@ -29,7 +29,7 @@ function AssetInspector::onAdd(%this)
 		Position="0 0";
 		Extent="700 34";
 		MinExtent="350 34";
-		Text = "Image Asset";
+		Text = "";
 	};
 	ThemeManager.setProfile(%this.titlebar, "panelProfile");
 	%this.add(%this.titlebar);
@@ -87,6 +87,7 @@ function AssetInspector::onAdd(%this)
 
 function AssetInspector::loadImageAsset(%this, %imageAsset, %assetID)
 {
+	%this.titlebar.setText("Image Asset");
 	%this.inspector.clearHiddenFields();
 	%this.inspector.addHiddenField("hidden");
 	%this.inspector.addHiddenField("locked");
@@ -96,9 +97,50 @@ function AssetInspector::loadImageAsset(%this, %imageAsset, %assetID)
 
 function AssetInspector::loadAnimationAsset(%this, %animationAsset, %assetID)
 {
+	%this.titlebar.setText("Animation Asset");
 	%this.inspector.clearHiddenFields();
 	%this.inspector.addHiddenField("hidden");
 	%this.inspector.addHiddenField("locked");
 	%this.inspector.addHiddenField("AssetInternal");
 	%this.inspector.inspect(%animationAsset);
 }
+
+function AssetInspector::loadParticleAsset(%this, %particleAsset, %assetID)
+{
+	%this.titlebar.setText("Particle Asset");
+	%this.inspector.clearHiddenFields();
+	%this.inspector.addHiddenField("hidden");
+	%this.inspector.addHiddenField("locked");
+	%this.inspector.addHiddenField("AssetInternal");
+	%this.inspector.inspect(%particleAsset);
+}
+
+function AssetInspector::loadFontAsset(%this, %fontAsset, %assetID)
+{
+	%this.titlebar.setText("Font Asset");
+	%this.inspector.clearHiddenFields();
+	%this.inspector.addHiddenField("hidden");
+	%this.inspector.addHiddenField("locked");
+	%this.inspector.addHiddenField("AssetInternal");
+	%this.inspector.inspect(%fontAsset);
+}
+
+function AssetInspector::loadAudioAsset(%this, %audioAsset, %assetID)
+{
+	%this.titlebar.setText("Audio Asset");
+	%this.inspector.clearHiddenFields();
+	%this.inspector.addHiddenField("hidden");
+	%this.inspector.addHiddenField("locked");
+	%this.inspector.addHiddenField("AssetInternal");
+	%this.inspector.inspect(%audioAsset);
+}
+
+function AssetInspector::loadSpineAsset(%this, %spineAsset, %assetID)
+{
+	%this.titlebar.setText("Spine Asset");
+	%this.inspector.clearHiddenFields();
+	%this.inspector.addHiddenField("hidden");
+	%this.inspector.addHiddenField("locked");
+	%this.inspector.addHiddenField("AssetInternal");
+	%this.inspector.inspect(%spineAsset);
+}

editor/AssetAdmin/AssetWindow.cs

@@ -29,6 +29,7 @@ function AssetWindow::displayImageAsset(%this, %imageAsset, %assetID)
 {
 	AssetAdmin.AssetScene.clear(true);
 
+	%this.setCameraZoom(1);
 	if(!%imageAsset.getExplicitMode() && %imageAsset.getFrameCount() == 1)
 	{
 		%size = %this.getWorldSize(%imageAsset.getFrameSize(0));
@@ -88,6 +89,7 @@ function AssetWindow::displayAnimationAsset(%this, %imageAsset, %animationAsset,
 {
 	AssetAdmin.AssetScene.clear(true);
 
+	%this.setCameraZoom(1);
 	%size = %this.getWorldSize(%imageAsset.getFrameSize(0));
 	new Sprite()
 	{
@@ -101,6 +103,66 @@ function AssetWindow::displayAnimationAsset(%this, %imageAsset, %animationAsset,
 	};
 }
 
+function AssetWindow::displayParticleAsset(%this, %particleAsset, %assetID)
+{
+	AssetAdmin.AssetScene.clear(true);
+
+	%this.setCameraZoom(5);
+	new ParticlePlayer()
+	{
+		Scene = AssetAdmin.AssetScene;
+		Particle = %assetID;
+		size = "10 10";
+		BlandColor = "1 1 1 1";
+		SceneLayer = 1;
+		Position = "0 0";
+		BodyType = static;
+	};
+}
+
+function AssetWindow::displayFontAsset(%this, %fontAsset, %assetID)
+{
+	AssetAdmin.AssetScene.clear(true);
+
+	%this.setCameraZoom(1);
+	%size = %this.getWorldSize("10 10");
+	new TextSprite()
+	{
+		Scene = AssetAdmin.AssetScene;
+		Font = %assetID;
+		fontSize = 4;
+		size = %size;
+		BlandColor = "1 1 1 1";
+		SceneLayer = 1;
+		Position = "0 0";
+		BodyType = static;
+		Text = "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9";
+		OverflowModeY = "Visible";
+		OverflowModeX = "Wrap";
+		TextAlignment = "center";
+		TextVAlignment = "middle";
+	};
+}
+
+function AssetWindow::displayAudioAsset(%this, %audioAsset, %assetID)
+{
+	AssetAdmin.AssetScene.clear(true);
+
+	AssetAdmin.audioPlayButton.setVisible(true);
+	AssetAdmin.AssetWindow.setVisible(false);
+
+	AssetAdmin.audioPlayButton.resetSound();
+	AssetAdmin.audioPlayButton.assetID = %assetID;
+	AssetAdmin.audioPlayButton.asset = %audioAsset;
+	AssetAdmin.audioPlayButton.onClick();
+}
+
+function AssetWindow::displaySpineAsset(%this, %spineAsset, %assetID)
+{
+	AssetAdmin.AssetScene.clear(true);
+	//good luck!
+}
+
 function AssetWindow::getWorldSize(%this, %size)
 {
 	%cameraSize = %this.getCameraSize();

editor/AssetAdmin/images/assetIcons.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    AssetName="assetIcons"
+    ImageFile="assetIcons.png"
+    CellCountX="2"
+    CellCountY="2"
+    CellWidth="64"
+    CellHeight="64"
+	AssetInternal="1" />

editor/AssetAdmin/module.taml

@@ -5,4 +5,9 @@
 	Description="Provides controls to view and edit assets."
 	ScriptFile="AssetAdmin.cs"
 	CreateFunction="create"
-	DestroyFunction="destroy" />
+	DestroyFunction="destroy">
+		<DeclaredAssets
+			Path="images"
+			Extension="asset.taml"
+			Recurse="true"/>
+</ModuleDefinition>

editor/EditorCore/Themes/BaseTheme/BaseTheme.cs

@@ -272,7 +272,7 @@ function BaseTheme::makePanelProfile(%this)
 
 function BaseTheme::makeItemSelectProfile(%this)
 {
-	%buttonBorderV = new GuiBorderProfile()
+	%buttonBorder = new GuiBorderProfile()
 	{
 		padding = %this.borderSize;
 		paddingHL = 0;
@@ -292,30 +292,49 @@ function BaseTheme::makeItemSelectProfile(%this)
 		underfill = false;
 	};
 
-	%buttonBorderH = new GuiBorderProfile()
+	%this.itemSelectProfile = new GuiControlProfile()
 	{
-		padding = %this.borderSize;
+		fillColor = %this.color2;
+		fillColorHL = %this.adjustValue(%this.color2, 10);
+		fillColorSL = %this.color3;
+		fillColorNA = %this.setAlpha(%this.color2, 80);
+
+		fontType = %this.font[2];
+		fontDirectory = %this.fontDirectory;
+		fontSize = %this.fontSize;
+		fontColor = %this.color4;
+		fontColorHL = %this.adjustValue(%this.color4, 10);
+		fontColorSL = %this.color1;
+		fontColorNA = %this.setAlpha(%this.color4, 100);
+		align = Center;
+
+		borderDefault = %buttonBorder;
+	};
+
+	%buttonBorder = new GuiBorderProfile()
+	{
+		padding = 0;
 		paddingHL = 0;
 		paddingSL = 0;
-		paddingNA = %this.borderSize;
+		paddingNA = 0;
 
-		border = 0;
+		border = %this.borderSize;
 		borderHL = %this.borderSize;
 		borderSL = %this.borderSize;
-		borderNA = 0;
+		borderNA = %this.borderSize;
 
-		borderColor = "0 0 0 0";
-		borderColorHL = %this.setAlpha(%this.adjustValue(%this.color2, 10), 170);
-		borderColorSL = %this.setAlpha(%this.adjustValue(%this.color5, 10), 170);
+		borderColor = %this.setAlpha(%this.adjustValue(%this.color5, 10), 170);
+		borderColorHL = %this.setAlpha(%this.adjustValue(%this.color5, 15), 170);
+		borderColorSL = %this.setAlpha(%this.adjustValue(%this.color5, 10), 130);
 		borderColorNA = "0 0 0 0";
 
 		underfill = false;
 	};
 
-	%this.itemSelectProfile = new GuiControlProfile()
+	%this.itemSelectedProfile = new GuiControlProfile()
 	{
-		fillColor = %this.color2;
-		fillColorHL = %this.adjustValue(%this.color2, 10);
+		fillColor = %this.color3;
+		fillColorHL = %this.adjustValue(%this.color3, 10);
 		fillColorSL = %this.color3;
 		fillColorNA = %this.setAlpha(%this.color2, 80);
 
@@ -324,13 +343,11 @@ function BaseTheme::makeItemSelectProfile(%this)
 		fontSize = %this.fontSize;
 		fontColor = %this.color4;
 		fontColorHL = %this.adjustValue(%this.color4, 10);
-		fontColorSL = "0 0 0 255";
+		fontColorSL = %this.color1;
 		fontColorNA = %this.setAlpha(%this.color4, 100);
 		align = Center;
 
-		borderDefault = %buttonBorderV;
-		borderRight = %buttonBorderH;
-		borderLeft = %buttonBorderH;
+		borderDefault = %buttonBorder;
 	};
 }
 

editor/main.cs

@@ -21,6 +21,7 @@
 //-----------------------------------------------------------------------------
 
 new ModuleManager(EditorManager);
+EditorManager.addListener(AssetDatabase);
 
 // Scans for the modules that make up the editors.
 EditorManager.scanModules( "." );

engine/source/gui/guiControl.cc

@@ -1777,7 +1777,7 @@ const char* GuiControl::execAltConsoleCallback()
 
 void GuiControl::setText(const char *text)
 {
-	mText = StringTable->insert(text);
+	mText = StringTable->insert(text, true);
 }
 
 void GuiControl::setTextID(const char *id)