A spelling error in /script/apps/WebServer/minetypes.lua

.codedocs

@@ -18,6 +18,7 @@ EXAMPLE_PATH =
 # Use relative paths with respect to the repository root directory.
 EXCLUDE = ParaWorld \
     NPLRuntime \
+    Client/trunk/externals/ \
     Server/trunk/lua-5.1.4/ \
     Server/trunk/luabind-0.9/ \
     Server/trunk/sqlite-3.6.23.1/ \
@@ -53,4 +54,4 @@ HIDE_UNDOC_CLASSES =
 # Specify a markdown page whose contents should be used as the main page
 # (index.html). This will override a page marked as \mainpage. For example, a
 # README.md file usually serves as a useful main page.
-USE_MDFILE_AS_MAINPAGE =
+USE_MDFILE_AS_MAINPAGE =

.dockeringore

@@ -0,0 +1 @@
+Dockerfile

.gitattributes

@@ -1,2 +1,3 @@
 # Declare files that will always have CRLF line endings on checkout.
 *.bat text eol=crlf
+*.sh text eol=lf

.gitignore

@@ -5,13 +5,16 @@
 *.sdf
 *.suo
 *.zip
+log.txt
+assets.log
 *.user
 *.ncb
 *.aps
 *.ffs_db
 *.fxo
 *.ffs_gui
 */obj/
+.vs/
 .DS_Store
 redist/
 published/
@@ -37,11 +40,22 @@ Tests/
 WanDeploy/
 WebAPI/
 !Client/
-Client/*
 !Client/CMakeLists.txt
 !Client/trunk/
-Client/trunk/*
 !Client/trunk/ParaEngineClient/
+!Client/trunk/ParaEngineClientApp/
+!Client/trunk/PhysicsBT/
+!Client/trunk/externals/
+Client/trunk/externals/*
+!Client/trunk/externals/assimp*
+!Client/trunk/externals/bullet-2.75/
+!Client/trunk/externals/bullet3/
+!Client/trunk/externals/png*
+!Client/trunk/externals/jpeg*
+!Client/trunk/externals/freetype2*
+!Client/trunk/externals/gl*
+!Client/trunk/externals/icon/
+!Client/trunk/externals/FreeImage_3120/
 
 !Server/
 Server/*
@@ -55,5 +69,18 @@ Server/trunk/*
 !Server/trunk/NPLMono/
 !Server/trunk/luasql/
 !Server/trunk/luaJIT/
-!Server/trunk/zlib-1.2.3/
+!Server/trunk/luaJIT-2.1/
+!Server/trunk/zlib-1.2.11/
 !Server/trunk/curl-7.47.1/
+
+build/
+buildvm_arch.h
+
+.DS_Store
+
+settings.json
+core
+Client/trunk/ParaEngineClient/shaders/glsl/blockEffect.fx.glsl
+Client/trunk/ParaEngineClient/shaders/glsl/BMaxModel.fx.glsl
+Client/trunk/ParaEngineClient/shaders/glsl/simple_particle.fx.glsl
+Client/trunk/ParaEngineClient/shaders/glsl/sky.fx.glsl

.gitmodules

@@ -1,3 +1,11 @@
+
+
 [submodule "npl_packages/main"]
 	path = npl_packages/main
 	url = https://github.com/NPLPackages/main.git
+[submodule "Client/trunk/ParaEngineClient/dxEffects2glEffects"]
+	path = Client/trunk/ParaEngineClient/dxEffects2glEffects
+	url = https://github.com/tatfook/dxEffects2glEffects.git
+[submodule "Client/trunk/ParaEngineClient/glEffects"]
+	path = Client/trunk/ParaEngineClient/glEffects
+	url = https://github.com/tatfook/glEffects.git

.travis.yml

@@ -9,7 +9,6 @@ addons:
     packages:
     - gcc-4.9
     - g++-4.9
-    #- libboost1.55-all-dev
 
 compiler:
   - g++
@@ -23,17 +22,18 @@ before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq build-essential cmake git-core
  - sudo apt-get install -qq pkg-config mono-devel
- - sudo apt-get install -qq mysql-client libmysqlclient-dev
+ - sudo apt-get install -qq libreadline6 libreadline6-dev
+ # - sudo apt-get install -qq mysql-client libmysqlclient-dev
  # - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.9; fi
  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
  - sudo apt-get install -qq libssl-dev libssh2-1-dev
- - sudo apt-get install -qq freeglut3 freeglut3-dev libglew1.5 libglew1.5-dev libglu1-mesa libglu1-mesa-dev libgl1-mesa-glx libgl1-mesa-dev
+ - sudo apt-get install -qq freeglut3 freeglut3-dev libglew1.5 libglew1.5-dev libglu1-mesa libglu1-mesa-dev libgl1-mesa-glx libgl1-mesa-dev libbz2-1.0 libbz2-dev
  # For boost: we will download and compile boost instead of using prebuild ones, 
  # since statically linking with boost requires the same tool chain, otherwise there will be link errors. 
  ### - sudo add-apt-repository -y ppa:boost-latest/ppa && sudo apt-get update -q && sudo apt-get install -y libboost1.55-all-dev
- - wget http://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.bz2 --no-check-certificate
- - tar --bzip2 -xf boost_1_61_0.tar.bz2
- - cd boost_1_61_0
+ - wget http://dl.bintray.com/boostorg/release/1.65.0/source/boost_1_65_0.tar.bz2 --no-check-certificate
+ - tar --bzip2 -xf boost_1_65_0.tar.bz2
+ - cd boost_1_65_0
  - ./bootstrap.sh --help
  - "echo 'using gcc : 4.9 : /usr/bin/g++-4.9 ; ' >> tools/build/src/user-config.jam"
  - sudo ./bootstrap.sh --with-libraries="thread,date_time,filesystem,system,chrono,signals,serialization,iostreams,regex"
@@ -64,4 +64,6 @@ deploy:
     tags: true
     all_branches: true
     repo: LiXizhi/NPLRuntime
-
+
+notifications:
+  webhooks: https://hook.bearychat.com/=bwBHc/travis/d3c22fbb73065f1d2e79754098608b21

Client/CMakeLists.txt

@@ -3,60 +3,228 @@
 # Date: 2016.4.30
 # Note: see NPLRuntime/cmakelist.txt
 
-cmake_minimum_required (VERSION 2.6)
-
+cmake_minimum_required (VERSION 3.3)
 project (CLIENT)
 
-# this is the directory to keep all binary
+set(CMAKE_CXX_STANDARD 11)
+
+
+# Server source dir
+set(SERVER_SOURCE_DIR   ${CLIENT_SOURCE_DIR}/../Server/trunk/)
+
+
+# Options
+################################
+option(PARAENGINE_CLIENT_DLL "Generate Dll Or Exe" OFF)
+option(NPLRUNTIME_STATIC_LIB "static lib or not" OFF)
+
+
+# Win32 Default Option
+if(WIN32)
+
+	option(NPLRUNTIME_LUAJIT21 "build luajit21 support GC64" OFF)
+	option(NPLRUNTIME_LUAJIT20   "build luajit2.0.4" ON)
+	option(NPLRUNTIME_LUA51   "build lua5.1.5 with coco" ON)
+	option(NPLRUNTIME_SUPPORT_FBX "support FBX files (assimp)" ON)
+	option(NPLRUNTIME_PHYSICS "include physics" ON)
+
+endif()
+# OSX Default Option
+if(APPLE)
+
+	option(NPLRUNTIME_LUAJIT21 "build luajit21 support GC64" OFF)
+	option(NPLRUNTIME_SUPPORT_FBX "support FBX files (assimp)" OFF)
+	option(NPLRUNTIME_PHYSICS "include physics" OFF)
+	option(NPLRUNTIME_LUAJIT20   "build luajit2.0.4" ON)
+	option(NPLRUNTIME_LUA51   "build lua5.1.5 with coco" ON)	
+
+endif()
+# End of Options
+
+
+
+
+
+
+
+
+
+#Renderer
+################################
+if(WIN32)
+
+	set(NPLRUNTIME_RENDERER "DIRECTX" CACHE STRING "Render API")
+	set_property(CACHE NPLRUNTIME_RENDERER PROPERTY STRINGS DIRECTX OPENGL)
+
+endif()
+
+if(APPLE)
+
+	set(NPLRUNTIME_RENDERER "OPENGL" CACHE STRING "Render API")
+	set_property(CACHE NPLRUNTIME_RENDERER PROPERTY STRINGS OPENGL)
+
+endif()
+
+
+# Other platform depend options
+################################
+if(APPLE)
+
+	# making executable relocatable 
+	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+	SET(CMAKE_INSTALL_RPATH "$ORIGIN/") 
+
+endif()
+
+
+
+
+
+# Using static lib for other modules if main NPLRuntime is built as static lib. 
+
+if(NPLRUNTIME_STATIC_LIB)
+	set(CURL_STATICLIB TRUE)
+	set(LUA_STATICLIB TRUE)
+	set(SQLITE_STATICLIB TRUE)
+endif()
+
+
+# This is the directory to keep all binary
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-	set(OUTPUT_BIN_DIR   ${CLIENT_SOURCE_DIR}/../ParaWorld/bin64/)
+set(OUTPUT_BIN_DIR   ${CLIENT_SOURCE_DIR}/../ParaWorld/bin64/)
 else()
-	set(OUTPUT_BIN_DIR   ${CLIENT_SOURCE_DIR}/../ParaWorld/)
+set(OUTPUT_BIN_DIR   ${CLIENT_SOURCE_DIR}/../ParaWorld/bin32/)
 endif()
 
-set(SERVER_SOURCE_DIR   ${CLIENT_SOURCE_DIR}/../Server/trunk/)
 
+
+
+
+#Boost
+################################
 # include boost if client is not defined, it allows us to use a different boost version than the client on the server build.
-if (PARAENGINE_CLIENT OR WIN32)
-	if ("$ENV{BOOST_ROOT}" STREQUAL "")
-		set(BOOST_ROOT ${SERVER_SOURCE_DIR}/boost_1_55_0)
-	endif()
-    if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-		set(BOOST_LIBRARYDIR ${BOOST_ROOT}/stage/lib64)
+if ("$ENV{BOOST_ROOT}" STREQUAL "")
+	if(IS_DIRECTORY ${SERVER_SOURCE_DIR}/boost_1_65_0)
+		set(BOOST_ROOT ${SERVER_SOURCE_DIR}/boost_1_65_0)
+	elseif(IS_DIRECTORY ${SERVER_SOURCE_DIR}/boost_1_61_0)
+		set(BOOST_ROOT ${SERVER_SOURCE_DIR}/boost_1_61_0)
 	else()
+		message(WARNING "You can define a global environment variable of BOOST_ROOT that specify the boost root dir")
+	endif()
+else()
+	message("BOOST_ROOT env is at: $ENV{BOOST_ROOT}")
+	set(BOOST_ROOT "$ENV{BOOST_ROOT}")
+	string(REPLACE "\\" "/" BOOST_ROOT ${BOOST_ROOT})
+endif()
+
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+	if(IS_DIRECTORY ${BOOST_ROOT}/stage/lib64)
+		set(BOOST_LIBRARYDIR ${BOOST_ROOT}/stage/lib64)	
+	endif()
+else()
+	if(IS_DIRECTORY ${BOOST_ROOT}/stage/lib32)
 		set(BOOST_LIBRARYDIR ${BOOST_ROOT}/stage/lib32)
 	endif()
-endif(PARAENGINE_CLIENT OR WIN32)
+endif()
 
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_LIBS   ON)
 set(Boost_USE_STATIC_RUNTIME ON)
 
 # Add more boost components here
-find_package( Boost 1.55 REQUIRED COMPONENTS thread date_time filesystem system chrono signals regex serialization iostreams) 
+find_package( Boost 1.61 REQUIRED COMPONENTS thread date_time filesystem system chrono signals regex serialization iostreams) 
+
+# End of boost
+
+#ZLIB
+################################
+if(WIN32)
+
+	add_subdirectory (${SERVER_SOURCE_DIR}zlib-1.2.11 ${CLIENT_BINARY_DIR}/zlib-1.2.11)
+	set(ZLIB_FOUND 1)
+	set(ZLIB_LIBRARY zlib)
+	set(ZLIB_LIBRARIES zlib)
+	set(ZLIB_INCLUDE_DIR ${SERVER_SOURCE_DIR}zlib-1.2.11 ${CLIENT_BINARY_DIR}/zlib-1.2.11)
+	set(ZLIB_SOURCE_DIR ${ZLIB_INCLUDE_DIR})
+
+endif()
+
+
+# CURL
+################################
+if(WIN32)
 
-if (WIN32)
 	option(BUILD_CURL_EXE OFF)
 	option(BUILD_CURL_TESTS OFF)
-    add_subdirectory (${SERVER_SOURCE_DIR}zlib-1.2.3 ${CLIENT_BINARY_DIR}/zlib-1.2.3)
 	add_subdirectory (${SERVER_SOURCE_DIR}curl-7.47.1 ${CLIENT_BINARY_DIR}/curl-7.47.1)
-else()
+
+endif()
+
+
+if(APPLE)
+
 	FIND_PACKAGE(CURL REQUIRED)
-	# making executable relocatable 
-	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	SET(CMAKE_INSTALL_RPATH "$ORIGIN/")
+
+endif()
+# END OF CURL
+
+
+
+# Lua
+################################
+if (NPLRUNTIME_LUAJIT21) 
+	add_subdirectory (${SERVER_SOURCE_DIR}LuaJIT-2.1 ${CLIENT_BINARY_DIR}/LuaJIT-2.1)
+endif()
+if (NPLRUNTIME_LUA51)
+	add_subdirectory (${SERVER_SOURCE_DIR}lua-5.1.4 ${CLIENT_BINARY_DIR}/lua-5.1.4)
 endif()
+if(NPLRUNTIME_LUAJIT20)
+	add_subdirectory (${SERVER_SOURCE_DIR}LuaJIT ${CLIENT_BINARY_DIR}/LuaJIT)
+endif()
+
 
-add_subdirectory (${SERVER_SOURCE_DIR}lua-5.1.4 ${CLIENT_BINARY_DIR}/lua-5.1.4)
-add_subdirectory (${SERVER_SOURCE_DIR}LuaJIT ${CLIENT_BINARY_DIR}/LuaJIT)
 add_subdirectory (${SERVER_SOURCE_DIR}luabind-0.9 ${CLIENT_BINARY_DIR}/luabind-0.9)
 add_subdirectory (${SERVER_SOURCE_DIR}sqlite-3.6.23.1 ${CLIENT_BINARY_DIR}/sqlite-3.6.23.1)
 add_subdirectory (${SERVER_SOURCE_DIR}jsoncpp-0.5.0 ${CLIENT_BINARY_DIR}/jsoncpp-0.5.0)
 add_subdirectory (${SERVER_SOURCE_DIR}tinyxpath_1_3_1  ${CLIENT_BINARY_DIR}/tinyxpath_1_3_1)
-add_subdirectory (${SERVER_SOURCE_DIR}luasql ${CLIENT_BINARY_DIR}/luasql)
+
+
+
+if(NOT NPLRUNTIME_STATIC_LIB) 
+	add_subdirectory (${SERVER_SOURCE_DIR}luasql ${CLIENT_BINARY_DIR}/luasql)
+endif()
+
+if(NPLRUNTIME_SUPPORT_FBX) 
+	add_subdirectory (${CLIENT_SOURCE_DIR}/trunk/externals/assimp-4.0.0 ${CLIENT_BINARY_DIR}/assimp-4.0.0)
+endif()
+
+
+
 
 # main NPL runtime using ParaEngineClient
 add_subdirectory (${CLIENT_SOURCE_DIR}/../NPLRuntime/ParaEngineClient ${CLIENT_BINARY_DIR}/ParaEngineClient)
 
-# following are plugins that should be build after main runtime
-add_subdirectory (${SERVER_SOURCE_DIR}NPLMono/NPLMono2  ${CLIENT_BINARY_DIR}/NPLMono/NPLMono2)
+# expose the core include directory 
+set (ParaEngineClient_SOURCE_DIR ${CLIENT_SOURCE_DIR}/trunk/ParaEngineClient)
+
+if(NPLRUNTIME_PHYSICS)
+	add_subdirectory (${CLIENT_SOURCE_DIR}/trunk/externals/bullet3 ${CLIENT_BINARY_DIR}/bullet3)
+	add_subdirectory (${CLIENT_SOURCE_DIR}/trunk/PhysicsBT ${CLIENT_BINARY_DIR}/PhysicsBT)
+endif()
+
+if(PARAENGINE_CLIENT_DLL)
+	if(NOT NPLRUNTIME_STATIC_LIB) 
+		# this app is for testing the client dll
+		add_subdirectory (${CLIENT_SOURCE_DIR}/trunk/ParaEngineClientApp ${CLIENT_BINARY_DIR}/ParaEngineClientApp)
+	endif()
+endif()
+
+
+# following are plugins that should be build after main runtime	
+if(NOT NPLRUNTIME_STATIC_LIB) 
+	add_subdirectory (${SERVER_SOURCE_DIR}NPLMono/NPLMono2  ${CLIENT_BINARY_DIR}/NPLMono/NPLMono2)
+endif()
+
+# export these two variables to its parent scope just in case some app project reference NPLRuntime statically. 
+set(NPLRUNTIME_LINK_LIBRARIES ${NPLRUNTIME_LINK_LIBRARIES} PARENT_SCOPE)
+set(NPLRUNTIME_LINK_DIRECTORIES ${NPLRUNTIME_LINK_DIRECTORIES} PARENT_SCOPE)

Client/trunk/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.3)
+
+project(Client)
+
+#add_subdirectory(exrernals)
+#add_subdirectory(PhysicsBT)
+add_subdirectory(ParaEngineClient)
+#add_subdirectory(ParaEngineClientApp)
+