Skip to content
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

Technique 'ambient' node case added #8610

Closed
wants to merge 2 commits into from
Closed

Technique 'ambient' node case added #8610

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
833b90c
Technique 'ambient' node case added
poof86 Apr 12, 2016
f7d4d66
Allow ColladaLoader.js to set .aoMap property
poof86 Apr 12, 2016
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
17 changes: 16 additions & 1 deletion examples/js/loaders/ColladaLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3584,6 +3584,7 @@ THREE.ColladaLoader = function () {

switch ( child.nodeName ) {

case 'ambient':
case 'emission':
case 'diffuse':
case 'specular':
Expand Down Expand Up @@ -3791,7 +3792,21 @@ THREE.ColladaLoader = function () {
switch ( this.type ) {

case 'constant':


if ( props.emissionMap !== undefined ) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have any example files that use these maps?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll make a quick example just a sec


props.aoMap = props.emissionMap;
delete props.emissionMap;

}

if ( props.lightMap !== undefined ) {

props.aoMap = props.lightMap;
delete props.lightMap;

}

if (props.emissive != undefined) props.color = props.emissive;
this.material = new THREE.MeshBasicMaterial( props );
break;
Expand Down