Skip to content

JSM: Added ColladaExporter to modularize.js #16727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2019
Merged

JSM: Added ColladaExporter to modularize.js #16727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions examples/js/exporters/ColladaExporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ THREE.ColladaExporter.prototype = {

constructor: THREE.ColladaExporter,

parse: function ( object, onDone, options = {} ) {
parse: function ( object, onDone, options ) {

options = options || {};

options = Object.assign( {
version: '1.4.1',
Expand Down Expand Up @@ -377,7 +379,7 @@ THREE.ColladaExporter.prototype = {
var reflectivity = m.reflectivity || 0;

// Do not export and alpha map for the reasons mentioned in issue (#13792)
// in THREE.js alpha maps are black and white, but collada expects the alpha
// in three.js alpha maps are black and white, but collada expects the alpha
// channel to specify the transparency
var transparencyNode = '';
if ( m.transparent === true ) {
Expand Down Expand Up @@ -586,7 +588,7 @@ THREE.ColladaExporter.prototype = {
'<asset>' +
(
'<contributor>' +
'<authoring_tool>THREE.js Collada Exporter</authoring_tool>' +
'<authoring_tool>three.js Collada Exporter</authoring_tool>' +
( options.author !== null ? `<author>${ options.author }</author>` : '' ) +
'</contributor>' +
`<created>${ ( new Date() ).toISOString() }</created>` +
Expand Down
9 changes: 6 additions & 3 deletions examples/jsm/exporters/ColladaExporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ ColladaExporter.prototype = {

constructor: ColladaExporter,

parse: function ( object, onDone, options = {} ) {
parse: function ( object, onDone, options ) {

options = options || {};

options = Object.assign( {
version: '1.4.1',
Expand Down Expand Up @@ -388,7 +390,7 @@ ColladaExporter.prototype = {
var reflectivity = m.reflectivity || 0;

// Do not export and alpha map for the reasons mentioned in issue (#13792)
// in THREE.js alpha maps are black and white, but collada expects the alpha
// in three.js alpha maps are black and white, but collada expects the alpha
// channel to specify the transparency
var transparencyNode = '';
if ( m.transparent === true ) {
Expand Down Expand Up @@ -536,6 +538,7 @@ ColladaExporter.prototype = {
// the materials.
var mat = o.material || new MeshBasicMaterial();
var materials = Array.isArray( mat ) ? mat : [ mat ];

if ( geometry.groups.length > materials.length ) {

matidsArray = new Array( geometry.groups.length );
Expand Down Expand Up @@ -596,7 +599,7 @@ ColladaExporter.prototype = {
'<asset>' +
(
'<contributor>' +
'<authoring_tool>THREE.js Collada Exporter</authoring_tool>' +
'<authoring_tool>three.js Collada Exporter</authoring_tool>' +
( options.author !== null ? `<author>${ options.author }</author>` : '' ) +
'</contributor>' +
`<created>${ ( new Date() ).toISOString() }</created>` +
Expand Down
1 change: 1 addition & 0 deletions utils/modularize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var files = [
{ path: 'effects/PeppersGhostEffect.js', dependencies: [], ignoreList: [] },
{ path: 'effects/StereoEffect.js', dependencies: [], ignoreList: [] },

{ path: 'exporters/ColladaExporter.js', dependencies: [], ignoreList: [] },
{ path: 'exporters/GLTFExporter.js', dependencies: [], ignoreList: [ 'AnimationClip', 'Camera', 'Geometry', 'Material', 'Mesh', 'Object3D', 'RGBFormat', 'Scenes', 'ShaderMaterial', 'VertexColors' ] },
{ path: 'exporters/MMDExporter.js', dependencies: [], ignoreList: [] },
{ path: 'exporters/OBJExporter.js', dependencies: [], ignoreList: [] },
Expand Down