Merge branch 'master' of https://github.com/AtomicGameEngine/AtomicGameEngine into RED-EDITOR-326

Licenses/LICENSE_THIRDPARTY.md

@@ -779,3 +779,250 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
+
+#### Node.js
+
+Copyright Node.js contributors. All rights reserved.
+
+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.
+
+This license applies to parts of Node.js originating from the
+https://github.com/joyent/node repository:
+
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+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.
+
+The Node.js license applies to all parts of Node.js that are not externally
+maintained libraries.
+
+The externally maintained libraries used by Node.js are:
+
+- V8, located at deps/v8. V8's license follows:
+  """
+    This license applies to all parts of V8 that are not externally
+    maintained libraries.  The externally maintained libraries used by V8
+    are:
+
+      - PCRE test suite, located in
+        test/mjsunit/third_party/regexp-pcre.js.  This is based on the
+        test suite from PCRE-7.3, which is copyrighted by the University
+        of Cambridge and Google, Inc.  The copyright notice and license
+        are embedded in regexp-pcre.js.
+
+      - Layout tests, located in test/mjsunit/third_party.  These are
+        based on layout tests from webkit.org which are copyrighted by
+        Apple Computer, Inc. and released under a 3-clause BSD license.
+
+      - Strongtalk assembler, the basis of the files assembler-arm-inl.h,
+        assembler-arm.cc, assembler-arm.h, assembler-ia32-inl.h,
+        assembler-ia32.cc, assembler-ia32.h, assembler-x64-inl.h,
+        assembler-x64.cc, assembler-x64.h, assembler-mips-inl.h,
+        assembler-mips.cc, assembler-mips.h, assembler.cc and assembler.h.
+        This code is copyrighted by Sun Microsystems Inc. and released
+        under a 3-clause BSD license.
+
+      - Valgrind client API header, located at third_party/valgrind/valgrind.h
+        This is release under the BSD license.
+
+    These libraries have their own licenses; we recommend you read them,
+    as their terms may differ from the terms below.
+
+    Copyright 2006-2012, the V8 project authors. All rights reserved.
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials provided
+          with the distribution.
+        * Neither the name of Google Inc. nor the names of its
+          contributors may be used to endorse or promote products derived
+          from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  """
+
+- C-Ares, an asynchronous DNS client, located at deps/cares. C-Ares license
+  follows:
+  """
+    /* Copyright 1998 by the Massachusetts Institute of Technology.
+     *
+     * Permission to use, copy, modify, and distribute this
+     * software and its documentation for any purpose and without
+     * fee is hereby granted, provided that the above copyright
+     * notice appear in all copies and that both that copyright
+     * notice and this permission notice appear in supporting
+     * documentation, and that the name of M.I.T. not be used in
+     * advertising or publicity pertaining to distribution of the
+     * software without specific, written prior permission.
+     * M.I.T. makes no representations about the suitability of
+     * this software for any purpose.  It is provided "as is"
+     * without express or implied warranty.
+  """
+
+- OpenSSL located at deps/openssl. OpenSSL is cryptographic software written
+  by Eric Young ([email protected]) to provide SSL/TLS encryption. OpenSSL's
+  license follows:
+  """
+    /* ====================================================================
+     * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+     *
+     * Redistribution and use in source and binary forms, with or without
+     * modification, are permitted provided that the following conditions
+     * are met:
+     *
+     * 1. Redistributions of source code must retain the above copyright
+     *    notice, this list of conditions and the following disclaimer.
+     *
+     * 2. Redistributions in binary form must reproduce the above copyright
+     *    notice, this list of conditions and the following disclaimer in
+     *    the documentation and/or other materials provided with the
+     *    distribution.
+     *
+     * 3. All advertising materials mentioning features or use of this
+     *    software must display the following acknowledgment:
+     *    "This product includes software developed by the OpenSSL Project
+     *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+     *
+     * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+     *    endorse or promote products derived from this software without
+     *    prior written permission. For written permission, please contact
+     *    [email protected].
+     *
+     * 5. Products derived from this software may not be called "OpenSSL"
+     *    nor may "OpenSSL" appear in their names without prior written
+     *    permission of the OpenSSL Project.
+     *
+     * 6. Redistributions of any form whatsoever must retain the following
+     *    acknowledgment:
+     *    "This product includes software developed by the OpenSSL Project
+     *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+     * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+     * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+     * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+     * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+     * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+     * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+     * OF THE POSSIBILITY OF SUCH DAMAGE.
+     * ====================================================================
+     *
+     * This product includes cryptographic software written by Eric Young
+     * ([email protected]).  This product includes software written by Tim
+     * Hudson ([email protected]).
+     *
+     */
+  """
+
+- HTTP Parser, located at deps/http_parser. HTTP Parser's license follows:
+  """
+    http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
+    Igor Sysoev.
+
+    Additional changes are licensed under the same terms as NGINX and
+    copyright Joyent, Inc. and other Node contributors. All rights reserved.
+
+    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.
+  """
+
+- Zlib at deps/zlib. zlib's license follows:
+  """
+    /* zlib.h -- interface of the 'zlib' general purpose compression library
+      version 1.2.8, April 28th, 2013
+
+      Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+      This software is provided 'as-is', without any express or implied
+      warranty.  In no event will the authors be held liable for any damages
+      arising from the use of this software.
+
+      Permission is granted to anyone to use this software for any purpose,
+      including commercial applications, and to alter it and redistribute it
+      freely, subject to the following restrictions:
+
+      1. The origin of this software must not be misrepresented; you must not
+         claim that you wrote the original software. If you use this software
+         in a product, an acknowledgment in the product documentation would be
+         appreciated but is not required.
+      2. Altered source versions must be plainly marked as such, and must not be
+         misrepresented as being the original software.
+      3. This notice may not be removed or altered from any source distribution.
+
+      Jean-loup Gailly        Mark Adler
+      [email protected]          [email protected]
+    */
+  """
+
+  #### Jake - JavaScript build tool
+
+  Apache License Version 2 (http://www.apache.org/licenses/LICENSE-2.0)
+
+  #### TypeScript Compiler
+
+  Apache License Version 2 (http://www.apache.org/licenses/LICENSE-2.0)

Script/AtomicEditor/editor/Editor.ts

@@ -128,8 +128,9 @@ class Editor extends Atomic.ScriptObject {
         if (system.project) {
 
             system.closeProject();
-
+            this.sendEvent(EditorEvents.ProjectClosed);
         }
+
     }
 
     handleProjectUnloaded(event) {

Script/AtomicEditor/editor/EditorEvents.ts

@@ -47,6 +47,7 @@ export interface ContentFolderChangedEvent {
 }
 
 export const CloseProject = "EditorCloseProject";
+export const ProjectClosed = "EditorProjectClosed";
 
 export const LoadProject = "EditorLoadProject";
 export interface LoadProjectEvent {

Script/AtomicEditor/ui/frames/inspector/AttributeInfoEdit.ts

@@ -718,6 +718,7 @@ class ResourceRefAttributeEdit extends AttributeInfoEdit {
 
         var lp = new Atomic.UILayoutParams();
         lp.width = 140;
+        lp.height = 24;
         o.editField.layoutParams = lp;
         o.editField.readOnly = true;
 
@@ -828,6 +829,7 @@ class ResourceRefListAttributeEdit extends AttributeInfoEdit {
 
         var lp = new Atomic.UILayoutParams();
         lp.width = 304;
+        lp.height = 24;
         layout.layoutParams = lp;
 
         var name = this.attrInfo.name + " Size";

Script/AtomicEditor/ui/frames/inspector/ComponentAttributeUI.ts

@@ -131,10 +131,11 @@ class SubmeshAttributeEdit extends AttributeInfoEdit {
 
     createMaterialEdit(materialIndex: number) {
 
-        var o = InspectorUtils.createAttrEditFieldWithSelectButton("", this.mainLayout);
+        var o = InspectorUtils.createAttrEditFieldWithSelectButton("Material", this.mainLayout);
 
         var lp = new Atomic.UILayoutParams();
-        lp.width = 250;
+        lp.width = 140;
+        lp.height = 24;
         o.editField.layoutParams = lp;
         o.editField.readOnly = true;
 
@@ -319,20 +320,17 @@ class SubmeshAttributeEdit extends AttributeInfoEdit {
                     var text = "";
 
                     if (resource) {
-                        if (resource instanceof Atomic.Animation) {
 
-                            text = (<Atomic.Animation>resource).animationName;
+                        if (resource instanceof Atomic.Material) {
 
-                        } else {
+                            text = (<Atomic.Material>resource).name;
 
-                            text = resource.name;
-                            var asset = ToolCore.assetDatabase.getAssetByCachePath(resource.name);
-                            if (asset)
-                                text = asset.name;
+                        } else {
+                            text = "???";
                         }
                     }
-                    var pathinfo = Atomic.splitPath(text);
 
+                    var pathinfo = Atomic.splitPath(text);
                     matEdit.editField.text = pathinfo.fileName;
                 }
 
@@ -429,10 +427,10 @@ class SubmeshListAttributeEdit extends AttributeInfoEdit {
                     submeshEdit.initialize(this.editType, this.attrInfo);
                     this.layout.addChild(submeshEdit);
                     this.submeshEdits[name] = submeshEdit;
+                    InspectorUtils.createSeparator(this.layout);
                 }
 
                 this.submeshEdits[name].materialIndexes.push(j);
-
             }
 
         }

Script/AtomicEditor/ui/frames/inspector/InspectorUtils.ts

@@ -62,6 +62,7 @@ class InspectorUtils {
     edit.fontDescription = InspectorUtils.attrFontDesc;
     var lp = new Atomic.UILayoutParams();
     lp.width = 160;
+    lp.height = 24;
     edit.layoutParams = lp;
 
     return edit;

Script/AtomicEditor/ui/frames/menus/MainFrameMenu.ts

@@ -131,22 +131,33 @@ class MainFrameMenu extends Atomic.ScriptObject {
             }
             if (refid == "file open project") {
 
-                if (ToolCore.toolSystem.project) {
+                var utils = new Editor.FileUtils();
+                var path = utils.openProjectFileDialog();
 
-                    EditorUI.showModalError("Project Open",
-                        "Please close the current project before opening new one");
+                if (path=="") {
 
                     return true;
+
                 }
 
-                var utils = new Editor.FileUtils();
-                var path = utils.openProjectFileDialog();
-                if (path) {
+                var openProject = () => this.sendEvent(EditorEvents.LoadProject, { path: path });
 
-                    this.sendEvent(EditorEvents.LoadProject, { path: path });
+                if (ToolCore.toolSystem.project) {
 
-                }
+                    this.subscribeToEvent(EditorEvents.ProjectClosed, () => {
+
+                        this.unsubscribeFromEvent(EditorEvents.ProjectClosed);
+                        openProject();
+
+                    });
+
+                    this.sendEvent(EditorEvents.CloseProject);
 
+                } else {
+
+                    openProject();
+
+                }
 
                 return true;
 

Script/TypeScript/AtomicWork.d.ts

@@ -1,6 +1,7 @@
 /// <reference path="Atomic.d.ts" />
 /// <reference path="ToolCore.d.ts" />
 /// <reference path="Editor.d.ts" />
+/// <reference path="AtomicPlayer.d.ts" />
 
 
 declare module Atomic {
@@ -20,6 +21,7 @@ declare module Atomic {
     export var network: Network;
     export var ui: UI;
     export var audio: Audio;
+    export var player: AtomicPlayer.Player;
 
     export var editorMode: Editor.EditorMode;
 

Source/Atomic/Graphics/Material.cpp

@@ -47,7 +47,7 @@ namespace Atomic
 
 extern const char* wrapModeNames[];
 
-static const char* textureUnitNames[] =
+const char* textureUnitNames[] =
 {
     "diffuse",
     "normal",
@@ -770,6 +770,11 @@ Variant Material::ParseShaderParameterValue(const String& value)
         return ToVectorVariant(valueTrimmed);
 }
 
+const char** Material::GetTextureUnitNames()
+{
+    return textureUnitNames;
+}
+
 void Material::CheckOcclusion()
 {
     // Determine occlusion by checking the base pass of each technique

Source/Atomic/Graphics/Material.h

@@ -231,6 +231,8 @@ public:
     static String GetTextureUnitName(TextureUnit unit);
     /// Parse a shader parameter value from a string. Retunrs either a bool, a float, or a 2 to 4-component vector.
     static Variant ParseShaderParameterValue(const String& value);
+    /// Return the names of supported texture units
+    static const char** GetTextureUnitNames();
 
 private:
     /// Re-evaluate occlusion rendering.

Source/ThirdParty/TurboBadger/tb_widgets.cpp

@@ -1354,19 +1354,29 @@ void TBWidget::InvokePointerDown(int x, int y, int click_count, MODIFIER_KEYS mo
 void TBWidget::InvokePointerUp(int x, int y, MODIFIER_KEYS modifierkeys, bool touch, int touchId)
 {
     TBWidget* down_widget = GetWidgetAt(x, y, true);
-	if (down_widget && down_widget->touchId_ == touchId)
+	if ((down_widget && down_widget->touchId_ == touchId) || captured_widget)
 	{
+        TBWidgetEvent ev_up(EVENT_TYPE_POINTER_UP, x, y, touch, modifierkeys);
+        TBWidgetEvent ev_click(EVENT_TYPE_CLICK, x, y, touch, modifierkeys);
         down_widget->Invalidate();
         down_widget->InvalidateSkinStates();
         down_widget->OnCaptureChanged(false);
 		down_widget->ConvertFromRoot(x, y);
-		TBWidgetEvent ev_up(EVENT_TYPE_POINTER_UP, x, y, touch, modifierkeys);
-		TBWidgetEvent ev_click(EVENT_TYPE_CLICK, x, y, touch, modifierkeys);
 		down_widget->InvokeEvent(ev_up);
-		if (!cancel_click && down_widget->GetHitStatus(x, y))
+        if (!cancel_click && down_widget->GetHitStatus(x, y))
+        {
 			down_widget->InvokeEvent(ev_click);
-		if (captured_widget) // && button == captured_button
-			captured_widget->ReleaseCapture();
+        }
+        if (captured_widget)
+        {
+            captured_widget->ConvertFromRoot(x, y);
+            if (!cancel_click && captured_widget->GetHitStatus(x, y))
+            {
+                captured_widget->InvokeEvent(ev_click);
+            }
+            captured_widget->InvokeEvent(ev_up);
+            captured_widget->ReleaseCapture();
+        }
 	}
 }
 

Source/ThirdParty/kNet/CMakeLists.txt

@@ -34,7 +34,9 @@ if (WIN32)
 
    add_definitions (-D_WINSOCKAPI_)
    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
-   add_definitions (-DKNET_MEMORY_LEAK_CHECK)
+   # ATOMIC: Disable KNET_MEMORY_LEAK_CHECK, only used on Windows
+   # redefines new/delete and causes a compilation problem on VS2015 Update 1
+   # add_definitions (-DKNET_MEMORY_LEAK_CHECK)
 elseif (UNIX)
    file (GLOB kNetUnixSourceFiles src/unix/*.cpp)
    file (GLOB kNetUnixHeaderFiles include/*.h include/kNet/*.h include/kNet/unix/*.h)
@@ -61,4 +63,3 @@ endif ()
 set (SOURCE_FILES ${kNetSourceFiles} ${kNetHeaderFiles})
 
 add_library(kNet ${SOURCE_FILES})
-