Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with default

Browse source
This commit is contained in:
kaetemi 2014-02-06 20:16:18 +01:00
commit 652f6b5247
14 changed files with 92 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
code/nel/tools/3d/object_viewer_qt/src/3rdparty/qtpropertybrowser/qteditorfactory.cpp vendored
View file

@ -104,8 +104,8 @@
#include <QtGui/QDialog>
#include <QtGui/QPlainTextEdit>
#include <QtGui/QTextEdit>
#include <QCompleter>
#include <QColumnView>
#include <QCompleter>
#include <QColumnView>
#include <QStandardItemModel>
#include <QtGui/QDialogButtonBox>
#include <QtGui/QSpacerItem>
@ -2792,25 +2792,25 @@ void QtTextEditWidget::setStateResetButton(bool enabled)
void QtTextEditWidget::buttonClicked()
{
QGridLayout *gridLayout;
QPlainTextEdit *plainTextEdit;
QDialogButtonBox *buttonBox;
QDialog *dialog;
dialog = new QDialog(this);
dialog->resize(400, 300);
gridLayout = new QGridLayout(dialog);
plainTextEdit = new QPlainTextEdit(dialog);
gridLayout->addWidget(plainTextEdit, 0, 0, 1, 1);
buttonBox = new QDialogButtonBox(dialog);
buttonBox->setOrientation(Qt::Horizontal);
buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
gridLayout->addWidget(buttonBox, 1, 0, 1, 1);
QObject::connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
QGridLayout *gridLayout;
QPlainTextEdit *plainTextEdit;
QDialogButtonBox *buttonBox;
QDialog *dialog;
dialog = new QDialog(this);
dialog->resize(400, 300);
gridLayout = new QGridLayout(dialog);
plainTextEdit = new QPlainTextEdit(dialog);
gridLayout->addWidget(plainTextEdit, 0, 0, 1, 1);
buttonBox = new QDialogButtonBox(dialog);
buttonBox->setOrientation(Qt::Horizontal);
buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
gridLayout->addWidget(buttonBox, 1, 0, 1, 1);
QObject::connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
QObject::connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
plainTextEdit->textCursor().insertText(m_lineEdit->text());

13
code/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py
View file

@ -145,18 +145,19 @@ VegetTagExportDirectory = CommonPath + "/veget_tag"
VegetSetExportDirectory = CommonPath + "/veget_set"
# Ligo directories
LigoDatabaseExportDirectory = "landscape/ligo/" + EcosystemName
LigoDatabaseIgExportDirectory = LigoDatabaseExportDirectory + "/igs"
LigoDatabaseZoneExportDirectory = LigoDatabaseExportDirectory + "/zones"
LigoDatabaseZoneLigoExportDirectory = LigoDatabaseExportDirectory + "/zoneligos"
LigoDatabaseCmbExportDirectory = LigoDatabaseExportDirectory + "/cmb"
LigoTagExportDirectory = CommonPath + "/ligo_tag"
LigoEcosystemExportDirectory = CommonPath + "/ligo_es"
LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
LigoEcosystemTagExportDirectory = CommonPath + "/ligo_es_tag"
# Zone directories
ZoneExportDirectory = CommonPath + "/zone"
# PACS primitives directories
PacsPrimExportDirectory = CommonPath + "/pacs_prim"
PacsPrimTagExportDirectory = CommonPath + "/pacs_prim_tag"
# *** BUILD DIRECTORIES FOR THE BUILD PIPELINE ***

22
code/nel/tools/build_gamedata/processes/ligo/0_setup.py
View file

@ -52,12 +52,12 @@ mkPath(log, DatabaseDirectory + "/" + ZoneSourceDirectory[0])
# Setup export directories
printLog(log, ">>> Setup export directories <<<")
mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseIgExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseZoneExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseZoneLigoExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseCmbExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoTagExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemIgExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemZoneExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemZoneLigoExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemCmbExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + ZoneExportDirectory)
# Setup build directories
@ -83,11 +83,11 @@ if LigoExportLand != "":
cf.write("OutIGDir = \"" + ExportBuildDirectory + "/" + LigoIgLandBuildDirectory + "\";\n")
cf.write("AdditionnalIGOutDir = \"" + ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory + "\";\n")
cf.write("\n")
cf.write("RefZoneDir = \"" + DatabaseDirectory + "/" + LigoDatabaseZoneExportDirectory+ "\";\n") # FIXME
cf.write("RefIGDir = \"" + DatabaseDirectory + "/" + LigoDatabaseIgExportDirectory + "\";\n")
cf.write("AdditionnalIGInDir = \"" + DatabaseDirectory + "/" + LigoDatabaseIgExportDirectory + "\";\n") # FIXME
cf.write("RefZoneDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemZoneExportDirectory+ "\";\n") # FIXME
cf.write("RefIGDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemIgExportDirectory + "\";\n")
cf.write("AdditionnalIGInDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemIgExportDirectory + "\";\n") # FIXME
cf.write("ContinentsDir = \"" + LeveldesignWorldDirectory + "\";\n")
cf.write("LigoBankDir = \"" + DatabaseDirectory + "/" + LigoDatabaseZoneLigoExportDirectory + "\";\n") # FIXME
cf.write("LigoBankDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemZoneLigoExportDirectory + "\";\n") # FIXME
cf.write("\n")
cf.write("TileBankFile = \"" + DatabaseDirectory + "/" + LigoTileBankFile + "\";\n")
cf.write("\n")
@ -102,7 +102,7 @@ if LigoExportLand != "":
cf.write("Threshold = 1;\n")
cf.write("\n")
cf.write("DFNDir = \"" + LeveldesignDfnDirectory + "\";\n")
cf.write("RefCMBDir = \"" + DatabaseDirectory + "/" + LigoDatabaseCmbExportDirectory + "\";\n") # FIXME
cf.write("RefCMBDir = \"" + ExportBuildDirectory + "/" + LigoEcosystemCmbExportDirectory + "\";\n") # FIXME
cf.write("OutCMBDir = \"" + ExportBuildDirectory + "/" + RBankCmbExportDirectory + "\";\n")
cf.write("\n")
cf.write("ContinentFile = \"" + LeveldesignWorldDirectory + "/" + ContinentFile + "\";\n")

18
code/nel/tools/build_gamedata/processes/ligo/1_export.py
View file

@ -55,23 +55,23 @@ if LigoExportLand == "" or LigoExportOnePass == 1:
ligoIniPath = MaxUserDirectory + "/plugcfg/nelligo.ini"
mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseIgExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseZoneExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseZoneLigoExportDirectory)
mkPath(log, DatabaseDirectory + "/" + LigoDatabaseCmbExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemIgExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemZoneExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemZoneLigoExportDirectory)
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemCmbExportDirectory)
mkPath(log, DatabaseDirectory + "/" + ZoneSourceDirectory[0])
mkPath(log, ExportBuildDirectory + "/" + LigoTagExportDirectory)
if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory, ".max", ExportBuildDirectory + "/" + LigoTagExportDirectory, ".max.tag")):
mkPath(log, ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory)
if (needUpdateDirByTagLog(log, DatabaseDirectory + "/" + LigoMaxSourceDirectory, ".max", ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory, ".max.tag")):
printLog(log, "WRITE " + ligoIniPath)
ligoIni = open(ligoIniPath, "w")
ligoIni.write("[LigoConfig]\n")
ligoIni.write("LigoPath=" + DatabaseDirectory + "/" + LigoMaxSourceDirectory + "/\n")
ligoIni.write("LigoExportPath=" + DatabaseDirectory + "/" + LigoDatabaseExportDirectory + "/\n")
ligoIni.write("LigoExportPath=" + ExportBuildDirectory + "/" + LigoEcosystemExportDirectory + "/\n")
ligoIni.write("LigoOldZonePath=" + DatabaseDirectory + "/" + ZoneSourceDirectory[0] + "/\n")
ligoIni.close()
outDirTag = ExportBuildDirectory + "/" + LigoTagExportDirectory
outDirTag = ExportBuildDirectory + "/" + LigoEcosystemTagExportDirectory
logFile = ScriptDirectory + "/processes/ligo/log.log"
smallBank = ExportBuildDirectory + "/" + SmallbankExportDirectory + "/" + BankTileBankName + ".smallbank"

12
code/ryzom/tools/build_gamedata/workspace/continents/indoors/directories.py
View file

@ -163,12 +163,12 @@ ShapeLightmapNotOptimizedExportDirectory = CommonPath + "/shape_lightmap_not_opt
ShapeAnimExportDirectory = CommonPath + "/shape_anim"
# Ligo directories
LigoDatabaseExportDirectory = "landscape/ligo/" + EcosystemName
LigoDatabaseIgExportDirectory = LigoDatabaseExportDirectory + "/igs"
LigoDatabaseZoneExportDirectory = LigoDatabaseExportDirectory + "/zones"
LigoDatabaseZoneLigoExportDirectory = LigoDatabaseExportDirectory + "/zoneligos"
LigoDatabaseCmbExportDirectory = LigoDatabaseExportDirectory + "/cmb"
LigoTagExportDirectory = "ecosystems/" + EcosystemName + "/ligo_tag"
LigoEcosystemExportDirectory = EcosystemPath + "/ligo_es"
LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
LigoEcosystemTagExportDirectory = EcosystemPath + "/ligo_es_tag"
# Zone directories
ZoneExportDirectory = ContinentPath + "/zone"

12
code/ryzom/tools/build_gamedata/workspace/continents/newbieland/directories.py
View file

@ -136,12 +136,12 @@ ShapeLightmapNotOptimizedExportDirectory = CommonPath + "/shape_lightmap_not_opt
ShapeAnimExportDirectory = CommonPath + "/shape_anim"
# Ligo directories
LigoDatabaseExportDirectory = "landscape/ligo/" + EcosystemName
LigoDatabaseIgExportDirectory = LigoDatabaseExportDirectory + "/igs"
LigoDatabaseZoneExportDirectory = LigoDatabaseExportDirectory + "/zones"
LigoDatabaseZoneLigoExportDirectory = LigoDatabaseExportDirectory + "/zoneligos"
LigoDatabaseCmbExportDirectory = LigoDatabaseExportDirectory + "/cmb"
LigoTagExportDirectory = "ecosystems/" + EcosystemName + "/ligo_tag"
LigoEcosystemExportDirectory = EcosystemPath + "/ligo_es"
LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
LigoEcosystemTagExportDirectory = EcosystemPath + "/ligo_es_tag"
# Zone directories
ZoneExportDirectory = ContinentPath + "/zone"

14
code/ryzom/tools/build_gamedata/workspace/ecosystems/desert/directories.py
View file

@ -6,7 +6,7 @@
#
# \file directories.py
# \brief Directories configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# \date 2001-2005
# \author Nevrax
@ -194,12 +194,12 @@ VegetTagExportDirectory = CommonPath + "/veget_tag"
VegetSetExportDirectory = CommonPath + "/veget_set"
# Ligo directories
LigoDatabaseExportDirectory = "landscape/ligo/" + EcosystemName
LigoDatabaseIgExportDirectory = LigoDatabaseExportDirectory + "/igs"
LigoDatabaseZoneExportDirectory = LigoDatabaseExportDirectory + "/zones"
LigoDatabaseZoneLigoExportDirectory = LigoDatabaseExportDirectory + "/zoneligos"
LigoDatabaseCmbExportDirectory = LigoDatabaseExportDirectory + "/cmb"
LigoTagExportDirectory = CommonPath + "/ligo_tag"
LigoEcosystemExportDirectory = CommonPath + "/ligo_es"
LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
LigoEcosystemTagExportDirectory = CommonPath + "/ligo_es_tag"
# Zone directories
ZoneExportDirectory = CommonPath + "/zone"

2
code/ryzom/tools/build_gamedata/workspace/ecosystems/desert/process.py
View file

@ -6,7 +6,7 @@
#
# \file config.py
# \brief Process configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# Python port of game data build pipeline.
# Process configuration for 'desert' ecosystem.

14
code/ryzom/tools/build_gamedata/workspace/ecosystems/jungle/directories.py
View file

@ -6,7 +6,7 @@
#
# \file directories.py
# \brief Directories configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# \date 2001-2005
# \author Nevrax
@ -198,12 +198,12 @@ VegetTagExportDirectory = CommonPath + "/veget_tag"
VegetSetExportDirectory = CommonPath + "/veget_set"
# Ligo directories
LigoDatabaseExportDirectory = "landscape/ligo/" + EcosystemName
LigoDatabaseIgExportDirectory = LigoDatabaseExportDirectory + "/igs"
LigoDatabaseZoneExportDirectory = LigoDatabaseExportDirectory + "/zones"
LigoDatabaseZoneLigoExportDirectory = LigoDatabaseExportDirectory + "/zoneligos"
LigoDatabaseCmbExportDirectory = LigoDatabaseExportDirectory + "/cmb"
LigoTagExportDirectory = CommonPath + "/ligo_tag"
LigoEcosystemExportDirectory = CommonPath + "/ligo_es"
LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
LigoEcosystemTagExportDirectory = CommonPath + "/ligo_es_tag"
# Zone directories
ZoneExportDirectory = CommonPath + "/zone"

2
code/ryzom/tools/build_gamedata/workspace/ecosystems/jungle/process.py
View file

@ -6,7 +6,7 @@
#
# \file config.py
# \brief Process configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# Python port of game data build pipeline.
# Process configuration for 'jungle' ecosystem.

14
code/ryzom/tools/build_gamedata/workspace/ecosystems/lacustre/directories.py
View file

@ -6,7 +6,7 @@
#
# \file directories.py
# \brief Directories configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# \date 2001-2005
# \author Nevrax
@ -206,12 +206,12 @@ VegetTagExportDirectory = CommonPath + "/veget_tag"
VegetSetExportDirectory = CommonPath + "/veget_set"
# Ligo directories
LigoDatabaseExportDirectory = "landscape/ligo/" + EcosystemName
LigoDatabaseIgExportDirectory = LigoDatabaseExportDirectory + "/igs"
LigoDatabaseZoneExportDirectory = LigoDatabaseExportDirectory + "/zones"
LigoDatabaseZoneLigoExportDirectory = LigoDatabaseExportDirectory + "/zoneligos"
LigoDatabaseCmbExportDirectory = LigoDatabaseExportDirectory + "/cmb"
LigoTagExportDirectory = CommonPath + "/ligo_tag"
LigoEcosystemExportDirectory = CommonPath + "/ligo_es"
LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
LigoEcosystemTagExportDirectory = CommonPath + "/ligo_es_tag"
# Zone directories
ZoneExportDirectory = CommonPath + "/zone"

2
code/ryzom/tools/build_gamedata/workspace/ecosystems/lacustre/process.py
View file

@ -6,7 +6,7 @@
#
# \file config.py
# \brief Process configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# Python port of game data build pipeline.
# Process configuration for 'lacustre' ecosystem.

14
code/ryzom/tools/build_gamedata/workspace/ecosystems/primes_racines/directories.py
View file

@ -6,7 +6,7 @@
#
# \file directories.py
# \brief Directories configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# \date 2001-2005
# \author Nevrax
@ -191,12 +191,12 @@ VegetTagExportDirectory = CommonPath + "/veget_tag"
VegetSetExportDirectory = CommonPath + "/veget_set"
# Ligo directories
LigoDatabaseExportDirectory = "landscape/ligo/" + EcosystemName
LigoDatabaseIgExportDirectory = LigoDatabaseExportDirectory + "/igs"
LigoDatabaseZoneExportDirectory = LigoDatabaseExportDirectory + "/zones"
LigoDatabaseZoneLigoExportDirectory = LigoDatabaseExportDirectory + "/zoneligos"
LigoDatabaseCmbExportDirectory = LigoDatabaseExportDirectory + "/cmb"
LigoTagExportDirectory = CommonPath + "/ligo_tag"
LigoEcosystemExportDirectory = CommonPath + "/ligo_es"
LigoEcosystemIgExportDirectory = LigoEcosystemExportDirectory + "/igs"
LigoEcosystemZoneExportDirectory = LigoEcosystemExportDirectory + "/zones"
LigoEcosystemZoneLigoExportDirectory = LigoEcosystemExportDirectory + "/zoneligos"
LigoEcosystemCmbExportDirectory = LigoEcosystemExportDirectory + "/cmb"
LigoEcosystemTagExportDirectory = CommonPath + "/ligo_es_tag"
# Zone directories
ZoneExportDirectory = CommonPath + "/zone"

2
code/ryzom/tools/build_gamedata/workspace/ecosystems/primes_racines/process.py
View file

@ -6,7 +6,7 @@
#
# \file config.py
# \brief Process configuration
# \date 2010-09-19-14-19-GMT
# \date 2013-07-27-02-01-GMT
# \author Jan Boon (Kaetemi)
# Python port of game data build pipeline.
# Process configuration for 'primes_racines' ecosystem.