|
|
@@ -1,8 +1,23 @@
|
|
|
//
|
|
|
-// Copyright (c) 2014-2015, THUNDERBEAST GAMES LLC All rights reserved
|
|
|
-// LICENSE: Atomic Game Engine Editor and Tools EULA
|
|
|
-// Please see LICENSE_ATOMIC_EDITOR_AND_TOOLS.md in repository root for
|
|
|
-// license information: https://github.com/AtomicGameEngine/AtomicGameEngine
|
|
|
+// Copyright (c) 2014-2016 THUNDERBEAST GAMES LLC
|
|
|
+//
|
|
|
+// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
+// of this software and associated documentation files (the "Software"), to deal
|
|
|
+// in the Software without restriction, including without limitation the rights
|
|
|
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
+// copies of the Software, and to permit persons to whom the Software is
|
|
|
+// furnished to do so, subject to the following conditions:
|
|
|
+//
|
|
|
+// The above copyright notice and this permission notice shall be included in
|
|
|
+// all copies or substantial portions of the Software.
|
|
|
+//
|
|
|
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
+// THE SOFTWARE.
|
|
|
//
|
|
|
|
|
|
import ScriptWidget = require("ui/ScriptWidget");
|
|
|
@@ -76,7 +91,7 @@ class MaterialInspector extends ScriptWidget {
|
|
|
|
|
|
currentTexture: Atomic.UITextureWidget = null;
|
|
|
tunit: number;
|
|
|
- textureWidget: Atomic.UITextureWidget
|
|
|
+ textureWidget: Atomic.UITextureWidget
|
|
|
|
|
|
constructor() {
|
|
|
|
|
|
@@ -246,7 +261,7 @@ class MaterialInspector extends ScriptWidget {
|
|
|
openTextureSelectionBox(textureUnit: number, textureWidget: Atomic.UITextureWidget) {
|
|
|
|
|
|
var inspector = this;
|
|
|
-
|
|
|
+
|
|
|
EditorUI.getModelOps().showResourceSelection("Select Texture", "TextureImporter", "Texture2D", function (asset: ToolCore.Asset, args: any) {
|
|
|
|
|
|
var texture = <Atomic.Texture2D>Atomic.cache.getResource("Texture2D", asset.path);
|
|
|
@@ -259,12 +274,12 @@ class MaterialInspector extends ScriptWidget {
|
|
|
}
|
|
|
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// Big Texture Button(referenced texture file path in project frame)
|
|
|
createTextureButtonCallback(textureUnit:number, textureWidget:Atomic.UITextureWidget) {
|
|
|
-
|
|
|
+
|
|
|
return () => {
|
|
|
|
|
|
var texture = this.material.getTexture(textureUnit);
|