Lava demo

Display category introduced
CadetEditor · Apr 15, 2013 · 303b4d3 · 303b4d3
1 parent 094d60e
commit 303b4d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/cadetEditor_Ext_2DS/src/CadetEditor_Ext_2DS.as b/cadetEditor_Ext_2DS/src/CadetEditor_Ext_2DS.as
@@ -18,11 +18,14 @@ package
 
 	import cadet2D.components.behaviours.MouseFollowBehaviour;
 	import cadet2D.components.core.Entity;
+	import cadet2D.components.materials.StandardMaterialComponent;
 	import cadet2D.components.particles.PDParticleSystemComponent;
 	import cadet2D.components.processes.InputProcess2D;
 	import cadet2D.components.processes.TrackCamera2DProcess;
 	import cadet2D.components.processes.WorldBounds2D;
 	import cadet2D.components.renderers.Renderer2D;
+	import cadet2D.components.shaders.fragment.TextureFragmentShaderComponent;
+	import cadet2D.components.shaders.vertex.AnimateUVVertexShaderComponent;
 	import cadet2D.components.skins.ImageSkin;
 	import cadet2D.components.skins.MovieClipSkin;
 	import cadet2D.components.textures.TextureAtlasComponent;
@@ -42,7 +45,7 @@ package
 			resourceManager.addResource( new ComponentFactory( Entity, "Entity" ) );
 
 			// Processes
-			resourceManager.addResource( new ComponentFactory( InputProcess2D,				 "Input Process", 				"Processes", 	CadetEngineIcons.Process, 		ICadetScene, 	1 ) );
+			resourceManager.addResource( new ComponentFactory( InputProcess2D,				"Input Process", 				"Processes", 	CadetEngineIcons.Process, 		ICadetScene, 	1 ) );
 			resourceManager.addResource( new ComponentFactory( WorldBounds2D, 				"World Bounds 2D", 				"Processes", 	CadetEngineIcons.Process, 		ICadetScene, 	1 ) );
 			resourceManager.addResource( new ComponentFactory( TrackCamera2DProcess, 		"Track Camera", 				"Processes", 	CadetEngineIcons.Process, 		ICadetScene, 	1 ) );
 			resourceManager.addResource( new ComponentFactory( Renderer2D, 					"2D Renderer", 					"Processes", 	CadetEngineIcons.Renderer, 		ICadetScene, 	1 ) );
@@ -52,16 +55,23 @@ package
 			resourceManager.addResource( new ComponentFactory( Transform2D, 				"2D Transform", 				null, 			CadetEngineIcons.Transform, 	null, 			1 ) );
 
 			// Skins
-			resourceManager.addResource( new ComponentFactory( ImageSkin, 					"Image Skin", 					"Skins", 		CadetEngineIcons.Skin ) );
-			resourceManager.addResource( new ComponentFactory( MovieClipSkin, 				"MovieClip Skin", 				"Skins", 		CadetEngineIcons.Skin ) );			
+			resourceManager.addResource( new ComponentFactory( ImageSkin, 					"Image Skin", 					"Display", 		CadetEngineIcons.Skin ) );
+			resourceManager.addResource( new ComponentFactory( MovieClipSkin, 				"MovieClip Skin", 				"Display", 		CadetEngineIcons.Skin ) );			
 
 			// Textures
-			resourceManager.addResource( new ComponentFactory( TextureComponent,			"Texture",						"Textures",		CadetEngineIcons.Texture ) );
-			resourceManager.addResource( new ComponentFactory( TextureAtlasComponent,		"TextureAtlas",					"Textures",		CadetEngineIcons.Texture) );
+			resourceManager.addResource( new ComponentFactory( TextureComponent,			"Texture",						"Display",		CadetEngineIcons.Texture ) );
+			resourceManager.addResource( new ComponentFactory( TextureAtlasComponent,		"TextureAtlas",					"Display",		CadetEngineIcons.Texture) );
 
 			// Behaviours - Core
 			resourceManager.addResource( new ComponentFactory( MouseFollowBehaviour,		"Mouse Follow",					"Behaviours",	CadetEngineIcons.Behaviour, Entity,		1 ) );
 
+			// Materials
+			resourceManager.addResource( new ComponentFactory( StandardMaterialComponent,	"StandardMaterialComponent",	"Display",	CadetEngineIcons.Component ) );
+
+			// Shaders
+			resourceManager.addResource( new ComponentFactory( AnimateUVVertexShaderComponent, "AnimateUVVertexShaderComponent",	"Display",	CadetEngineIcons.Component ) );
+			resourceManager.addResource( new ComponentFactory( TextureFragmentShaderComponent, "TextureFragmentShaderComponent",	"Display", CadetEngineIcons.Component ) );
+
 			/*
 			// Graphics Skins
 //			resourceManager.addResource( new ComponentFactory( ScrollingBackgroundSkin, 	"Scrolling Background Skin", 	"Skins", 		CadetEngineIcons.Skin, 		null, 			1 ) );

diff --git a/cadetEditor_Ext_2DS_Geom/src/CadetEditor_Ext_2DS_Geom.as b/cadetEditor_Ext_2DS_Geom/src/CadetEditor_Ext_2DS_Geom.as
@@ -36,11 +36,11 @@ package
 			resourceManager.addResource( new ComponentFactory( BoundingSphere, 				"Bounding Sphere", 				"Geometry", 	CadetEngineIcons.Geometry, 	null, 		1 ) );
 
 			// Graphics Skins
-			resourceManager.addResource( new ComponentFactory( GeometrySkin, 				"Geometry Skin", 				"Skins", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
+			resourceManager.addResource( new ComponentFactory( GeometrySkin, 				"Geometry Skin", 				"Display", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
 //			resourceManager.addResource( new ComponentFactory( GeometryDebugSkin, 			"Geometry Debug Skin", 			"Skins", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
 //			resourceManager.addResource( new ComponentFactory( FractalPolygonSkin, 			"Fractal Polygon Skin", 		"Skins", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
-			resourceManager.addResource( new ComponentFactory( ConnectionSkin, 				"Connection Skin", 				"Skins", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
-			resourceManager.addResource( new ComponentFactory( SpringSkin, 					"Spring Skin", 					"Skins", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
+			resourceManager.addResource( new ComponentFactory( ConnectionSkin, 				"Connection Skin", 				"Display", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
+			resourceManager.addResource( new ComponentFactory( SpringSkin, 					"Spring Skin", 					"Display", 		CadetEngineIcons.Skin, 		Entity, 		1 ) );
 
 		}
 	}