Merge

--HG--
branch : develop

.hgignore

@@ -260,3 +260,5 @@ code/web/public_php/role_support
 code/web/public_php/role_domain
 code/web/public_php/db_version_ring
 code/web/public_php/config_user.php
+code/nel/tools/build_gamedata/processes/pz/build_world_packed_col.cfg
+code/nel/tools/build_gamedata/processes/cartographer/island_screenshots.cfg

code/nel/tools/build_gamedata/0_setup.py

@@ -432,6 +432,8 @@ if not args.noverify:
 	findTool(log, ToolDirectories, TgaCutTool, ToolSuffix)
 	findTool(log, ToolDirectories, PatchGenTool, ToolSuffix)
 	findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
+	findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix)
+	findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix)
 
 log.close()
 if os.path.isfile("0_setup.log"):

code/nel/tools/build_gamedata/configuration/tools.py

@@ -91,3 +91,5 @@ AiBuildWmapTool = "ai_build_wmap"
 TgaCutTool = "tga_cut"
 PatchGenTool = "patch_gen"
 TranslationToolsTool = "translation_tools"
+BuildWorldPackedColTool = "build_world_packed_col"
+R2IslandsTexturesTool = "r2_islands_textures"

code/nel/tools/build_gamedata/processes/cartographer/0_setup.py

@@ -0,0 +1,114 @@
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief setup cartographer
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup cartographer
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup cartographer")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + CartographerBuildDirectory)
+
+# Setup lookup directories
+printLog(log, ">>> Setup lookup directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory) # IN
+mkPath(log, ExportBuildDirectory + "/" + ZoneLightBuildDirectory) # IN (.zonel)
+mkPath(log, ExportBuildDirectory + "/" + ZoneLightIgLandBuildDirectory) # IN (.ig)
+mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory) # IN
+mkPath(log, ExportBuildDirectory + "/" + FarbankBuildDirectory) # IN
+mkPath(log, ExportBuildDirectory + "/" + DisplaceExportDirectory) # IN
+mkPath(log, ExportBuildDirectory + "/" + TilesExportDirectory) # IN
+mkPath(log, LeveldesignDataCommonDirectory) # IN
+mkPath(log, LeveldesignDfnDirectory) # IN
+mkPath(log, LeveldesignDirectory) # IN
+for dir in PropertiesExportBuildSearchPaths:
+	mkPath(log, ExportBuildDirectory + "/" + dir)
+
+# Setup client directories
+printLog(log, ">>> Setup install directories <<<")
+mkPath(log, InstallDirectory + "/" + CartographerInstallDirectory)
+
+# Setup client directories
+printLog(log, ">>> Setup configuration <<<")
+mkPath(log, ActiveProjectDirectory + "/generated")
+cfg = open(ActiveProjectDirectory + "/generated/island_screenshots.cfg", "w")
+cfg.write("\n")
+cfg.write("// BUILD CARTOGRAPHER CONFIGURATION\n")
+cfg.write("\n")
+cfg.write("SearchPaths = {\n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + AiWmapBuildDirectory + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + ZoneLightBuildDirectory + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + ZoneLightIgLandBuildDirectory + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + SmallbankExportDirectory + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + FarbankBuildDirectory + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + DisplaceExportDirectory + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + TilesExportDirectory + "\", \n")
+cfg.write("\t\"" + LeveldesignDataCommonDirectory + "\", \n")
+cfg.write("\t\"" + LeveldesignDfnDirectory + "\", \n")
+cfg.write("\t\"" + LeveldesignDirectory + "\", \n")
+for dir in PropertiesExportBuildSearchPaths:
+	cfg.write("\t\"" + ExportBuildDirectory + "/" + dir + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.write("OutDir = \"" + ExportBuildDirectory + "/" + CartographerBuildDirectory + "\";\n")
+cfg.write("\n")
+cfg.write("Continents = {\n")
+cfg.write("\t\"" + CartographerContinent + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.write("SeasonSuffixes = {\n")
+for suffix in MultipleTilesPostfix:
+	cfg.write("\t\"" + suffix + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.write("InverseZTest = true;\n")
+cfg.write("Vegetation = true;\n")
+cfg.write("MeterPixelSize = 2;\n")
+cfg.write("\n")
+cfg.write("CompleteIslandsFile = \"r2_islands.xml\";\n")
+cfg.write("EntryPointsFile = \"r2_entry_points.txt\";\n")
+cfg.write("\n")
+cfg.close()
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/cartographer/1_export.py

@@ -0,0 +1,49 @@
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Export cartographer
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export cartographer
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export cartographer")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/cartographer/2_build.py

@@ -0,0 +1,62 @@
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Build cartographer
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Build cartographer
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Build cartographer")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+R2IslandsTextures = findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix)
+
+if R2IslandsTextures == "":
+	toolLogFail(log, R2IslandsTexturesTool, ToolSuffix)
+else:
+	printLog(log, ">>> Copy island_screenshots.cfg <<<")
+	cfgPath = ActiveProjectDirectory + "/generated/island_screenshots.cfg"
+	shutil.copy(cfgPath, "island_screenshots.cfg")
+	printLog(log, ">>> Build cartographer <<<")
+	subprocess.call([ R2IslandsTextures ])
+printLog(log, "")
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/cartographer/3_install.py

@@ -0,0 +1,57 @@
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install cartographer
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install cartographer
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install cartographer")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+installPath = InstallDirectory + "/" + CartographerInstallDirectory
+mkPath(log, installPath)
+
+printLog(log, ">>> Install cartographer <<<")
+mkPath(log, ExportBuildDirectory + "/" + CartographerBuildDirectory)
+copyFilesNoTreeIfNeeded(log, ExportBuildDirectory + "/" + CartographerBuildDirectory, installPath)
+
+printLog(log, "")
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/pz/0_setup.py

@@ -0,0 +1,97 @@
+#!/usr/bin/python
+# 
+# \file 0_setup.py
+# \brief setup pz
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Setup pz
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Setup pz")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Setup build directories
+printLog(log, ">>> Setup build directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + PackedZoneCacheBuildDirectory)
+mkPath(log, ExportBuildDirectory + "/" + PackedZoneCWMapCacheBuildDirectory)
+mkPath(log, ExportBuildDirectory + "/" + PackedZoneBuildDirectory)
+
+# Setup lookup directories
+printLog(log, ">>> Setup lookup directories <<<")
+mkPath(log, ExportBuildDirectory + "/" + AiWmapBuildDirectory)
+mkPath(log, ExportBuildDirectory + "/" + ZoneLightBuildDirectory)
+mkPath(log, LeveldesignDataCommonDirectory)
+
+# Setup client directories
+printLog(log, ">>> Setup install directories <<<")
+mkPath(log, InstallDirectory + "/" + PackedZoneInstallDirectory)
+
+# Setup client directories
+printLog(log, ">>> Setup configuration <<<")
+mkPath(log, ActiveProjectDirectory + "/generated")
+cfg = open(ActiveProjectDirectory + "/generated/build_world_packed_col.cfg", "w")
+cfg.write("\n")
+cfg.write("// BUILD WORLD PACKED COL CONFIGURATION\n")
+cfg.write("\n")
+cfg.write("SearchPaths = {\n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + AiWmapBuildDirectory + "\", \n")
+cfg.write("\t\"" + ExportBuildDirectory + "/" + ZoneLightBuildDirectory + "\", \n")
+cfg.write("\t\"" + LeveldesignDataCommonDirectory + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.write("CachePath = \"" + ExportBuildDirectory + "/" + PackedZoneCacheBuildDirectory + "\";\n")
+cfg.write("CWMapCachePath = \"" + ExportBuildDirectory + "/" + PackedZoneCWMapCacheBuildDirectory + "\";\n")
+cfg.write("OutputPath = \"" + ExportBuildDirectory + "/" + PackedZoneBuildDirectory + "\";\n")
+cfg.write("\n")
+cfg.write("EntryPointsFile = \"r2_islands.xml\";\n")
+cfg.write("\n")
+cfg.write("CWMapList = {\n")
+cfg.write("\t\"" + PackedZoneCWMap + "\", \n")
+cfg.write("};\n")
+cfg.write("\n")
+cfg.write("Fly = 0;\n")
+cfg.write("\n")
+cfg.write("HeightMapsAsTga = 1;\n")
+cfg.write("PixelPerMeter = 1;\n")
+cfg.write("\n")
+cfg.write("RefineThreshold = 32;\n")
+cfg.write("\n")
+cfg.close()
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/pz/1_export.py

@@ -0,0 +1,49 @@
+#!/usr/bin/python
+# 
+# \file 1_export.py
+# \brief Export pz
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Export pz
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Export pz")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/pz/2_build.py

@@ -0,0 +1,62 @@
+#!/usr/bin/python
+# 
+# \file 2_build.py
+# \brief Build pz
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Build pz
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Build pz")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+# Find tools
+BuildWorldPackedCol = findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix)
+
+if BuildWorldPackedCol == "":
+	toolLogFail(log, BuildWorldPackedColTool, ToolSuffix)
+else:
+	printLog(log, ">>> Copy ai_build_wmap.cfg <<<")
+	cfgPath = ActiveProjectDirectory + "/generated/build_world_packed_col.cfg"
+	shutil.copy(cfgPath, "build_world_packed_col.cfg")
+	printLog(log, ">>> Build pz <<<")
+	subprocess.call([ BuildWorldPackedCol, "build_world_packed_col.cfg" ])
+printLog(log, "")
+
+log.close()
+
+
+# end of file

code/nel/tools/build_gamedata/processes/pz/3_install.py

@@ -0,0 +1,58 @@
+#!/usr/bin/python
+# 
+# \file 3_install.py
+# \brief Install pz
+# \date 2014-09-13 13:32GMT
+# \author Jan Boon (Kaetemi)
+# Python port of game data build pipeline.
+# Install pz
+# 
+# NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+# Copyright (C) 2014  Jan BOON
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+import time, sys, os, shutil, subprocess, distutils.dir_util
+sys.path.append("../../configuration")
+
+if os.path.isfile("log.log"):
+	os.remove("log.log")
+log = open("log.log", "w")
+from scripts import *
+from buildsite import *
+from process import *
+from tools import *
+from directories import *
+
+printLog(log, "")
+printLog(log, "-------")
+printLog(log, "--- Install pz")
+printLog(log, "-------")
+printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
+printLog(log, "")
+
+installPath = InstallDirectory + "/" + PackedZoneInstallDirectory
+mkPath(log, installPath)
+
+printLog(log, ">>> Install pz <<<")
+mkPath(log, ExportBuildDirectory + "/" + PackedZoneBuildDirectory)
+copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + PackedZoneBuildDirectory, installPath, ".island_hm")
+copyFilesExtNoTreeIfNeeded(log, ExportBuildDirectory + "/" + PackedZoneBuildDirectory, installPath, ".packed_island")
+
+printLog(log, "")
+log.close()
+
+
+# end of file