Added: #929 Rbank build process for build pipeline.

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

@@ -25,8 +25,8 @@
 # 
 
 # *** PROCESS TIMEOUT ***
-SkelExportTimeout = 60000
+SkelExportTimeout = 600000
-SwtExportTimeout = 60000
+SwtExportTimeout = 600000
 ShapeExportTimeout = 3600000
 ZoneExportTimeout = 1800000
 ZoneBuildDependTimeout = 1800000
@@ -39,15 +39,15 @@ AnimExportTimeout = 1800000
 IgExportTimeout = 600000
 MapsBuildTimeout = 10000
 CmbExportTimeout = 60000
-RbankBuildTesselTimeout = 60000
+RbankBuildTesselTimeout = 6000000
-RbankBuildSmoothTimeout = 60000
+RbankBuildSmoothTimeout = 6000000
-RbankBuildProclocalTimeout = 60000
+RbankBuildProclocalTimeout = 6000000
-RbankBuildProcglobalTimeout = 180000
+RbankBuildProcglobalTimeout = 18000000
-RbankBuildIndoorTimeout = 180000
+RbankBuildIndoorTimeout = 18000000
 # WmapBuildTimeout = 60000
 LigoExportTimeout = 3600000
 LigoBuildTimeout = 1800000
-PacsPrimExportTimeout = 60000
+PacsPrimExportTimeout = 600000
 
 # *** TOOLS CONFIGURATION ***
 

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

@@ -46,22 +46,10 @@ printLog(log, "")
 # Setup source directories
 printLog(log, ">>> Setup source directories <<<")
 mkPath(log, LeveldesignWorldDirectory)
-#for dir in rbankSourceDirectories:
-#	mkPath(log, DatabaseDirectory + "/" + dir)
-#for dir in rbankDxtcSourceDirectories:
-#	mkPath(log, DatabaseDirectory + "/" + dir)
-#for dir in rbankFullscreenSourceDirectories:
-#	mkPath(log, DatabaseDirectory + "/" + dir)
-#for dir in rbank3DSourceDirectories:
-#	mkPath(log, DatabaseDirectory + "/" + dir)
 
 # Setup export directories
 printLog(log, ">>> Setup export directories <<<")
 mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory)
-#mkPath(log, ExportBuildDirectory + "/" + rbankExportDirectory)
-#mkPath(log, ExportBuildDirectory + "/" + rbankDxtcExportDirectory)
-#mkPath(log, ExportBuildDirectory + "/" + rbankFullscreenExportDirectory)
-#mkPath(log, ExportBuildDirectory + "/" + rbank3DExportDirectory)
 
 # Setup build directories
 printLog(log, ">>> Setup build directories <<<")
@@ -79,6 +67,7 @@ mkPath(log, ExportBuildDirectory + "/" + RbankRawBuildDirectory)
 mkPath(log, ExportBuildDirectory + "/" + RbankPreprocBuildDirectory)
 mkPath(log, ExportBuildDirectory + "/" + RbankMeshBuildDirectory)
 mkPath(log, ExportBuildDirectory + "/" + RbankRetrieversBuildDirectory)
+mkPath(log, ExportBuildDirectory + "/" + RbankOutputBuildDirectory)
 
 # Setup client directories
 printLog(log, ">>> Setup client directories <<<")

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

@@ -36,8 +36,6 @@ from process import *
 from tools import *
 from directories import *
 
-# ################### result = subprocess.Popen([ dfdsklfjslk ], stdout = PIPE).communicate()[0]  ######################################
-
 printLog(log, "")
 printLog(log, "-------")
 printLog(log, "--- Export rbank")
@@ -46,50 +44,14 @@ printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
 printLog(log, "")
 
 # Find tools
-TgaToDds = findTool(log, ToolDirectories, TgaToDdsTool, ToolSuffix)
 printLog(log, "")
 
 # For each rbank directory
-printLog(log, ">>> Export rbank test 1 <<<")
+printLog(log, ">>> Export rbank 3dsmax <<<")
-#mkPath(log, ExportBuildDirectory + "/" + rbankExportDirectory)
+printLog(log, "********************************")
-#for dir in rbankSourceDirectories:
+printLog(log, "********      TODO      ********")
-#	mkPath(log, DatabaseDirectory + "/" + dir)
+printLog(log, "********************************")
-#	niouname = dir.replace("/", "_")
-#	newpath = ExportBuildDirectory + "/" + rbankExportDirectory + "/" + niouname
-#	mkPath(log, newpath)
-#	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, newpath, ".tga")
-printLog(log, "")
 
-# For each rbank directory to compress in one DXTC
-printLog(log, ">>> Export rbank test 2 <<<")
-#mkPath(log, ExportBuildDirectory + "/" + rbankDxtcExportDirectory)
-#for dir in rbankDxtcSourceDirectories:
-#	mkPath(log, DatabaseDirectory + "/" + dir)
-#	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, ExportBuildDirectory + "/" + rbankDxtcExportDirectory, ".tga")
-printLog(log, "")
-
-# For each rbank fullscreen directory compress independently all in dds
-printLog(log, ">>> Export rbank test 3 <<<")
-#if TgaToDds == "":
-#	toolLogFail(log, TgaToDdsTool, ToolSuffix)
-#else:
-#	mkPath(log, ExportBuildDirectory + "/" + rbankFullscreenExportDirectory)
-#	for dir in rbankFullscreenSourceDirectories:
-#		mkPath(log, DatabaseDirectory + "/" + dir)
-#		files = findFiles(log, DatabaseDirectory + "/" + dir, "", ".tga")
-#		for file in files:
-#			sourceFile = DatabaseDirectory + "/" + dir + "/" + file
-#			destFile = ExportBuildDirectory + "/" + rbankFullscreenExportDirectory + "/" + os.path.basename(file)[0:-len(".tga")] + ".dds"
-#			if needUpdateLogRemoveDest(log, sourceFile, destFile):
-#				subprocess.call([ TgaToDds, sourceFile, "-o", destFile, "-a", "5" ])
-printLog(log, "")
-
-# For each rbank 3d directory
-printLog(log, ">>> Export rbank test 4 <<<")
-#mkPath(log, ExportBuildDirectory + "/" + rbank3DExportDirectory)
-#for dir in rbank3DSourceDirectories:
-#	mkPath(log, DatabaseDirectory + "/" + dir)
-#	copyFilesExtNoTreeIfNeeded(log, DatabaseDirectory + "/" + dir, ExportBuildDirectory + "/" + rbank3DExportDirectory, ".tga")
 printLog(log, "")
 
 log.close()

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

@@ -88,11 +88,13 @@ cf = open("build_rbank.cfg", "w")
 cf.write("\n")
 cf.write("// Rbank settings\n")
 cf.write("\n")
+cf.write("Verbose = " + str(RBankVerbose) + ";\n")
+cf.write("ConsistencyCheck = " + str(RBankConsistencyCheck) + ";\n")
 mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory)
 cf.write("ZonePath = \"" + ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/\";\n")
 mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory)
 cf.write("BanksPath = \"" + ExportBuildDirectory + "/" + SmallbankExportDirectory + "/\";\n")
-cf.write("Bank = \"" + ExportBuildDirectory + "/" + SmallbankExportDirectory + "/" + RbankBankName + ".smallbank\";\n")
+cf.write("Bank = \"" + ExportBuildDirectory + "/" + SmallbankExportDirectory + "/" + BankTileBankName + ".smallbank\";\n")
 cf.write("ZoneExt = \".zonew\";\n")
 cf.write("ZoneNHExt = \".zonenhw\";\n")
 cf.write("IGBoxes = \"" + ExportBuildDirectory + "/" + RbankBboxBuildDirectory + "/temp.bbox\";\n")

code/ryzom/tools/build_gamedata/workspace/continents/newbieland/directories.py

@@ -87,9 +87,13 @@ IgLandBuildDirectory = "_invalid"
 IgVillageBuildDirectory = "_invalid"
 
 # Rbank directories
-RbankCmbBuildDirectory = ContinentPath + "/rbank_cmb"
+RbankBboxBuildDirectory = ContinentPath + "/rbank_bbox"
-
+RbankTessellationBuildDirectory = ContinentPath + "/rbank_tessellation"
-# Rbank directories
+RbankSmoothBuildDirectory = ContinentPath + "/rbank_smooth"
+RbankRawBuildDirectory = ContinentPath + "/rbank_raw"
+RbankPreprocBuildDirectory = ContinentPath + "/rbank_preproc"
+RbankMeshBuildDirectory = ContinentPath + "/rbank_cmb"
+RbankRetrieversBuildDirectory = ContinentPath + "/rbank_retrievers"
 RbankOutputBuildDirectory = ContinentPath + "/rbank_output"
 
 

code/ryzom/tools/build_gamedata/workspace/continents/newbieland/process.py

@@ -33,7 +33,7 @@ ProcessToComplete += [ "ligo" ] # not fully implemented, works for this process
 ProcessToComplete += [ "zone" ]
 #ProcessToComplete += [ "ig" ] # not implemented
 ProcessToComplete += [ "zone_light" ]
-#ProcessToComplete += [ "rbank" ]
+ProcessToComplete += [ "rbank" ]
 #ProcessToComplete += [ "ig_light" ]
 #ProcessToComplete += [ "ps" ]
 
@@ -72,6 +72,8 @@ ZoneRegion = [ "65_bz", "77_cs" ]
 # *** RBANK OPTIONS ***
 
 # Options
+RBankVerbose = 0
+RBankConsistencyCheck = 0
 RbankReduceSurfaces = 1
 RbankSmoothBorders = 1
 RbankComputeElevation = 0