Browse Source

Support Skybox and DDS textures

Josh Engebretson 10 years ago
parent
commit
5a4c2fadc9

+ 1 - 1
Script/AtomicEditor/ui/inspector/ComponentInspector.ts

@@ -121,7 +121,7 @@ class ComponentInspector extends Atomic.UISection {
             this.addJSComponentUI(attrsVerticalLayout);
         }
 
-        if (component.typeName == "StaticModel" || component.typeName == "AnimatedModel") {
+        if (component.typeName == "StaticModel" || component.typeName == "AnimatedModel" || component.typeName == "Skybox") {
             this.addModelUI(attrsVerticalLayout, component.typeName);
         }
 

+ 1 - 1
Script/AtomicEditor/ui/inspector/CreateComponentButton.ts

@@ -15,7 +15,7 @@ geometryCreateSource.addItem(new Atomic.UIMenuItem("AnimatedModel", "create comp
 geometryCreateSource.addItem(new Atomic.UIMenuItem("BillboardSet", "create component"));
 geometryCreateSource.addItem(new Atomic.UIMenuItem("CustomGeometry", "create component"));
 geometryCreateSource.addItem(new Atomic.UIMenuItem("ParticleEmitter", "create component"));
-geometryCreateSource.addItem(new Atomic.UIMenuItem("Skybox", "create component"));
+geometryCreateSource.addItem(new Atomic.UIMenuItem("Skybox", "SkyBox"));
 geometryCreateSource.addItem(new Atomic.UIMenuItem("StaticModelGroup", "create component"));
 geometryCreateSource.addItem(new Atomic.UIMenuItem("Terrain", "create component"));
 geometryCreateSource.addItem(new Atomic.UIMenuItem("Text3D", "create component"));

+ 1 - 0
Source/ToolCore/Assets/Asset.cpp

@@ -204,6 +204,7 @@ bool Asset::CreateImporter()
         textureFormats.Push(".jpg");
         textureFormats.Push(".png");
         textureFormats.Push(".tga");
+        textureFormats.Push(".dds");
 
         // todo, externalize recognizers
         if (ext == ".fbx" || ext == ".blend" || ext == ".dae")