Merge pull request #178 from LumaDigital/master

Rakefile, ignores, defines and errors

.gitignore

@@ -1,4 +1,6 @@
 
+*.ps3
+*.vs3
 *.user
 *.log
 Bin/*.d.ts
@@ -7,6 +9,7 @@ Bin/*.pak
 Bin/NativePluginSDK/*
 Source/Atomic/Javascript/Modules/*
 Data/AtomicPlayer/Resources/CoreData/Shaders/HLSL/Cache
+Resources/CoreData/Shaders/HLSL/Cache
 Artifacts/*
 Build/Source/*
 Docs/out/*

Rakefile

@@ -58,8 +58,12 @@ namespace :build  do
     end
 
     Dir.chdir(CMAKE_WINDOWS_BUILD_FOLDER) do
+      # ensure VS commandline tools are on the path
+      VSCOMNTOOLS = ENV['VS140COMNTOOLS']
 
-      sh "cmake ../../ -G \"Visual Studio 14 2015\""
+      sh "\"#{VSCOMNTOOLS}vsvars32.bat\""
+
+      sh "cmake ../../ -DATOMIC_DEV_BUILD=0 -G \"Visual Studio 14 2015\""
 
       # specify 32 bit
       sh "msbuild /m Atomic.sln /p:Configuration=Release /p:Platform=Win32"

Script/Packages/Atomic/Scene.json

@@ -34,6 +34,7 @@
 		],
 		"Node" : [
 			"saveXML(file:File):boolean;",
+			"loadXML(file:File):boolean;",
 			"getChildrenWithName(name:string, recursive?:boolean):Node[];",
 			"getChildrenWithComponent(componentType:string, recursive?:boolean):Node[];",
 			"getComponents(componentType?:string, recursive?:boolean):Component[];",

Script/TypeScript/AtomicWork.d.ts

@@ -180,6 +180,16 @@ declare module Atomic {
     export function getGraphics(): Graphics;
     export function getFileSystem(): FileSystem;
     export function getResourceCache(): ResourceCache;
+    export function getRenderer(): Atomic.Renderer;
+    export function getNetwork(): Atomic.Network;
+
+    export function assert();
+    export function js_module_read_file(path: string);
+    export function openConsoleWindow();
+    export function script(script: string): boolean;
+    export function destroy(node: Atomic.Node): boolean;
+    export function destroy(scene: Atomic.Scene): boolean;
+    export function destroy(component: Atomic.JSComponent): boolean;
 
     export function getParentPath(path: string): string;
     export function addTrailingSlash(path: string): string;

Source/Atomic/Container/RefCounted.h

@@ -32,8 +32,8 @@ typedef const void* ClassID;
 /// Macro to be included in RefCounted derived classes for efficient RTTI
 #define REFCOUNTED(typeName) \
     public: \
-        virtual ClassID GetClassID() const { return GetClassIDStatic(); } \
-        static ClassID GetClassIDStatic() { static const int typeID = 0; return (ClassID) &typeID; }
+        virtual Atomic::ClassID GetClassID() const { return GetClassIDStatic(); } \
+        static Atomic::ClassID GetClassIDStatic() { static const int typeID = 0; return (Atomic::ClassID) &typeID; }
 
 // ATOMIC END
 

Source/Atomic/Core/Object.h

@@ -40,8 +40,8 @@ class EventHandler;
         virtual const Atomic::String& GetTypeName() const { return GetTypeNameStatic(); } \
         static Atomic::StringHash GetTypeStatic() { static const Atomic::StringHash typeStatic(#typeName); return typeStatic; } \
         static const Atomic::String& GetTypeNameStatic() { static const Atomic::String typeNameStatic(#typeName); return typeNameStatic; } \
-        virtual ClassID GetClassID() const { return GetClassIDStatic(); } \
-        static ClassID GetClassIDStatic() { static const int typeID = 0; return (ClassID) &typeID; }
+        virtual Atomic::ClassID GetClassID() const { return GetClassIDStatic(); } \
+        static Atomic::ClassID GetClassIDStatic() { static const int typeID = 0; return (Atomic::ClassID) &typeID; }
 
 #define BASEOBJECT(typeName) \
     public: \

Source/Atomic/Core/ProcessUtils.cpp

@@ -179,6 +179,10 @@ void PrintUnicode(const String& str, bool error)
         WString strW(str);
         DWORD charsWritten;
         WriteConsoleW(stream, strW.CString(), strW.Length(), &charsWritten, 0);
+        if (IsDebuggerPresent())
+        {
+            OutputDebugString(str.CString());
+        }
     }
 #else
     fprintf(error ? stderr : stdout, "%s", str.CString());

Source/AtomicJS/Javascript/JSPlugin.cpp

@@ -26,7 +26,9 @@ namespace Atomic
 
         if (handle == NULL)
         {
-            errorMsg = ToString("Native Plugin: Unable to load %s", pluginLibrary.CString());
+            errorMsg = ToString("Native Plugin: Unable to load %s with error %s", 
+                pluginLibrary.CString(),
+                SDL_GetError());
             return false;
         }
 
@@ -86,7 +88,9 @@ namespace Atomic
         if (duk_pcall(ctx, 1) != DUK_EXEC_SUCCESS)
         {
             success = false;
-            LOGERRORF("Native Plugin: error calling atomic_plugin_init %s", pluginLibrary.CString());
+            LOGERRORF("Native Plugin: error calling atomic_plugin_init %s with error %s", 
+                pluginLibrary.CString(), 
+                duk_safe_to_string(ctx, -1));
         }
         else
         {