Menu
▾
▴
[COLLADAMaya-svncommit] SF.net SVN: colladamaya:[372] branches/nextgen/COLLADAMax
|
From: <rob...@us...> - 2009-02-24 11:28:54
|
Revision: 372
http://colladamaya.svn.sourceforge.net/colladamaya/?rev=372&view=rev
Author: robertwuerfel
Date: 2009-02-24 11:28:52 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
update export dialog
add release build script ( only for use with our msi builder project )
Modified Paths:
--------------
branches/nextgen/COLLADAMax/include/COLLADAMaxGeometryExporter.h
branches/nextgen/COLLADAMax/res/ColladaMax.rc
branches/nextgen/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp
Added Paths:
-----------
branches/nextgen/COLLADAMax/scripts/make_release_for_installer.bat
Modified: branches/nextgen/COLLADAMax/include/COLLADAMaxGeometryExporter.h
===================================================================
--- branches/nextgen/COLLADAMax/include/COLLADAMaxGeometryExporter.h 2009-02-24 10:19:30 UTC (rev 371)
+++ branches/nextgen/COLLADAMax/include/COLLADAMaxGeometryExporter.h 2009-02-24 11:28:52 UTC (rev 372)
@@ -91,6 +91,9 @@
/** True if object must be deleted by us.*/
bool mDeleteObject;
+ /** True, if normals should be exported*/
+ bool mExportNormals;
+
/** True, if TEXTANGENS and TEXNORMALS should be generated*/
bool mExportTextangentsAndNormals;
Modified: branches/nextgen/COLLADAMax/res/ColladaMax.rc
===================================================================
--- branches/nextgen/COLLADAMax/res/ColladaMax.rc 2009-02-24 10:19:30 UTC (rev 371)
+++ branches/nextgen/COLLADAMax/res/ColladaMax.rc 2009-02-24 11:28:52 UTC (rev 372)
@@ -44,12 +44,12 @@
GROUPBOX "Animation",IDC_STATIC,7,80,259,40
CONTROL "Triangulate",IDC_GEOM_TRIANGLES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,49,69,10
CONTROL "Sample animation",IDC_ANIM_SAMPLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,105,71,10
- CONTROL "Create clip",IDC_ANIM_CLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,92,49,10
+ CONTROL "Create clip",IDC_ANIM_CLIP,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,84,92,49,10
GROUPBOX "Standard Options",IDC_STATIC,7,6,259,28
CONTROL "Bake Matrices",IDC_BAKE_MATRICES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,19,61,10
- CONTROL "Relative Paths",IDC_RELATIVE_PATHS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,84,19,62,10
+ CONTROL "Relative Paths",IDC_RELATIVE_PATHS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,84,19,62,10
CONTROL "Tangents/Binormals",IDC_GEOM_TANGENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,61,79,10
- CONTROL "Include XRefs",IDC_GEOM_XREFS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,163,49,69,10
+ CONTROL "Include XRefs",IDC_GEOM_XREFS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,163,49,69,10
CONTROL "Enable export",IDC_ANIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,92,59,10
END
@@ -295,7 +295,7 @@
IDS_COLLADASW_EFFECT_CLASS_NAME "ColladaEffect"
IDS_CATEGORY_I "Import"
IDS_CLASS_NAME_I "ColladaImporter"
- IDS_COLLADASW_XREF_CA "COLLADASW XRef"
+ IDS_COLLADASW_XREF_CA "COLLADASW XRef"
IDS_COLLADASW_EFFECT_NAME "Collada Effect"
IDS_CE_NAME "Techniques"
IDS_CE_TECHNIQUES "Techniques"
@@ -308,7 +308,7 @@
STRINGTABLE
BEGIN
- IDS_COLLADASW_A_PARAMS "COLLADASW Params"
+ IDS_COLLADASW_A_PARAMS "COLLADASW Params"
IDS_CLASS_NAME_A "ColladaXml"
IDS_CLASS_NAME_XREF "ColladaXRef"
IDS_CE_SHADERS_PARAMS "Shaders"
@@ -316,7 +316,7 @@
STRINGTABLE
BEGIN
- IDS_COLLADASW_XREF_ID "Collada ID"
+ IDS_COLLADASW_XREF_ID "Collada ID"
IDS_CE_BOOL "My check box"
END
Added: branches/nextgen/COLLADAMax/scripts/make_release_for_installer.bat
===================================================================
--- branches/nextgen/COLLADAMax/scripts/make_release_for_installer.bat (rev 0)
+++ branches/nextgen/COLLADAMax/scripts/make_release_for_installer.bat 2009-02-24 11:28:52 UTC (rev 372)
@@ -0,0 +1,53 @@
+@echo off & setlocal
+
+SET VERSION=0.8.1.217_alpha
+
+SET DESTINATION=%MAXMAYA_INSTALLER_PATH%\ColladaMaxInstaller\bin
+
+SET LOGFILE=release_log.txt
+SET WD=%CD%
+
+
+CALL "C:\netallied\software\vs2005\VC\vcvarsall.bat"
+
+del /Q %WD%\%LOGFILE%
+
+
+
+devenv ..\COLLADAMax.sln /build "Release Max8|Win32" > %LOGFILE%
+copy "..\bin\win\win32\release max8\COLLADAMaxNew.dle" %DESTINATION%\max8-x86 > %LOGFILE%
+
+
+devenv ..\COLLADAMax.sln /build "Release Max9|Win32" >> %LOGFILE%
+copy "..\bin\win\win32\release max9\COLLADAMaxNew.dle" %DESTINATION%\max9-x86 >> %LOGFILE%
+
+devenv ..\COLLADAMax.sln /build "Release Max9|x64"
+copy "..\bin\win\x64\release max9\COLLADAMaxNew.dle" %DESTINATION%\max9-x64 >> %LOGFILE%
+
+
+devenv ..\COLLADAMax.sln /build "Release Max2008|Win32" >> %LOGFILE%
+copy "..\bin\win\win32\release max2008\COLLADAMaxNew.dle" %DESTINATION%\max2008-x86 >> %LOGFILE%
+
+devenv ..\COLLADAMax.sln /build "Release Max2008|x64"
+copy "..\bin\win\x64\release max2008\COLLADAMaxNew.dle" %DESTINATION%\max2008-x64 >> %LOGFILE%
+
+
+devenv ..\COLLADAMax.sln /build "Release Max2009|Win32" >> %LOGFILE%
+copy "..\bin\win\win32\release max2009\COLLADAMaxNew.dle" %DESTINATION%\max2009-x86 >> %LOGFILE%
+
+devenv ..\COLLADAMax.sln /build "Release Max2009|x64"
+copy "..\bin\win\x64\release max2009\COLLADAMaxNew.dle" %DESTINATION%\max2009-x64 >> %LOGFILE%
+
+
+
+pause
+
+
+
+
+
+
+
+
+
+
Modified: branches/nextgen/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp
===================================================================
--- branches/nextgen/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp 2009-02-24 10:19:30 UTC (rev 371)
+++ branches/nextgen/COLLADAMax/src/COLLADAMaxGeometryExporter.cpp 2009-02-24 11:28:52 UTC (rev 372)
@@ -88,7 +88,8 @@
mTriObject ( 0 ),
mGeomObject ( 0 ),
mDeleteObject ( false ),
- mExportTextangentsAndNormals(documentExporter->getOptions().getExportTangents())
+ mExportNormals( documentExporter->getOptions().getExportNormals() ),
+ mExportTextangentsAndNormals( mExportNormals && documentExporter->getOptions().getExportTangents() )
{}
//---------------------------------------------------------------
@@ -102,7 +103,8 @@
mTriObject ( 0 ),
mGeomObject ( 0 ),
mDeleteObject ( false ) ,
- mExportTextangentsAndNormals(documentExporter->getOptions().getExportTangents())
+ mExportNormals( documentExporter->getOptions().getExportNormals() ),
+ mExportTextangentsAndNormals( mExportNormals && documentExporter->getOptions().getExportTangents() )
{}
@@ -167,7 +169,7 @@
Class_ID id = object->ClassID();
- bool exportEPolyAsTriangles = mDocumentExporter->getOptions().getExportEPolyAsTriangles();
+ bool exportEPolyAsTriangles = mDocumentExporter->getOptions().getExportEPolyAsTriangles() || mExportTextangentsAndNormals;
if ( !exportEPolyAsTriangles )
{
@@ -350,7 +352,10 @@
else
exportPositions();
- exportNormals();
+ if ( mExportNormals )
+ {
+ exportNormals();
+ }
ChannelList channelList;
@@ -1025,7 +1030,10 @@
triangles.setCount ( numberOfFaces );
triangles.setMaterial ( symbol );
triangles.getInputList().push_back ( COLLADASW::Input ( COLLADASW::VERTEX, "#" + mId + COLLADASW::LibraryGeometries::VERTICES_ID_SUFFIX, offset++ ) );
- triangles.getInputList().push_back ( COLLADASW::Input ( COLLADASW::NORMAL, "#" + mId + COLLADASW::LibraryGeometries::NORMALS_SOURCE_ID_SUFFIX, offset++ ) );
+ if ( mExportNormals )
+ {
+ triangles.getInputList().push_back ( COLLADASW::Input ( COLLADASW::NORMAL, "#" + mId + COLLADASW::LibraryGeometries::NORMALS_SOURCE_ID_SUFFIX, offset++ ) );
+ }
for ( ChannelList::const_iterator it = channelList.begin(); it != channelList.end(); ++it )
{
@@ -1048,7 +1056,10 @@
{
for ( int vertexIndex = 0; vertexIndex < 3; ++vertexIndex )
{
- triangles.appendValues ( face.v[ vertexIndex ], norms->GetNormalIndex ( faceIndex, vertexIndex ) );
+ if ( mExportNormals )
+ {
+ triangles.appendValues ( face.v[ vertexIndex ], norms->GetNormalIndex ( faceIndex, vertexIndex ) );
+ }
for ( ChannelList::const_iterator it = channelList.begin(); it != channelList.end(); ++it )
{
@@ -1088,7 +1099,10 @@
polylist.setCount ( ( unsigned long ) polylist.getVCountList().size() );
polylist.setMaterial ( symbol );
polylist.getInputList().push_back ( COLLADASW::Input ( COLLADASW::VERTEX, "#" + mId + COLLADASW::LibraryGeometries::VERTICES_ID_SUFFIX, offset++ ) );
- polylist.getInputList().push_back ( COLLADASW::Input ( COLLADASW::NORMAL, "#" + mId + COLLADASW::LibraryGeometries::NORMALS_SOURCE_ID_SUFFIX, offset++ ) );
+ if ( mExportNormals )
+ {
+ polylist.getInputList().push_back ( COLLADASW::Input ( COLLADASW::NORMAL, "#" + mId + COLLADASW::LibraryGeometries::NORMALS_SOURCE_ID_SUFFIX, offset++ ) );
+ }
for ( ChannelList::const_iterator it = channelList.begin(); it != channelList.end(); ++it )
{
@@ -1109,7 +1123,10 @@
for ( int vertexIndex = 0; vertexIndex < vertexCount; ++vertexIndex )
{
- polylist.appendValues ( mnFace->vtx[ vertexIndex ], normmalSpec->GetNormalIndex ( faceIndex, vertexIndex ) );
+ if ( mExportNormals )
+ {
+ polylist.appendValues ( mnFace->vtx[ vertexIndex ], normmalSpec->GetNormalIndex ( faceIndex, vertexIndex ) );
+ }
for ( ChannelList::const_iterator it = channelList.begin(); it != channelList.end(); ++it )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|