Merge pull request #120 from AtomicGameEngine/JME-WORK-FBXIMPORT

Atomic Editor Updates

Attic/AtomicEditorReference/CMakeLists.txt

@@ -0,0 +1,52 @@
+include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/rapidjson/include
+                     ${CMAKE_SOURCE_DIR}/Source/ThirdParty
+                     ${CMAKE_SOURCE_DIR}/Source/ThirdParty/nativefiledialog)
+
+
+file (GLOB_RECURSE SOURCE_FILES Source/*.cpp Source/*.h)
+
+if (APPLE)
+    set (EXE_TYPE MACOSX_BUNDLE)
+    set (SOURCE_FILES ${SOURCE_FILES} Source/Build/BuildIOSUtils.mm)
+
+    #ICNS
+    set(MACOSX_BUNDLE_ICON_FILE Atomic.icns)
+    set(ATOMIC_EDITOR_ICON ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.icns)
+    set_source_files_properties(${ATOMIC_EDITOR_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+elseif(LINUX)
+
+else()
+    include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/libcurl/include)
+    add_definitions(-DCURL_STATICLIB)
+    
+    # We want the console for now
+    #set (EXE_TYPE WIN32)
+    add_definitions(-DATOMIC_WIN32_CONSOLE)
+    
+    set (SOURCE_FILES ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.rc)
+endif(APPLE)
+
+GroupSources("Source")
+
+add_executable(AtomicEditor ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
+
+target_link_libraries(AtomicEditor ToolCore AtomicJS Poco nativefiledialog ${ATOMIC_LINK_LIBRARIES})
+
+if (APPLE)
+    set (TARGET_PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.template)
+    target_link_libraries(AtomicEditor curl)
+elseif(LINUX)
+    target_link_libraries(AtomicEditor curl nativefiledialog ${GTK3_LIBRARIES})
+else()
+    target_link_libraries(AtomicEditor libcurl Iphlpapi Wldap32)
+    
+    # pre-Windows 8 can't count on D3DCompiler_47.dll being on system
+    add_custom_command (TARGET AtomicEditor POST_BUILD
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -E copy_if_different \"${D3DCOMPILER_47_DLL}\" \"$<TARGET_FILE_DIR:AtomicEditor>/D3DCompiler_47.dll\")
+
+endif()
+
+if (TARGET_PROPERTIES)
+    set_target_properties (AtomicEditor PROPERTIES ${TARGET_PROPERTIES})
+endif ()

Source/AtomicEditor/Source/Player/AEPlayer.cpp → Attic/AtomicEditorReference/Source/Player/AEPlayer.cpp

@@ -59,10 +59,8 @@ void AEPlayer::HandleJSError(StringHash eventType, VariantMap& eventData)
 
 void AEPlayer::HandleIPCWorkerStarted(StringHash eventType, VariantMap& eventData)
 {
-    VariantMap weventData;
-    weventData[HelloFromBroker::P_HELLO] = "Hello";
-    weventData[HelloFromBroker::P_LIFETHEUNIVERSEANDEVERYTHING] = 42;
-    broker_->PostMessage(E_IPCHELLOFROMBROKER, weventData);
+    //VariantMap weventData;
+    //broker_->PostMessage(E_IPCSTARTUP, weventData);
 }
 
 void AEPlayer::HandleIPCWorkerExit(StringHash eventType, VariantMap& eventData)

Source/AtomicEditor/Source/Player/AEPlayerApplication.cpp → Attic/AtomicEditorReference/Source/Player/AEPlayerApplication.cpp

@@ -179,8 +179,8 @@ void AEPlayerApplication::Setup()
 
 void AEPlayerApplication::HandleHelloFromBroker(StringHash eventType, VariantMap& eventData)
 {
-    assert(eventData[HelloFromBroker::P_HELLO].GetString() == "Hello");
-    assert(eventData[HelloFromBroker::P_LIFETHEUNIVERSEANDEVERYTHING].GetInt() == 42);
+    //assert(eventData[HelloFromBroker::P_HELLO].GetString() == "Hello");
+    //assert(eventData[HelloFromBroker::P_LIFETHEUNIVERSEANDEVERYTHING].GetInt() == 42);
 
     LOGERROR("Passed Test!");
 }
@@ -188,7 +188,7 @@ void AEPlayerApplication::HandleHelloFromBroker(StringHash eventType, VariantMap
 void AEPlayerApplication::Start()
 {
 
-    SubscribeToEvent(E_IPCHELLOFROMBROKER, HANDLER(AEPlayerApplication, HandleHelloFromBroker));
+    //SubscribeToEvent(E_IPCHELLOFROMBROKER, HANDLER(AEPlayerApplication, HandleHelloFromBroker));
     SubscribeToEvent(E_JSERROR, HANDLER(AEPlayerApplication, HandleJSError));
 
 
@@ -210,7 +210,7 @@ void AEPlayerApplication::Start()
     {
         IPC* ipc = new IPC(context_);
         context_->RegisterSubsystem(ipc);
-        ipc->InitWorker(fd_[0], fd_[1]);
+        //ipc->InitWorker(fd_[0], fd_[1]);
     }
 #endif