Add new engine parameter to set the location of resource prefix path.

Remove temporary measure instead use the new URHO3D_PREFIX_PATH environment variable to set the resource prefix path for testing the executables.

Bin/Editor.bat

@@ -1,9 +1,3 @@
-@ECHO OFF
-
-IF [%1] == [] (
-        "%~dp0Urho3DPlayer" Scripts/Editor.as -w -s
-        )
-
-IF NOT [%1] == [] (
-        "%~dp0Urho3DPlayer" Scripts/Editor.as %*
-        )
+@echo off
+if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
+if [%1] == [] ("%~dp0Urho3DPlayer%DEBUG%" Scripts/Editor.as -w -s) else ("%~dp0Urho3DPlayer%DEBUG%" Scripts/Editor.as %*)

Bin/Editor.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 if [ $# -eq 0 ]
 then
-    $( dirname $0 )/Urho3DPlayer Scripts/Editor.as -w -s
+    $(dirname $0)/Urho3DPlayer Scripts/Editor.as -w -s
 else
-    $( dirname $0 )/Urho3DPlayer Scripts/Editor.as $@
+    $(dirname $0)/Urho3DPlayer Scripts/Editor.as $@
 fi

Bin/Extra/.gitignore

@@ -1,3 +0,0 @@
-# Place holder to ensure Git includes this directory
-*
-!.gitignore

Bin/NinjaSnowWar.bat

@@ -9,4 +9,6 @@
 ::   Start the server with "NinjaSnowWar -w -server"
 ::   Start the client on the same host with "NinjaSnowWar -w -nobgm -address <put-your-host-name-here>"
 ::
-"%~dp0Urho3DPlayer" Scripts/NinjaSnowWar.as %*
+@echo off
+if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
+"%~dp0Urho3DPlayer%DEBUG%" Scripts/NinjaSnowWar.as %*

Bin/NinjaSnowWar.sh

@@ -10,4 +10,4 @@
 #   Start the server with "./NinjaSnowWar.sh -w -server"
 #   Start the client on the same host with "./NinjaSnowWar.sh -w -nobgm -address `hostname`"
 #
-$( dirname $0 )/Urho3DPlayer Scripts/NinjaSnowWar.as $@
+$(dirname $0)/Urho3DPlayer Scripts/NinjaSnowWar.as $@

Bin/UpdateDocument.bat

@@ -1,19 +0,0 @@
-@echo off
-doxygen -v 1>nul 2>&1
-if %errorlevel% == 0 goto :start
-echo Could not update document because doxygen is not installed
-exit /B 1
-:start
-pushd "%~dp0..\Docs"
-echo Dumping AngelScript API...
-"%~dp0ScriptCompiler" -dumpapi ScriptAPI.dox AngelScriptAPI.h
-if errorlevel 1 exit /B 1
-echo Dumping LuaScript API...
-pushd ..\Source\Engine\LuaScript\pkgs
-"%~dp0tolua++" -L ToDoxHook.lua -P -o "%~dp0..\Docs\LuaScriptAPI.dox" "%~dp0LuaPkgToDox.txt"
-if errorlevel 1 exit /B 1
-popd
-echo Converting Doxygen files to HTML...
-doxygen Doxyfile 1>nul
-echo Finish.
-popd

Bin/UpdateDocument.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-doxygen -v 1>/dev/null 2>&1
-if [ $? -ne 0 ]; then echo "Could not update document because doxygen is not installed" && exit 1; fi
-cd $( dirname $0 )
-BIN=`pwd`
-cd ../Docs
-echo "Dumping AngelScript API..."
-$BIN/ScriptCompiler -dumpapi ScriptAPI.dox AngelScriptAPI.h
-if [ $? -ne 0 ]; then exit 1; fi
-echo "Dumping LuaScript API..."
-out=`pwd`/LuaScriptAPI.dox
-pushd ../Source/Engine/LuaScript/pkgs >/dev/null
-$BIN/tolua++ -L ToDoxHook.lua -P -o $out $BIN/LuaPkgToDox.txt
-if [ $? -ne 0 ]; then exit 1; fi
-popd >/dev/null
-echo "Converting Doxygen files to HTML..."
-doxygen Doxyfile 1>/dev/null
-echo "Finish."

CMake/Modules/Urho3D-CMake-common.cmake

@@ -398,6 +398,8 @@ macro (create_symlink SOURCE DESTINATION)
                 endif ()
                 execute_process (COMMAND mklink ${MKLINK_OPT} "${DESTINATION}" "${SOURCE}")
             endif ()
+        elseif (${ARGN} STREQUAL FALLBACK_TO_COPY)
+            execute_process (COMMAND -E copy_if_different "${SOURCE}" "${DESTINATION}")
         else ()
             message (WARNING "Unable to create symbolic link on this host system, you may need to manually copy file/dir from \"${SOURCE}\" to \"${DESTINATION}\"")
         endif ()

CMakeLists.txt

@@ -46,7 +46,7 @@ include (Urho3D-CMake-common)
 # Setup SDK install destinations
 if (CMAKE_HOST_WIN32)
     # CMake already automatically appends "Urho3D" to CMAKE_INSTALL_PREFIX on Windows platform
-    set (SCRIPT_PATTERN *.bat)
+    set (SCRIPT_EXT .bat)
 else ()
     set (PATH_SUFFIX /Urho3D)
     if (URHO3D_64BIT)
@@ -59,7 +59,7 @@ else ()
         # Use 'ios' arch subdirectory to differentiate, in case both Mac OS X and iOS build are installed at the same destination
         set (LIB_SUFFIX ${LIB_SUFFIX}/ios)
     endif ()
-    set (SCRIPT_PATTERN *.sh)
+    set (SCRIPT_EXT .sh)
 endif ()
 set (DEST_INCLUDE_DIR include${PATH_SUFFIX})
 set (DEST_SHARE_DIR share${PATH_SUFFIX})
@@ -75,14 +75,14 @@ string (REPLACE "${SYSROOT}" "" DEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DEST_PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
 set (DEST_PERMISSIONS FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 # Install application launcher scripts
-file (GLOB APP_SCRIPTS ${CMAKE_SOURCE_DIR}/Bin/${SCRIPT_PATTERN})
+file (GLOB APP_SCRIPTS ${CMAKE_SOURCE_DIR}/Bin/*${SCRIPT_EXT})
 install (FILES ${APP_SCRIPTS} DESTINATION ${DEST_RUNTIME_DIR} PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)   # 755
 # Install resource directories required by applications built with Urho3D library
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/Bin/CoreData ${CMAKE_SOURCE_DIR}/Bin/Data DESTINATION ${DEST_RUNTIME_DIR} ${DEST_PERMISSIONS})
 # Install CMake modules and toolchains provided by and for Urho3D
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/CMake/ DESTINATION ${DEST_SHARE_DIR}/CMake ${DEST_PERMISSIONS})    # Note: the trailing slash is significant
 # Install CMake launcher scripts
-file (GLOB CMAKE_SCRIPTS ${CMAKE_SOURCE_DIR}/${SCRIPT_PATTERN})
+file (GLOB CMAKE_SCRIPTS ${CMAKE_SOURCE_DIR}/*${SCRIPT_EXT})
 install (FILES ${CMAKE_SCRIPTS} DESTINATION ${DEST_SHARE_DIR}/Scripts PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 # Setup package variables

Docs/GettingStarted.dox

@@ -94,7 +94,10 @@ Note that Eclipse requires CDT plugin to build C/C++ project. When using generat
 
 If using MinGW to compile, DirectX headers may need to be acquired separately. They can be copied to the MinGW installation eg. from the following package: http://www.libsdl.org/extras/win32/common/directx-devel.tar.gz These will be missing some of the headers related to shader compilation, so a MinGW build will use OpenGL by default. To build in Direct3D9 mode, the MinGW-w64 port is necessary: http://mingw-w64.sourceforge.net/. Using it, Direct3D9 can be enabled with the "-DURHO3D_OPENGL=0" build option.
 
-After the build is complete, the programs can be run from the Bin subdirectory in the build tree. These include the Urho3D player application, which can run application scripts, the tools, and C++ sample applications if they have been enabled.
+After the build is complete, the programs can be run from the Bin subdirectory in the build tree. These include the Urho3D player application, which can run application scripts, the tools, and C++ sample applications if they have been enabled. In order to run the Urho3D executables successfully, you must do one of the following first:
+- Copy both the Bin/Data and Bin/CoreData directories to the Bin subdirectory in the build tree.
+- Instead of copying, just create symbolic links in the build tree pointing to the above two directories.
+- Or even better, set and export URHO3D_PREFIX_PATH variable in your host environment. The prefix variable must be set to an absolute path which contains the Data and CoreData subdirectories.      
 
 To run the Urho3D player application from the Visual Studio debugger, set the Urho3DPlayer project as the startup project and enter its relative path and filename into Properties -> Debugging -> Command: ../../../Bin/Urho3DPlayer.exe. Additionally, entering -w into Debugging -> Command Arguments is highly recommended. This enables startup in windowed mode: without it running into an exception or breakpoint will be obnoxious as the mouse cursor will likely be hidden. To actually make the Urho3DPlayer application do something useful, it must be supplied with the name of the script file it should load and run. You can try for example the following arguments: Scripts/NinjaSnowWar.as -w
 
@@ -211,9 +214,11 @@ The engine can be configured using the following command line options.
 -q           Enable quiet mode which does not log to standard output stream
 -b <length>  Sound buffer length in milliseconds
 -r <freq>    Sound mixing frequency in Hz
--p <paths>   Resource path(s) to use, separated by semicolons
--ap <paths>  Autoload resource path(s) to use, separated by semicolons
--log <level> Change the log level, valid 'level' values are 'debug', 'info', 'warning', 'error'
+-pp <path>   Resource prefix path, default to URHO3D_PREFIX_PATH env-var or executable path
+-p <paths>   Resource path(s) to use, separated by semicolons, default to 'Data;CoreData'
+-pf <files>  Resource package file to use, separated by semicolons, default to none
+-ap <paths>  Resource autoload path(s), separated by semicolons, default to 'AutoLoad'
+-log <level> Change the log level, valid 'level' values: 'debug', 'info', 'warning', 'error'
 -ds <file>   Dump used shader variations to a file for precaching
 -mq <level>  Material quality level, default 2 (high)
 -tq <level>  Texture quality level, default 2 (high)
@@ -315,25 +320,29 @@ F2          Toggle debug HUD
 
 \page UsingLibrary Using Urho3D as external library
 
-This page shows how to create a new C++ project linking against Urho3D library as external library. There are two approaches to do this. It is imperative to clear the CMake cache when changing from one approach to the other. In fact, you also need to clear the cache when any of the environment variables required by the CMake build script below change its value.
+This page shows how to create a new C++ project linking against Urho3D library as external library. There are two approaches to do this. It is imperative to clean the CMake cache when changing from one approach to the other. In fact, you also need to clean the cache when any of the environment variables required by the CMake build script below change its value.
 
-First of all, structure your project similar to Urho3D project as below:
+First of all, structure your project similar to Urho3D project as below, although this is not mandatory now:
 
 \code
 PROJECT_ROOT/
- ┝ Source/
- ┝ Build/
+ ┝ Android/             if you target Android platform as well
+ ┝ Docs/                if you do documentation at all
+ ┝ Source/              if you have large project with sources arranged in hierarchy
  ┝ Bin/
+ ╎  ┝ Data/
+ ╎  ┕ CoreData/
+ ┝ CMakeListst.txt
  ┕ *.bat or *.sh
 \endcode
 
-The Source/ directory is where your project CMakeLists.txt and all your source codes should reside. The Bin/ directory is where all the executables output will be generated. In order to run the executable in this directory, you need to copy (or symlink) the CoreData/ and Data/ directories from Urho3D project Bin/ directory (or from Urho3D SDK installation) to here. You may also want to copy (or symlink) the batch files or shell script files from Urho3D project root directory (or from Urho3D SDK installation) to your project root directory. The Build/ directory will be created automatically by the Urho3D CMake module that will be discussed shortly below. The *.bat or *.sh scripts work together with the module to create a so-called out-of-source build tree to keep the Source/ directory clean from intermediate build files. Note that when you invoke one the *.bat or *.sh script, you can pass most of the \ref Build_Options "build options" supported by Urho3D project. In fact, you probably have to pass the similar build options that you use when building the Urho3D library to avoid any conflict.
+The physical project root directory is also now the logical project source tree in CMake terminology where your project main CMakeLists.txt should reside. The Bin directory should contain the Data and CoreData resource subdirs. Unless you have configured CMake to use your project root directory as your project build tree as well, all the executables will not be actually generated in this Bin directory. The executables will always be generated in the Bin directory in the project build tree which is now fully user defined. Therefore, in order to run the executable in the build tree's Bin directory, you need to copy (or symlink) the resource directories (Data and CoreData) from source tree's Bin directory (or from Urho3D SDK installation) to there. Alternatively, you can use URHO3D_PREFIX_PATH environment variable to point to a prefix path containing the resource dirs. You may also want to copy (or symlink) the batch files or shell script files and/or Rakefile from Urho3D project root directory (or from Urho3D SDK installation) to your project root directory. The *.bat or *.sh scripts work together with the Urho3D CMake module to configure and generate build tree. Both out-of-source build tree (recommended) and non out-of-source build tree are now supported. Note that when you invoke one the *.bat or *.sh script for your project, you can also pass most of the \ref Build_Options "build options" supported by Urho3D project. In fact, you probably have to pass the similar build options that you use when building the Urho3D library to avoid any conflict.
 
-\section UsingLibraryFromProjectRootTree From Urho3D project root tree
+\section UsingLibraryFromProjectSourceAndBuildTrees From Urho3D project source tree and build tree
 
-This section assumes that you have already successfully build a static or shared library in the Urho3D project (separately from your own project). In order to find Urho3D library in Urho3D project library output directory, specify an environment variable called "URHO3D_HOME" which points to a Urho3D project root directory that you want to use (if you have more than one).
+This section assumes that you have already successfully build a static or shared library in the Urho3D project (separately from your own project). In order to find Urho3D library in Urho3D project library output directory in its build tree, specify an environment variable called "URHO3D_BUILD_TREE" which points to the Urho3D project build tree itself. Then also specify another environment variable called "URHO3D_HOME" which points to the Urho3D project source tree where the Urho3D headers and CMake modules can be found.
 
-In your own project Source/ directory, create a new CMakeLists.txt file and add the following lines: (replace MyProjectName and MyExecutableName with the actual names you want)
+In your own project root directory, create a main CMakeLists.txt file and add the following lines: (replace MyProjectName and MyExecutableName with the actual names you want)
 
 \code
 # Set project name
@@ -375,9 +384,9 @@ setup_main_executable ()
 
 The CMAKE_MODULE_PATH is setup so that CMake can find the Urho3D-specific CMake modules provided by Urho3D project inside your own project. The Urho3D-CMake-common.cmake is the module where all the reusable commands and macros are defined. It also gives your project cross-platform build capability similar to Urho3D project.
 
-When both Urho3D static and shared library are built and available in the Urho3D project's library output directory, the FindUrho3D.cmake module has precedence to first select static library type over over shared library type. However, you can use URHO3D_LIB_TYPE build option to explicitly specify which Urho3D library type to be selected. When linking statically against Urho3D static library, Urho3D-CMake-common.cmake module automatically set "URHO3D_STATIC_DEFINE" compiler define for your project. This compiler define is crucial for static linking, especially on MSVC.
+When both Urho3D static and shared library are built and available in the Urho3D project's library output directory in its build tree, the FindUrho3D.cmake module has precedence to first select static library type over over shared library type. However, you can use URHO3D_LIB_TYPE build option to explicitly specify which Urho3D library type to be selected. When linking statically against Urho3D static library, Urho3D-CMake-common.cmake module automatically set "URHO3D_STATIC_DEFINE" compiler define for your project. This compiler define is crucial for static linking, especially on MSVC.
 
-The define_source_files() and setup_main_executable() are Urho3D-specific macros. The define_source_file() macro is a shorthand to glob all the source files in the current source directory. It is equivalent to these commands:
+The define_source_files() and setup_main_executable() are Urho3D-specific macros. The define_source_file() macro is a shorthand to glob all the source files in the current directory. It is equivalent to these commands:
 
 \code
 file (GLOB CPP_FILES *.cpp)
@@ -385,26 +394,28 @@ file (GLOB H_FILES *.h)
 set (SOURCE_FILES ${CPP_FILES} ${H_FILES})
 \endcode
 
-The setup_main_executable() macro then uses SOURCE_FILES and TARGET_NAME variables to setup a new CMake target that would work on ALL platforms supported by Urho3D. Make sure both your project name and target name are not called 'Urho3D', as this name is already reserved by Urho3D project.
+The setup_main_executable() macro then uses SOURCE_FILES and TARGET_NAME variables to setup a new CMake target that would work on ALL platforms supported by Urho3D. Make sure both your project name and target name are not called 'Urho3D', as this name is reserved for Urho3D project only.
 
 \section FromSDK From Urho3D SDK installation
 
 This section assumes that you have already installed Urho3D SDK into your system. If you have installed the SDK in a non-default location then you need to use "CMAKE_PREFIX_PATH" environment variable to specify the prefix path of the non-default installation location.
 
-In your own project Source/ directory, create a new CMakeLists.txt file similar to the first approach but change the CMake module search path setup to read as follows on Windows platform:
+In your own project root directory, create a main CMakeLists.txt file similar to the first approach but change the CMake module search path setup to read as follows on Windows host:
 
 \code
 # Set CMake modules search path
 set (CMAKE_MODULE_PATH $ENV{CMAKE_PREFIX_PATH}/share/CMake/Modules CACHE PATH "Path to Urho3D-specific CMake modules")
 \endcode
 
-On non-Windows platform:
+On non-Windows host:
 
 \code
 # Set CMake modules search path
 set (CMAKE_MODULE_PATH $ENV{CMAKE_PREFIX_PATH}/share/Urho3D/CMake/Modules CACHE PATH "Path to Urho3D-specific CMake modules")
 \endcode
 
+It differs from Windows version because on Windows host the Urho3D SDK is installed to a location with 'Urho3D' already prepended into the installed path. On non-Windows host, the SDK is installed to /usr/local by default, so we need to append 'Urho3D' to the path in the latter.  
+
 \subsection FromSDKWithPkgConfig Using pkg-config instead of CMake
 
 If for some reason you could not use CMake in your project, you could configure your project to compile and link against Urho3D library from SDK installation using 'pkg-config' tool with the help of 'Urho3D.pc' configuration file (which is installed as part of the SDK installation). If the Urho3D SDK is being installed into a local location (such as /usr/local) or a non-default location, then most likely you would need to specify PKG_CONFIG_PATH environment variable to point to the location of the configuration file for this to work. The 'Urho3D.pc' file contains important information on how to configure your compiler and linker correctly. You can use that information as a reference to configure your own project even when you do not use 'pkg-config' tool.
@@ -447,6 +458,7 @@ As its name implies, this task just creates a basic project structure for your n
 
 On Windows host system, this task requires privilege to create symlinks by using mklink command. The task would fail when the Windows user account does not have that privilege.
 
+
 \page Structure Overall structure
 
 The Urho3D engine compiles into one library. Conceptually it consists of several "sublibraries" that represent different subsystems or functionality. Each of these resides in a subdirectory

Docs/Reference.dox

@@ -129,9 +129,10 @@ The full list of supported parameters, their datatypes and default values:
 - LogName (string) %Log filename. Default "Urho3D.log".
 - FrameLimiter (bool) Whether to cap maximum framerate to 200 (desktop) or 60 (Android/iOS.) Default true.
 - WorkerThreads (bool) Whether to create worker threads for the %WorkQueue subsystem according to available CPU cores. Default true.
+- ResourcePrefixPath (string) Override the resource prefix path to use. If not specified then the default prefix path is set to URHO3D_PREFIX_PATH environment variable (if defined) or executable path.
 - ResourcePaths (string) A semicolon-separated list of resource paths to use. If corresponding packages (ie. Data.pak for Data directory) exist they will be used instead. Default "Data;CoreData".
 - ResourcePackages (string) A semicolon-separated list of resource packages to use. Default empty.
-- AutoloadPaths (string) A semicolon-separated list of autoload paths to use. Any resource packages and subdirectories inside an autoload path will be added to the resource system. Default "Extra".
+- AutoloadPaths (string) A semicolon-separated list of autoload paths to use. Any resource packages and subdirectories inside an autoload path will be added to the resource system. Default "Autoload".
 - ForceSM2 (bool) Whether to force %Shader %Model 2, effective in Direct3D9 mode only. Default false.
 - ExternalWindow (void ptr) External window handle to use instead of creating an application window. Default null.
 - WindowIcon (string) %Window icon image resource name. Default empty (use application default icon.)

Rakefile

@@ -131,6 +131,9 @@ task :ci do
     $configuration = 'Debug'
     # Only 64-bit Linux environment with virtual framebuffer X server support and not MinGW build; or OSX build environment and not iOS build are capable to run tests
     $testing = (ENV['LINUX'] && !ENV['URHO3D_64BIT']) || (ENV['OSX'] && ENV['IOS'].to_i != 1) ? 1 : 0
+    if $testing
+      ENV['URHO3D_PREFIX_PATH'] = `pwd`.chomp + '/Bin'
+    end
   end
   # Define the build option string only when the override environment variable is given
   $build_options = "-DURHO3D_64BIT=#{ENV['URHO3D_64BIT']}" if ENV['URHO3D_64BIT']
@@ -320,10 +323,10 @@ setup_main_executable ()
 
 # Setup test cases
 if (URHO3D_ANGELSCRIPT)
-    add_test (NAME ExternalLibAS COMMAND ${TARGET_NAME} Data/Scripts/12_PhysicsStressTest.as -w -timeout ${URHO3D_TEST_TIME_OUT})
+    add_test (NAME ExternalLibAS COMMAND ${TARGET_NAME} Scripts/12_PhysicsStressTest.as -w -timeout ${URHO3D_TEST_TIME_OUT})
 endif ()
 if (URHO3D_LUA)
-    add_test (NAME ExternalLibLua COMMAND ${TARGET_NAME} Data/LuaScripts/12_PhysicsStressTest.lua -w -timeout ${URHO3D_TEST_TIME_OUT})
+    add_test (NAME ExternalLibLua COMMAND ${TARGET_NAME} LuaScripts/12_PhysicsStressTest.lua -w -timeout ${URHO3D_TEST_TIME_OUT})
 endif ()
 EOF
   # TODO: Rewrite in pure Ruby when it supports symlink creation on Windows platform
@@ -381,8 +384,6 @@ def makefile_ci
   else
     test = ''
   end
-# Temporarily create a symlink to Urho3D asset dir
-system "export ASSET_DIR=`pwd`/Bin; bash -c \"if cd ../Build/Bin 2>/dev/null; then ln -sf $ASSET_DIR/{CoreData,Data} .; fi\"" or abort 'Failed to create symlink to Urho3D asset directory'
   system "cd ../Build && make -j$NUMJOBS #{test}" or abort 'Failed to build or test Urho3D library'
   # Create a new project on the fly that uses newly built Urho3D library
   scaffolding "../Build/generated/UsingSourceAndBuildTrees"
@@ -497,10 +498,6 @@ def xcode_ci
 # Temporarily not using any build options that require native tool building
 #  system "./cmake_macosx.sh ../Build -DIOS=$IOS #{deployment_target} -DURHO3D_LIB_TYPE=$URHO3D_LIB_TYPE #{$build_options} -DURHO3D_LUA#{jit}=1 #{amalg} -DURHO3D_SAMPLES=1 -DURHO3D_TOOLS=1 -DURHO3D_EXTRAS=1 -DURHO3D_TESTING=#{$testing}" or abort 'Failed to configure Urho3D library build'
   system "./cmake_macosx.sh ../Build -DIOS=$IOS #{deployment_target} -DURHO3D_LIB_TYPE=$URHO3D_LIB_TYPE #{$build_options} -DURHO3D_SAMPLES=1 -DURHO3D_TOOLS=1 -DURHO3D_EXTRAS=1 -DURHO3D_TESTING=#{$testing}" or abort 'Failed to configure Urho3D library build'
-# Temporarily create a symlink to Urho3D asset dir
-unless ENV['IOS']
-  system "export ASSET_DIR=`pwd`/Bin; bash -c \"mkdir -p ../Build/Bin && cd ../Build/Bin && ln -sf $ASSET_DIR/{CoreData,Data} .\"" or abort 'Failed to create symlink to Urho3D asset directory'
-end
   xcode_build(ENV['IOS'], "../Build/Urho3D.xcodeproj") or abort 'Failed to build or test Urho3D library'
   # Create a new project on the fly that uses newly built Urho3D library
   scaffolding "../Build/generated/UsingSourceAndBuildTrees"

Source/Engine/Engine/Engine.cpp

@@ -198,11 +198,14 @@ bool Engine::Initialize(const VariantMap& parameters)
     // Add resource paths
     ResourceCache* cache = GetSubsystem<ResourceCache>();
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
-    String exePath = fileSystem->GetProgramDir();
 
+    String defaultPrefixPath(AddTrailingSlash(getenv("URHO3D_PREFIX_PATH")));
+    if (defaultPrefixPath.Empty())
+        defaultPrefixPath = fileSystem->GetProgramDir();
+    String resourcePrefixPath = GetParameter(parameters, "ResourcePrefixPath", defaultPrefixPath).GetString();
     Vector<String> resourcePaths = GetParameter(parameters, "ResourcePaths", "Data;CoreData").GetString().Split(';');
     Vector<String> resourcePackages = GetParameter(parameters, "ResourcePackages").GetString().Split(';');
-    Vector<String> autoloadPaths = GetParameter(parameters, "AutoloadPaths", "Extra").GetString().Split(';');
+    Vector<String> autoLoadPaths = GetParameter(parameters, "AutoloadPaths", "Autoload").GetString().Split(';');
 
     for (unsigned i = 0; i < resourcePaths.Size(); ++i)
     {
@@ -211,20 +214,13 @@ bool Engine::Initialize(const VariantMap& parameters)
         // If path is not absolute, prefer to add it as a package if possible
         if (!IsAbsolutePath(resourcePaths[i]))
         {
-            String packageName = exePath + resourcePaths[i] + ".pak";
+            String packageName = resourcePrefixPath + resourcePaths[i] + ".pak";
             if (fileSystem->FileExists(packageName))
-            {
-                SharedPtr<PackageFile> package(new PackageFile(context_));
-                if (package->Open(packageName))
-                {
-                    cache->AddPackageFile(package);
-                    success = true;
-                }
-            }
+                success = cache->AddPackageFile(packageName);
 
             if (!success)
             {
-                String pathName = exePath + resourcePaths[i];
+                String pathName = resourcePrefixPath + resourcePaths[i];
                 if (fileSystem->DirExists(pathName))
                     success = cache->AddResourceDir(pathName);
             }
@@ -238,7 +234,7 @@ bool Engine::Initialize(const VariantMap& parameters)
 
         if (!success)
         {
-            LOGERROR("Failed to add resource path " + resourcePaths[i]);
+            LOGERRORF("Failed to add resource path %s", resourcePaths[i].CString());
             return false;
         }
     }
@@ -246,85 +242,64 @@ bool Engine::Initialize(const VariantMap& parameters)
     // Then add specified packages
     for (unsigned i = 0; i < resourcePackages.Size(); ++i)
     {
-        bool success = false;
-
-        String packageName = exePath + resourcePackages[i];
+        String packageName = resourcePrefixPath + resourcePackages[i];
         if (fileSystem->FileExists(packageName))
         {
-            SharedPtr<PackageFile> package(new PackageFile(context_));
-            if (package->Open(packageName))
+            if (!cache->AddPackageFile(packageName))
             {
-                cache->AddPackageFile(package);
-                success = true;
+                LOGERRORF("Failed to add resource package %s", resourcePackages[i].CString());
+                return false;
             }
         }
-
-        if (!success)
-        {
-            LOGERROR("Failed to add resource package " + resourcePackages[i]);
-            return false;
-        }
+        else
+            LOGDEBUGF("Skip specified resource package %s as it does not exist", resourcePackages[i].CString());
     }
     
     // Add auto load folders. Prioritize these (if exist) before the default folders
-    for (unsigned i = 0; i < autoloadPaths.Size(); ++i)
+    for (unsigned i = 0; i < autoLoadPaths.Size(); ++i)
     {
-        bool success = true;
-        String autoloadPath = autoloadPaths[i];
-        if (!IsAbsolutePath(autoloadPath))
-            autoloadPath = exePath + autoloadPath;
+        String autoLoadPath(autoLoadPaths[i]);
+        if (!IsAbsolutePath(autoLoadPath))
+            autoLoadPath = resourcePrefixPath + autoLoadPath;
 
-        String badResource;
-        if (fileSystem->DirExists(autoloadPath))
+        if (fileSystem->DirExists(autoLoadPath))
         {
-            Vector<String> folders;
-            fileSystem->ScanDir(folders, autoloadPath, "*", SCAN_DIRS, false);
-            for (unsigned y = 0; y < folders.Size(); ++y)
+            // Add all the subdirs (non-recursive) as resource directory
+            Vector<String> subdirs;
+            fileSystem->ScanDir(subdirs, autoLoadPath, "*", SCAN_DIRS, false);
+            for (unsigned y = 0; y < subdirs.Size(); ++y)
             {
-                String folder = folders[y];
-                if (folder.StartsWith("."))
+                String dir = subdirs[y];
+                if (dir.StartsWith("."))
                     continue;
 
-                String autoResourceDir = autoloadPath + "/" + folder;
-                success = cache->AddResourceDir(autoResourceDir, 0);
-                if (!success)
+                String autoResourceDir = autoLoadPath + "/" + dir;
+                if (!cache->AddResourceDir(autoResourceDir, 0))
                 {
-                    badResource = folder;
-                    break;
+                    LOGERRORF("Failed to add resource directory %s in autoload path %s", dir.CString(), autoLoadPaths[i].CString());
+                    return false;
                 }
             }
 
-            if (success)
+            // Add all the found package files (non-recursive)
+            Vector<String> paks;
+            fileSystem->ScanDir(paks, autoLoadPath, "*.pak", SCAN_FILES, false);
+            for (unsigned y = 0; y < paks.Size(); ++y)
             {
-                Vector<String> paks;
-                fileSystem->ScanDir(paks, autoloadPath, "*.pak", SCAN_FILES, false);
-                for (unsigned y = 0; y < paks.Size(); ++y)
+                String pak = paks[y];
+                if (pak.StartsWith("."))
+                    continue;
+
+                String autoPackageName = autoLoadPath + "/" + pak;
+                if (!cache->AddPackageFile(autoPackageName, 0))
                 {
-                    String pak = paks[y];
-                    if (pak.StartsWith("."))
-                        continue;
-
-                    String autoResourcePak = autoloadPath + "/" + pak;
-                    SharedPtr<PackageFile> package(new PackageFile(context_));
-                    if (package->Open(autoResourcePak))
-                        cache->AddPackageFile(package, 0);
-                    else
-                    {
-                        badResource = autoResourcePak;
-                        success = false;
-                        break;
-                    }
+                    LOGERRORF("Failed to add package file %s in autoload path %s", pak.CString(), autoLoadPaths[i].CString());
+                    return false;
                 }
             }
         }
         else
-            LOGWARNING("Skipped autoload folder " + autoloadPaths[i] + " as it does not exist");
-
-        if (!success)
-        {
-            LOGERROR("Failed to add resource " + badResource + " in autoload folder " + autoloadPaths[i]);
-            return false;
-        }
+            LOGDEBUGF("Skipped autoload path %s as it does not exist", autoLoadPaths[i].CString());
     }
 
     // Initialize graphics & audio output
@@ -814,11 +789,21 @@ VariantMap Engine::ParseParameters(const Vector<String>& arguments)
                 ret["SoundMixRate"] = ToInt(value);
                 ++i;
             }
+            else if (argument == "pp" && !value.Empty())
+            {
+                ret["ResourcePrefixPath"] = value;
+                ++i;
+            }
             else if (argument == "p" && !value.Empty())
             {
                 ret["ResourcePaths"] = value;
                 ++i;
             }
+            else if (argument == "pf" && !value.Empty())
+            {
+                ret["ResourcePackages"] = value;
+                ++i;
+            }
             else if (argument == "ap" && !value.Empty())
             {
                 ret["AutoloadPaths"] = value;

Source/Engine/Network/Connection.cpp

@@ -821,8 +821,7 @@ void Connection::ProcessPackageDownload(int msgID, MemoryBuffer& msg)
                 
                 // Instantiate the package and add to the resource system, as we will need it to load the scene
                 download.file_->Close();
-                SharedPtr<PackageFile> newPackage(new PackageFile(context_, download.file_->GetName()));
-                GetSubsystem<ResourceCache>()->AddPackageFile(newPackage, true);
+                GetSubsystem<ResourceCache>()->AddPackageFile(download.file_->GetName(), true);
                 
                 // Then start the next download if there are more
                 downloads_.Erase(i);

Source/Engine/Resource/ResourceCache.cpp

@@ -124,13 +124,13 @@ bool ResourceCache::AddResourceDir(const String& pathName, unsigned priority)
     return true;
 }
 
-void ResourceCache::AddPackageFile(PackageFile* package, unsigned priority)
+bool ResourceCache::AddPackageFile(PackageFile* package, unsigned priority)
 {
     MutexLock lock(resourceMutex_);
     
     // Do not add packages that failed to load
     if (!package || !package->GetNumFiles())
-        return;
+        return false;
     
     if (priority < packages_.Size())
         packages_.Insert(priority, SharedPtr<PackageFile>(package));
@@ -138,6 +138,13 @@ void ResourceCache::AddPackageFile(PackageFile* package, unsigned priority)
         packages_.Push(SharedPtr<PackageFile>(package));
     
     LOGINFO("Added resource package " + package->GetName());
+    return true;
+}
+
+bool ResourceCache::AddPackageFile(const String& fileName, unsigned priority)
+{
+    SharedPtr<PackageFile> package(new PackageFile(context_));
+    return package->Open(fileName) && AddPackageFile(fileName);
 }
 
 bool ResourceCache::AddManualResource(Resource* resource)

Source/Engine/Resource/ResourceCache.h

@@ -89,9 +89,11 @@ public:
     virtual ~ResourceCache();
     
     /// Add a resource load directory. Optional priority parameter which will control search order.
-    bool AddResourceDir(const String& pathName, unsigned priority = PRIORITY_LAST );
+    bool AddResourceDir(const String& pathName, unsigned priority = PRIORITY_LAST);
     /// Add a package file for loading resources from. Optional priority parameter which will control search order.
-    void AddPackageFile(PackageFile* package, unsigned priority = PRIORITY_LAST );
+    bool AddPackageFile(PackageFile* package, unsigned priority = PRIORITY_LAST);
+    /// Add a package file for loading resources from by name. Optional priority parameter which will control search order.
+    bool AddPackageFile(const String& fileName, unsigned priority = PRIORITY_LAST);
     /// Add a manually created resource. Must be uniquely named.
     bool AddManualResource(Resource* resource);
     /// Remove a resource load directory.

Source/Engine/Script/ResourceAPI.cpp

@@ -102,7 +102,8 @@ static void RegisterResourceCache(asIScriptEngine* engine)
 {
     RegisterObject<ResourceCache>(engine, "ResourceCache");
     engine->RegisterObjectMethod("ResourceCache", "bool AddResourceDir(const String&in, uint priority = M_MAX_UNSIGNED)", asMETHOD(ResourceCache, AddResourceDir), asCALL_THISCALL);
-    engine->RegisterObjectMethod("ResourceCache", "void AddPackageFile(PackageFile@+, uint priority = M_MAX_UNSIGNED)", asMETHOD(ResourceCache, AddPackageFile), asCALL_THISCALL);
+    engine->RegisterObjectMethod("ResourceCache", "bool AddPackageFile(PackageFile@+, uint priority = M_MAX_UNSIGNED)", asMETHODPR(ResourceCache, AddPackageFile, (PackageFile*, uint), bool), asCALL_THISCALL);
+    engine->RegisterObjectMethod("ResourceCache", "bool AddPackageFile(const String&in, uint priority = M_MAX_UNSIGNED)", asMETHODPR(ResourceCache, AddPackageFile, (const String&, uint), bool), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "bool AddManualResource(Resource@+)", asMETHOD(ResourceCache, AddManualResource), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "void RemoveResourceDir(const String&in)", asMETHOD(ResourceCache, RemoveResourceDir), asCALL_THISCALL);
     engine->RegisterObjectMethod("ResourceCache", "void RemovePackageFile(PackageFile@+, bool releaseResources = true, bool forceRelease = false)", asMETHODPR(ResourceCache, RemovePackageFile, (PackageFile*, bool, bool), void), asCALL_THISCALL);

Source/Tools/Urho3DPlayer/CMakeLists.txt

@@ -31,10 +31,15 @@ setup_main_executable ()
 
 # Setup test cases
 if (URHO3D_ANGELSCRIPT)
-    add_test (NAME Editor COMMAND ${TARGET_NAME} Data/Scripts/Editor.as -w -timeout ${URHO3D_TEST_TIME_OUT})
-    add_test (NAME NinjaSnowWar COMMAND ${TARGET_NAME} Data/Scripts/NinjaSnowWar.as -w -timeout ${URHO3D_TEST_TIME_OUT})
-    add_test (NAME SpritesAS COMMAND ${TARGET_NAME} Data/Scripts/03_Sprites.as -w -timeout ${URHO3D_TEST_TIME_OUT})
+    add_test (NAME Editor COMMAND ${TARGET_NAME} Scripts/Editor.as -w -timeout ${URHO3D_TEST_TIME_OUT})
+    add_test (NAME NinjaSnowWar COMMAND ${TARGET_NAME} Scripts/NinjaSnowWar.as -w -timeout ${URHO3D_TEST_TIME_OUT})
+    add_test (NAME SpritesAS COMMAND ${TARGET_NAME} Scripts/03_Sprites.as -w -timeout ${URHO3D_TEST_TIME_OUT})
 endif ()
 if (URHO3D_LUA)
-    add_test (NAME SpritesLua COMMAND ${TARGET_NAME} Data/LuaScripts/03_Sprites.lua -w -timeout ${URHO3D_TEST_TIME_OUT})
+    add_test (NAME SpritesLua COMMAND ${TARGET_NAME} LuaScripts/03_Sprites.lua -w -timeout ${URHO3D_TEST_TIME_OUT})
 endif ()
+
+# Symlink/copy helper shell scripts or batch files to invoke Urho3DPlayer
+foreach (FILE Editor NinjaSnowWar)
+    create_symlink (${CMAKE_SOURCE_DIR}/Bin/${FILE}${SCRIPT_EXT} ${CMAKE_BINARY_DIR}/Bin/${FILE}${SCRIPT_EXT} FALLBACK_TO_COPY)
+endforeach ()