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

Jump to bottom

Editor: Refactored SidebarMaterial #22194

Merged
merged 25 commits into from
Jul 28, 2021
Merged

Editor: Refactored SidebarMaterial #22194

merged 25 commits into from
Jul 28, 2021

Conversation

mrdoob
Copy link
Owner

@mrdoob mrdoob commented Jul 27, 2021

Description

Better late than never...

@mrdoob mrdoob added this to the r131 milestone Jul 27, 2021
mrdoob added 16 commits July 28, 2021 12:22
@mrdoob
Editor: Added SidebarMaterialMapProperty.
46286a8
@mrdoob
Editor: Added *Scale support to SidebarMaterialMapProperty.
1d11fa5
@mrdoob
Editor: Cleaned up envMap/reflectivity code.
f01dcc5
@mrdoob
Editor: String keys clean up.
5edf357
@mrdoob
Editor: Clean up.
c63b0fc
@mrdoob
Editor: Removed epsilon check in SidebarMaterialNumberProperty.
f9093c8
@mrdoob
Editor: Improved intensity code in SidebarMaterialColorProperty.
3eb1183
@mrdoob
Editor: Added Intensity support to SidebarMaterialMapProperty.
5b1e4da
@mrdoob
Editor: Removed unused code from SidebarMaterial.
b2afa85
@mrdoob
Editor: Cleaned up size property in SidebarMaterial.
ff56d51
@mrdoob
Editor: Clean up.
6edc987
@mrdoob
Editor: Added SidebarMaterialConstantProperty.
3fd02da
@mrdoob
Editor: Removed constants translations.
a2113a4
@mrdoob
Editor: Added SidebarMaterialProgram.
9da540e
@mrdoob
Editor: Fixed reflectivity property.
552f957
@mrdoob
Editor: Removed unused code.
44b31d3
@mrdoob mrdoob marked this pull request as ready for review July 28, 2021 14:41
@Mugen87
Copy link
Collaborator

Mugen87 commented Jul 28, 2021

https://raw.githack.com/mrdoob/three.js/editor/editor/index.html

@Mugen87
Copy link
Collaborator

Mugen87 commented Jul 28, 2021

Much cleaner!

@mrdoob
Copy link
Owner Author

mrdoob commented Jul 28, 2021

I've broken multi-material support though...

I'll see if I can fix it during the next dev cycle. Although I do not remember what loaders produce multi materials.

@Mugen87
Copy link
Collaborator

Mugen87 commented Jul 28, 2021

Although I do not remember what loaders produce multi materials.

OBJLoader does.

three.js/examples/jsm/loaders/OBJLoader.js

Line 837 in 5820a00

buffergeometry.addGroup( sourceMaterial.groupStart, sourceMaterial.groupCount, mi );

@mrdoob
Copy link
Owner Author

mrdoob commented Jul 28, 2021

I'm definitely not a fan of all the multi-material / groups design... But I'll try to get it working again next month 😬

@mrdoob mrdoob merged commit f952a0e into dev Jul 28, 2021
@mrdoob mrdoob deleted the editor branch July 28, 2021 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mugen87 Mugen87 Mugen87 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
r131
Development

Successfully merging this pull request may close these issues.
2 participants
@mrdoob @Mugen87