mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ZAE support

metadata
Wenzel Jakob 2010-08-30 20:12:23 +02:00
parent 25730ec2eb
commit 369e5db618
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/converter/converter.cpp
View File

@ -158,12 +158,12 @@ void GeometryConverter::convert(const std::string &inputFile,
std::ostringstream os; std::ostringstream os;
SLog(EInfo, "Beginning conversion .."); SLog(EInfo, "Beginning conversion ..");
if (endsWith(toLowerCase(inputFile), ".dae")) { if (endsWith(toLowerCase(inputFile), ".dae") || endsWith(toLowerCase(inputFile), ".zae")) {
convertCollada(inputFile, os, textureDirectory, meshesDirectory); convertCollada(inputFile, os, textureDirectory, meshesDirectory);
} else if (endsWith(toLowerCase(inputFile), ".obj")) { } else if (endsWith(toLowerCase(inputFile), ".obj")) {
convertOBJ(inputFile, os, textureDirectory, meshesDirectory); convertOBJ(inputFile, os, textureDirectory, meshesDirectory);
} else { } else {
SLog(EError, "Unknown input format (must end in either .DAE or .OBJ)"); SLog(EError, "Unknown input format (must end in either .DAE, .ZAE or .OBJ)");
} }
if (adjustmentFile != "") { if (adjustmentFile != "") {

4
src/converter/mtsimport.cpp
View File

@ -1,7 +1,7 @@
/** /**
* Mitsuba COLLADA 1.4 and Wavefront OBJ -> XML converter * Mitsuba COLLADA 1.4 and Wavefront OBJ -> XML converter
* *
* Takes a DAE or OBJ file and turns it into a scene description and separate mesh files * Takes a DAE, ZAE or OBJ file and turns it into a scene description and separate mesh files
* using a compact binary format. All associated files are copied into newly created * using a compact binary format. All associated files are copied into newly created
* 'textures' and 'meshes' directories * 'textures' and 'meshes' directories
* *
@ -53,7 +53,7 @@ public:
void help() { void help() {
cout << "COLLADA 1.4 & Wavefront OBJ Importer, Copyright (c) " MTS_YEAR " Wenzel Jakob" << endl cout << "COLLADA 1.4 & Wavefront OBJ Importer, Copyright (c) " MTS_YEAR " Wenzel Jakob" << endl
<< "Syntax: mtsimport [options] <DAE/OBJ scene> <XML output file> [Adjustment file]" << endl << "Syntax: mtsimport [options] <DAE/ZAE/OBJ scene> <XML output file> [Adjustment file]" << endl
<< "Options/Arguments:" << endl << "Options/Arguments:" << endl
<< " -h Display this help text" << endl << endl << " -h Display this help text" << endl << endl
<< " -a p1;p2;.. Add one or more entries to the resource search path" << endl << endl << " -a p1;p2;.. Add one or more entries to the resource search path" << endl << endl

2
src/qtgui/importdlg.cpp
View File

@ -35,7 +35,7 @@ void ImportDialog::changeEvent(QEvent *e) {
void ImportDialog::on_inputBrowse_clicked(bool checked) { void ImportDialog::on_inputBrowse_clicked(bool checked) {
QFileDialog dialog(this); QFileDialog dialog(this);
dialog.setNameFilter(tr("COLLADA 1.4 scenes (*.dae);; Wavefront OBJ scenes (*.obj)")); dialog.setNameFilter(tr("COLLADA 1.4 scenes (*.dae *.zae);; Wavefront OBJ scenes (*.obj)"));
dialog.setAcceptMode(QFileDialog::AcceptOpen); dialog.setAcceptMode(QFileDialog::AcceptOpen);
dialog.setViewMode(QFileDialog::Detail); dialog.setViewMode(QFileDialog::Detail);
dialog.setWindowModality(Qt::ApplicationModal); dialog.setWindowModality(Qt::ApplicationModal);