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.

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

materials: Covert to es6 class. #20002

Closed
wants to merge 263 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
263 commits
Select commit Hold shift + click to select a range
b5bcd51
fixed missing space in GLBufferAttribute example
raub Apr 18, 2018
9359e2f
fixed info title in GLBufferAttribute example
raub Apr 18, 2018
920caf3
Merge branch 'master' of https://github.com/mrdoob/three.js into dev
raub Aug 24, 2018
368d1fd
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Aug 24, 2018
f8f0b41
Add culling warnings for GLBufferAttribute, update the example
raub Aug 27, 2018
ddf9406
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Aug 27, 2018
4b5c8ee
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Nov 25, 2018
54c6ef8
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Dec 5, 2018
461f4f6
Fix GLBufferAttribute example
raub Dec 5, 2018
15a8615
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Jan 23, 2019
0c95418
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Feb 20, 2019
70aee41
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Aug 9, 2019
9ba4d01
Add parameter to the constructor
raub Aug 9, 2019
01356f3
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Nov 15, 2019
1d73a66
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Nov 24, 2019
a0f4661
Update GLBufferAttribute
raub Apr 26, 2020
35d9f1e
Merge branch 'master' of https://github.com/mrdoob/three.js into dev
raub Apr 26, 2020
8df321f
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Apr 26, 2020
3bc4a2a
Add example screenshot
raub Apr 26, 2020
0064c2b
Fix e2e test
raub Apr 26, 2020
419e9cb
Fix docs list entry
raub Apr 27, 2020
93a7c58
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Apr 27, 2020
4aed9dc
Add zh doc entry
raub Apr 27, 2020
80a9ebe
Set sRGB encoding. Also some clean up.
WestLangley Jul 6, 2020
7d140f8
Disable stencil buffer by default
WestLangley Jul 25, 2020
8282023
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Aug 2, 2020
c16eb64
Update GLBufferAttribute
raub Aug 2, 2020
727e89b
Update screenshot for GLBufferAttribute example
raub Aug 2, 2020
7860f32
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Aug 2, 2020
938a4cf
Vector2
yomotsu Aug 3, 2020
881697f
missing semi
yomotsu Aug 3, 2020
9d14b87
Vector3, Vector4
yomotsu Aug 3, 2020
979f99d
solve hoisting in Vector3
yomotsu Aug 3, 2020
b6e40eb
Matrix3, Matrix4
yomotsu Aug 3, 2020
8a7585d
adding incomplete loader work
fraguada Aug 3, 2020
22eca2d
Quaternion
yomotsu Aug 3, 2020
5eef1d2
Euler
yomotsu Aug 3, 2020
f549b79
fix static value of Euler
yomotsu Aug 3, 2020
576577c
materials: Covert to es6 class.
linbingquan Aug 3, 2020
a868fe3
Some cleanup of copied code
fraguada Aug 3, 2020
68bd99b
Audio: Convert to es6 class
ianpurvis Jul 31, 2020
148763a
PositionalAudio: Convert to es6 class
ianpurvis Jul 31, 2020
0fc6f20
AudioListener: Convert to es6 class
ianpurvis Jul 31, 2020
a670b9d
Merge pull request #20003 from ianpurvis/audio-es6-classes
mrdoob Aug 3, 2020
612f544
Updated builds.
mrdoob Aug 3, 2020
9d5e658
Remove outdated examples of ArrowHelper
Methuselah96 Aug 3, 2020
8bcfccd
move internal use instances to the end of the file
yomotsu Aug 4, 2020
425019b
Fix for #19959. Add 'glslVersion' property to ShaderMaterial and prep…
J-Rojas Aug 4, 2020
debb7eb
Fix linting errors
J-Rojas Aug 4, 2020
1e75579
src/scenes: move to es6 classes
DefinitelyMaybe Aug 4, 2020
79c661e
Ahhhh! It works!!!
fraguada Aug 4, 2020
c4d3d9a
Check that the buffer is actually the 3dm file.
fraguada Aug 4, 2020
f09f4fa
program: make unroll loop regexp accept other coding style
DavidPeicho Aug 4, 2020
4aec0b9
Updated: Clean up.
linbingquan Aug 4, 2020
f12f41f
Remove from Chinese docs as well
Methuselah96 Aug 4, 2020
bed4fce
getting meshes out!
fraguada Aug 4, 2020
c0c9b04
cleanup
fraguada Aug 4, 2020
15812b1
cleanup console
fraguada Aug 4, 2020
c18c10c
Update MeshPhysicalMaterial.d.ts
FishOrBear Aug 5, 2020
7f6b128
Conditionally apply automatic GLSL 3.0 conversions.
J-Rojas Aug 5, 2020
57335a5
Add GLSL1 and GLSL3 declarations for Typescript
J-Rojas Aug 5, 2020
e1e076e
Fix linting errors
J-Rojas Aug 5, 2020
a95b395
added attributes and materials
fraguada Aug 5, 2020
6d849c8
Added support for tracks using cubic spline interpolation to Animatio…
Aug 5, 2020
6a9c3a4
Remove #version from GLSL constants... only the version string should…
J-Rojas Aug 5, 2020
6ccf9df
ParametricGeometry: Revert class change.
Mugen87 Aug 5, 2020
e8843c7
Address PR feedback
J-Rojas Aug 5, 2020
b3e09f7
Fixed index lookup for non-quaternions in AnimationUtils.makeClipAddi…
Aug 6, 2020
6a6d2fc
Merge pull request #1 from fraguada/fraguada-Rhino3dmLoader
fraguada Aug 6, 2020
eb546c2
Examples: Update chevrotain module.
Mugen87 Aug 6, 2020
44d6821
Fix orthographic camera rendering for CSS3D on safari on High DPI dis…
JohannesDeml Aug 6, 2020
adbc721
Fix css perspective camera for safari when looking straight forward
JohannesDeml Aug 6, 2020
b087ed0
Updated decode code and added some material props
fraguada Aug 6, 2020
c943e7a
Change remove perspective camera "fix"
JohannesDeml Aug 6, 2020
a68a258
Change match to test for safari check
JohannesDeml Aug 6, 2020
8eb4096
perfer const
DefinitelyMaybe Aug 6, 2020
ae0dcdd
adding clarity.
DefinitelyMaybe Aug 7, 2020
0bab9ab
following formatting.
DefinitelyMaybe Aug 7, 2020
c1ebc34
initial parsing of layers and views
fraguada Aug 7, 2020
287b404
Added extrusion support, groups, settings
fraguada Aug 7, 2020
51c463f
cleanup.
fraguada Aug 7, 2020
945feb9
Add @default values to TypeScript declaration files
dmnsgn Aug 7, 2020
307444b
Merge pull request #20031 from DefinitelyMaybe/prefer-const
mrdoob Aug 7, 2020
0802a5c
Merge pull request #20027 from Mugen87/dev51
mrdoob Aug 7, 2020
542a2c6
Merge pull request #20023 from Mugen87/dev46
mrdoob Aug 7, 2020
590ce8d
Merge pull request #20017 from FishOrBear/patch-5
mrdoob Aug 7, 2020
0bc5065
Merge pull request #20004 from Methuselah96/patch-1
mrdoob Aug 7, 2020
b4f4e2f
Merge pull request #20015 from linbingquan/dev-cleanup-examples
mrdoob Aug 7, 2020
03f17a3
Updated builds.
mrdoob Aug 7, 2020
d0f4129
adding layer visibility toggle to example.
fraguada Aug 8, 2020
673705f
fix example layer visibility functionality
fraguada Aug 8, 2020
e5fa0bc
Make equirectangular reflections / refractions backwards compatible. …
mrdoob Aug 8, 2020
50bee74
Updated builds.
mrdoob Aug 8, 2020
c9a83cd
Package.json: Added "lint-fix" script (#20033)
DefinitelyMaybe Aug 8, 2020
630c6f4
Merge pull request #20032 from DefinitelyMaybe/package.json
mrdoob Aug 8, 2020
6dc1d17
Merge pull request #20028 from JohannesDeml/css3d-rendering-issues-sa…
mrdoob Aug 8, 2020
9ea9891
CSS3DRenderer: Clean up.
mrdoob Aug 8, 2020
8000b03
Euler.DefaultOrder should be writable
yomotsu Aug 9, 2020
b800b22
Fix Euler property typo in setFromEuler
encadyma Aug 10, 2020
25be43d
WebGLCubeMaps: Fix runtime error when image is undefined.
Mugen87 Aug 10, 2020
401263e
TS: Add WebGLCubeMaps.
Mugen87 Aug 10, 2020
5920b80
Clean up.
Mugen87 Aug 10, 2020
bb8266e
Added support for curves and textdots.
fraguada Aug 10, 2020
4bb1b01
Merge pull request #20043 from Mugen87/dev51
mrdoob Aug 10, 2020
a5d212c
Merge pull request #20044 from Mugen87/dev46
mrdoob Aug 10, 2020
a381ffe
Merge pull request #20042 from encadyma/kmo-patch-euler
mrdoob Aug 10, 2020
feb7612
Add index cache for vao
shawn0326 Aug 11, 2020
4b3e2b0
refactor and code styling
fraguada Aug 11, 2020
2214226
Handling Instances, needs cleanup
fraguada Aug 11, 2020
6c0915e
Code Style cleanup
fraguada Aug 11, 2020
dfb5c23
Updated builds.
mrdoob Aug 11, 2020
639d1b4
WebGLRenderer: Fix equirect texture conversion.
Mugen87 Aug 11, 2020
027a6b1
revert Euler.RotationOrders to be writable
yomotsu Aug 11, 2020
b7e45a6
cleanup, adding screenshot
fraguada Aug 11, 2020
84fc41a
Update MaterialLoader.js
Sammius Aug 11, 2020
3e3f153
updated sample model, added d.ts, screenshot
fraguada Aug 11, 2020
ab97e72
Cleanup formating.
fraguada Aug 11, 2020
bc547ad
adding request header
fraguada Aug 11, 2020
d46af62
Merge pull request #20050 from Sammius/patch-1
mrdoob Aug 11, 2020
434c71e
GLTFLoader: Fix regression unecessarily choosing MeshPhysicalMaterial.
Aug 12, 2020
f53774a
check if cachedAttribute is undefined
greggman Aug 12, 2020
eb98cf1
deleting unused model
fraguada Aug 12, 2020
075b86f
Merge pull request #20047 from mcneel/3DMLoader
mrdoob Aug 13, 2020
0dc4335
Merge pull request #20056 from greggman/check-cached-attribute
mrdoob Aug 13, 2020
5298bdc
Merge pull request #20045 from shawn0326/fix-vao
mrdoob Aug 13, 2020
1e651a3
Merge pull request #20053 from donmccurdy/bug-gltfloader-getmaterialtype
mrdoob Aug 13, 2020
d7400b6
Updated: webgl_loader_3dm screenshot.
linbingquan Aug 13, 2020
ac94302
Merge pull request #20063 from linbingquan/dev-screenshot
mrdoob Aug 13, 2020
76514b4
Updated: package.json
linbingquan Aug 13, 2020
1a27f06
Merge pull request #20064 from linbingquan/dev-packagejson
mrdoob Aug 13, 2020
8a39501
Revert Fix orthographic camera rendering for CSS3D on safari on High …
WestLangley Aug 13, 2020
74790fb
Added onWindowResize callback
WestLangley Aug 13, 2020
6fb6835
Merge pull request #20067 from WestLangley/dev_css3d_revert
mrdoob Aug 13, 2020
0c2b647
Merge pull request #20068 from WestLangley/dev_css3d_examples
mrdoob Aug 13, 2020
4050200
Updated builds.
mrdoob Aug 13, 2020
1983589
Merge pull request #20036 from dmnsgn/dev
mrdoob Aug 13, 2020
a53fcce
is*** should not be a getter function
yomotsu Aug 14, 2020
f228453
Initialize Audio.source as null
takahirox Aug 14, 2020
8f01419
Merge pull request #20073 from takahirox/AudioSource
mrdoob Aug 14, 2020
ff37eaa
Merge pull request #19997 from yomotsu/move-to-es6-classes/math
mrdoob Aug 14, 2020
3071583
Updated builds.
mrdoob Aug 14, 2020
dc33699
Merge pull request #20021 from c-morten/Additive_Animation
mrdoob Aug 14, 2020
98a77f8
Updated builds.
mrdoob Aug 14, 2020
4e50d8d
Merge pull request #19800 from WestLangley/dev_examples_cubemap
mrdoob Aug 14, 2020
1a258c0
initiate: create-a-scene doc page
hassanMuhamad Aug 14, 2020
7a105b1
update: add Arabic lang support
hassanMuhamad Aug 14, 2020
fbfffb7
update: add Arabic doc mapping
hassanMuhamad Aug 14, 2020
a00dac3
update: fix indentation issue
hassanMuhamad Aug 14, 2020
8d0a3c0
Merge pull request #20075 from hassanMuhamad/dev
mrdoob Aug 14, 2020
b9fd220
Merge pull request #20048 from Mugen87/dev46
mrdoob Aug 14, 2020
6ef6686
Updated builds.
mrdoob Aug 14, 2020
c73e993
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
raub Aug 14, 2020
c346757
is* adjustment
DefinitelyMaybe Aug 15, 2020
a7f5acf
Box2: Convert to es6 class
yomotsu Aug 15, 2020
d322d88
Box3: Convert to es6 class
yomotsu Aug 15, 2020
021c21f
Cylindrical.js: Convert to es6 class
yomotsu Aug 15, 2020
676ad63
Frustum: Convert to es6 class
yomotsu Aug 15, 2020
c210e32
Line3: Convert to es6 class
yomotsu Aug 15, 2020
328e990
Plane: Convert to es6 class
yomotsu Aug 15, 2020
32e90cb
Sphere: Convert to es6 class
yomotsu Aug 15, 2020
4d0cb6f
SphericalHarmonics3: Convert to es6 class
yomotsu Aug 15, 2020
b547cc8
Triangle: Convert to es6 class
yomotsu Aug 15, 2020
7093d27
Merge branch 'dev' of git://github.com/mrdoob/three.js into dev_rt_st…
WestLangley Aug 15, 2020
1fa77e2
Disable stencil buffer by default
WestLangley Aug 15, 2020
88b79f2
Clean up.
Mugen87 Aug 15, 2020
232fd44
Examples: Improved volume example compatibility.
mrdoob Aug 15, 2020
327ca08
WebGLRenderer: Make uniforms handling of RectAreaLight more consistent.
Mugen87 Aug 15, 2020
7aa9fa2
Merge pull request #20078 from Mugen87/dev46
mrdoob Aug 15, 2020
20b1de2
Merge pull request #20077 from Mugen87/dev45
mrdoob Aug 15, 2020
acb337f
Merge pull request #20076 from yomotsu/move-to-es6-classes/math-area-…
mrdoob Aug 15, 2020
eb03a9c
Disable stencil buffer by default
WestLangley Aug 15, 2020
dfd8712
Updated builds.
mrdoob Aug 15, 2020
1819c5b
Merge pull request #20007 from DefinitelyMaybe/src/scene--move-to-es6…
mrdoob Aug 15, 2020
4bf5eb9
Updated builds.
mrdoob Aug 15, 2020
dd7c0d7
Merge pull request #19926 from WestLangley/dev_rt_stencil_default
mrdoob Aug 15, 2020
bf43197
Updated builds.
mrdoob Aug 15, 2020
a3c3b79
add: browser-support doc page
hassanMuhamad Aug 15, 2020
9e2e9ee
add: installation doc page
hassanMuhamad Aug 15, 2020
d5654f0
fix: indentation
hassanMuhamad Aug 15, 2020
8b76b5d
add: how-to-run-things-locally doc page
hassanMuhamad Aug 15, 2020
4922dc8
add: WebGL compatibility check doc page
hassanMuhamad Aug 15, 2020
e7e69b1
add: Typescript setup doc page
hassanMuhamad Aug 15, 2020
6671b86
update: documentation list mapping
hassanMuhamad Aug 15, 2020
f119b45
Clean up.
mrdoob Aug 16, 2020
1c09e7d
Merge pull request #20079 from hassanMuhamad/dev
mrdoob Aug 16, 2020
18b3027
WebGLRenderer: Fix update of materialProperties.envMap.
Mugen87 Aug 16, 2020
662e7e1
Merge pull request #20081 from Mugen87/dev46
mrdoob Aug 16, 2020
717cb0d
Docs: Cleaned up Arabic pages.
mrdoob Aug 16, 2020
e762278
Updated builds.
mrdoob Aug 16, 2020
483196c
WebGLClipping: Refactoring.
Mugen87 Aug 16, 2020
00adf6d
Merge pull request #20084 from Mugen87/dev46
mrdoob Aug 16, 2020
2a14426
WebGLRenderer: Avoid frame-late bug with converted env maps.
Mugen87 Aug 16, 2020
81bdcca
Docs: Set navigation direction to rtl when language is ar.
mrdoob Aug 16, 2020
1be9e21
Updated builds.
mrdoob Aug 16, 2020
1ae605f
Merge pull request #20085 from Mugen87/dev45
mrdoob Aug 16, 2020
908de67
Updated builds.
mrdoob Aug 16, 2020
08397c7
Merge pull request #1 from mrdoob/dev
hassanMuhamad Aug 16, 2020
70e8ea5
fix: multiple language words arrangement
hassanMuhamad Aug 16, 2020
c3005fd
add: drawing-lines doc page mapping
hassanMuhamad Aug 16, 2020
172878f
add: drawing-lines Arabic doc page
hassanMuhamad Aug 16, 2020
3085594
add: creating-text doc page mapping
hassanMuhamad Aug 16, 2020
e8cc8a5
add: creating-text Arabic doc page
hassanMuhamad Aug 16, 2020
5376d17
WebGLPrograms: Rename allocateBones().
Mugen87 Aug 16, 2020
07469d7
Color: Convert to es6 class
yomotsu Aug 16, 2020
44e40fa
add: loading-3D-models doc page mapping
hassanMuhamad Aug 16, 2020
86a0021
add: Loading-3D-models Arabic doc page
hassanMuhamad Aug 16, 2020
dc3a627
fix: direction issues
hassanMuhamad Aug 16, 2020
7d8b5b8
Merge pull request #20087 from Mugen87/dev45
mrdoob Aug 16, 2020
567b6fa
Merge pull request #20088 from hassanMuhamad/dev
mrdoob Aug 16, 2020
ba9f859
Merge pull request #13196 from node-3d/dev
mrdoob Aug 16, 2020
cb5a9e3
Updated builds.
mrdoob Aug 16, 2020
738c2ca
Examples: Renamed webgl_buffergeometry_points_glbufferattribute to we…
mrdoob Aug 16, 2020
7021fdd
Merge pull request #20089 from yomotsu/move-to-es6-classes/math-color
mrdoob Aug 16, 2020
8989206
Updated builds.
mrdoob Aug 16, 2020
a7a3f0a
Merge pull request #20005 from J-Rojas/fix-19959
mrdoob Aug 16, 2020
5dff158
WebGLProgram: Refactor GLSL conversion.
Mugen87 Aug 16, 2020
9e2cea0
Examples: Updated Ammo.js
mrdoob Aug 16, 2020
faa6495
CannonPhysics: Clean up.
mrdoob Aug 16, 2020
b941c87
Clean up.
mrdoob Aug 16, 2020
2199be4
Examples: Removed redundant code from physics_cannon_instancing.
mrdoob Aug 16, 2020
471e038
Examples: Added AmmoPhysics.
mrdoob Aug 16, 2020
711d711
Examples: Fixed physics_ammo_instancing.
mrdoob Aug 16, 2020
5c7ab46
Merge pull request #20090 from Mugen87/dev45
mrdoob Aug 16, 2020
1568cff
Updated builds.
mrdoob Aug 16, 2020
c761f3d
AmmoPhysics: Reset angular and linear velocity in setMeshPosition.
mrdoob Aug 16, 2020
6f5a9d8
Examples: Fixed ammo.js import.
mrdoob Aug 17, 2020
23f40de
Examples: Removed physics_cannon_instancing.
mrdoob Aug 17, 2020
8ff94fe
Merge pull request #20012 from DavidPeicho/feature/shjader-loop-unrol…
mrdoob Aug 17, 2020
2093a0b
Updated builds.
mrdoob Aug 17, 2020
55a2467
Docs: Fix broken links to transmission example.
Aug 17, 2020
4535498
Introduce _connected flag in Audio to fix a bug that setFilters does not
takahirox Aug 17, 2020
a036bdb
ColladaExporter: Fix runtime error when processing ImageBitmap.
Mugen87 Aug 17, 2020
7de1e3e
Merge pull request #20092 from donmccurdy/docs-links-transmission
mrdoob Aug 17, 2020
0ff40ec
Merge pull request #20049 from Mugen87/dev51
mrdoob Aug 17, 2020
3ca2ae0
Merge pull request #20093 from takahirox/AudioConnected
mrdoob Aug 17, 2020
26bcd94
ShaderMaterial: Improve typings and docs for glslVersion.
Mugen87 Aug 17, 2020
b9ecd4e
Merge pull request #20095 from Mugen87/dev51
mrdoob Aug 17, 2020
64f3162
Editor: Removed Minify Shaders option.
mrdoob Aug 17, 2020
caa8647
WebGLRenderer: Remove superfluous program check in setProgram().
Mugen87 Aug 17, 2020
cf613a2
Merge pull request #20097 from Mugen87/dev51
mrdoob Aug 17, 2020
02455cf
Updated builds.
mrdoob Aug 17, 2020
e23e1a4
add: FAQ doc page mapping
hassanMuhamad Aug 17, 2020
11ba7f8
add: FAQ Arabic doc page
hassanMuhamad Aug 17, 2020
9d3475f
add: useful-links page mapping
hassanMuhamad Aug 17, 2020
33d41e0
add: useful-links Arabic doc page
hassanMuhamad Aug 17, 2020
0719888
Docs: Clean up.
Mugen87 Aug 17, 2020
7e13b72
prototype properties: Clean up.
linbingquan Aug 17, 2020
256ffc2
Merge pull request #20099 from Mugen87/dev51
mrdoob Aug 17, 2020
7a879a0
Merge pull request #20098 from hassanMuhamad/dev
mrdoob Aug 17, 2020
4d1fc09
Merge remote-tracking branch 'origin/dev-es6-materials' into dev
linbingquan Aug 17, 2020
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
154 changes: 78 additions & 76 deletions examples/jsm/lines/LineMaterial.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,160 +243,162 @@ ShaderLib[ 'line' ] = {
`
};

var LineMaterial = function ( parameters ) {
class LineMaterial extends ShaderMaterial {

ShaderMaterial.call( this, {
constructor( parameters ) {

type: 'LineMaterial',
super( {

uniforms: UniformsUtils.clone( ShaderLib[ 'line' ].uniforms ),
type: 'LineMaterial',

vertexShader: ShaderLib[ 'line' ].vertexShader,
fragmentShader: ShaderLib[ 'line' ].fragmentShader,
uniforms: UniformsUtils.clone( ShaderLib[ 'line' ].uniforms ),

clipping: true // required for clipping support
vertexShader: ShaderLib[ 'line' ].vertexShader,
fragmentShader: ShaderLib[ 'line' ].fragmentShader,

} );
clipping: true // required for clipping support

this.dashed = false;
} );

Object.defineProperties( this, {
this.dashed = false;

color: {
this.isLineMaterial = true;
Copy link
Contributor

Choose a reason for hiding this comment

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


enumerable: true,
Object.defineProperties( this, {

get: function () {
color: {

return this.uniforms.diffuse.value;
enumerable: true,

},

set: function ( value ) {
get: function () {

this.uniforms.diffuse.value = value;

}
return this.uniforms.diffuse.value;

},
},

linewidth: {
set: function ( value ) {

enumerable: true,
this.uniforms.diffuse.value = value;

get: function () {

return this.uniforms.linewidth.value;
}

},

set: function ( value ) {
linewidth: {

this.uniforms.linewidth.value = value;
enumerable: true,

}
get: function () {

},
return this.uniforms.linewidth.value;

dashScale: {
},

enumerable: true,
set: function ( value ) {

get: function () {
this.uniforms.linewidth.value = value;

return this.uniforms.dashScale.value;
}

},

set: function ( value ) {
dashScale: {

this.uniforms.dashScale.value = value;
enumerable: true,

}
get: function () {

},
return this.uniforms.dashScale.value;

dashSize: {
},

enumerable: true,
set: function ( value ) {

get: function () {
this.uniforms.dashScale.value = value;

return this.uniforms.dashSize.value;
}

},

set: function ( value ) {
dashSize: {

this.uniforms.dashSize.value = value;
enumerable: true,

}
get: function () {

},
return this.uniforms.dashSize.value;

gapSize: {
},

enumerable: true,
set: function ( value ) {

get: function () {
this.uniforms.dashSize.value = value;

return this.uniforms.gapSize.value;
}

},

set: function ( value ) {
gapSize: {

this.uniforms.gapSize.value = value;
enumerable: true,

}
get: function () {

},
return this.uniforms.gapSize.value;

opacity: {
},

enumerable: true,
set: function ( value ) {

get: function () {
this.uniforms.gapSize.value = value;

return this.uniforms.opacity.value;
}

},

set: function ( value ) {
opacity: {

this.uniforms.opacity.value = value;
enumerable: true,

}
get: function () {

},
return this.uniforms.opacity.value;

resolution: {
},

enumerable: true,
set: function ( value ) {

get: function () {
this.uniforms.opacity.value = value;

return this.uniforms.resolution.value;
}

},

set: function ( value ) {
resolution: {

this.uniforms.resolution.value.copy( value );
enumerable: true,

}
get: function () {

}
return this.uniforms.resolution.value;

} );
},

this.setValues( parameters );
set: function ( value ) {

};
this.uniforms.resolution.value.copy( value );

}

}

} );

this.setValues( parameters );

}

LineMaterial.prototype = Object.create( ShaderMaterial.prototype );
LineMaterial.prototype.constructor = LineMaterial;
}

LineMaterial.prototype.isLineMaterial = true;

export { LineMaterial };
15 changes: 8 additions & 7 deletions examples/jsm/nodes/materials/MeshStandardNodeMaterial.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ import { MeshStandardNode } from './nodes/MeshStandardNode.js';
import { NodeMaterial } from './NodeMaterial.js';
import { NodeUtils } from '../core/NodeUtils.js';

function MeshStandardNodeMaterial() {
class MeshStandardNodeMaterial extends NodeMaterial {

var node = new MeshStandardNode();
constructor() {

NodeMaterial.call( this, node, node );
var node = new MeshStandardNode();

this.type = "MeshStandardNodeMaterial";
super( node, node );

}
this.type = "MeshStandardNodeMaterial";

}

MeshStandardNodeMaterial.prototype = Object.create( NodeMaterial.prototype );
MeshStandardNodeMaterial.prototype.constructor = MeshStandardNodeMaterial;
}

NodeUtils.addShortcuts( MeshStandardNodeMaterial.prototype, 'properties', [
"color",
Expand Down
Loading