Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 35ae830a7c4544582ed2759e5b18c5d6ef37c6d9
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 12:52:32 2018 -0400

    r93

commit 6bb8268cf29d555cafdc508837a516fb3827459e
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 12:42:56 2018 -0400

    Updated webvr examples.

commit f5cbb415af6ee6012d80a1348809436feef67750
Merge: f9b0be42b db94b0b53
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 12:35:48 2018 -0400

    Merge pull request #13811 from Mugen87/dev1

    ExtrudeGeometry: Added serialization/ deserialization 3rd attempt

commit f9b0be42bb38f3afbd69c857564308f3ceead13c
Merge: 83eb608c2 412f58aa5
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 12:34:38 2018 -0400

    Merge pull request #13959 from yomotsu/css2d-renderer-respect-z

    CSS2DRenderer: add z respecting

commit 83eb608c2ad90efe57f66e4bff39de0592515a89
Merge: 5bcb77185 d474e2e05
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 12:28:55 2018 -0400

    Merge pull request #14165 from donmccurdy/feat-gltfloader-specular-srgb

    GLTFLoader: specularGlossinessTexture is sRGB.

commit 5bcb77185644dbea569cefee15c8273c3335bfaa
Merge: 2f482f769 4d1332775
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 11:13:58 2018 -0400

    Merge pull request #14175 from Mugen87/dev7

    STLExporter: Merged exporters for ASCII and Binary

commit 2f482f769c15ae5626b95de8629f3ffd3aa23eda
Merge: 8e85f7eaf 2ca5f6566
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 11:11:59 2018 -0400

    Merge pull request #14176 from Mugen87/dev11

    Upgrade Dev-Dependencies

commit 8e85f7eaf6aaa58a50cf624ff46116544f1dc023
Merge: 73716d6ec 3d8f71715
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 30 11:08:12 2018 -0400

    Merge pull request #14172 from WestLangley/dev-PMREM_blending

    PMREM: Simplify blending mode

commit 2ca5f65662a1ecfa6ce01598a7578baff078f217
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 30 16:16:07 2018 +0200

    Upgrade Dev-Dependencies

commit 4d1332775fb267af5245333292126f502c92050e
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 30 11:37:30 2018 +0200

    STLExporter: Update authors

commit 3433be1b52fd65e78ebb995973aa59a8aec991af
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 30 11:33:48 2018 +0200

    STLExporter: Merged exporters for ASCII and Binary

commit 3d8f71715d0937d831b39ea8793fe90e59d58c79
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Tue May 29 22:53:43 2018 -0400

    Simplify blending mode

commit 73716d6ec06ee3878209eb53238efc4186038cf0
Merge: 2a0d0bb18 71919368f
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 29 18:04:14 2018 -0400

    Merge pull request #14148 from gkjohnson/ply-exporter-docs

    Add PLY Exporter Documentation Page

commit 2a0d0bb18002b85d0fe6587e703d7caa38454570
Merge: 64a1fc95b 44aaa9c7b
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 29 18:00:26 2018 -0400

    Merge pull request #14117 from donmccurdy/deprecate-blender-exporter

    Remove Blender exporter, add 'Loading 3D models' guide.

commit 64a1fc95bb23ef06559abb2b0785c782bbd93c7b
Merge: 4fab7a7d3 253214d1a
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 29 17:52:40 2018 -0400

    Merge pull request #14169 from WestLangley/dev-extract_rot

    Minor fix to extractRotation() method

commit 253214d1ac9e72155d7cb3e77df2715c7b93d486
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Tue May 29 13:47:59 2018 -0400

    Minor fix to extractRotation() method

commit d474e2e05bf6a04e61552dbea662e2dc717df66a
Author: Don McCurdy <don.r.mccurdy@gmail.com>
Date:   Mon May 28 21:40:21 2018 -0700

    GLTFLoader: specularGlossinessTexture is sRGB.

commit 4fab7a7d3e2ccc32a1f43a24a8dce39a873bbcf5
Merge: a17dc8c81 12a7d8066
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 28 22:58:49 2018 -0400

    Merge pull request #14163 from takahirox/GLTFExporterGeometryUserData

    GLTFExporter: export BufferGeometry.userData

commit 12a7d8066922ce70f0c7591b4a7f74a5acd1ba8c
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Mon May 28 22:45:16 2018 +0100

    GLTFExporter: export BufferGeometry.userData

commit a17dc8c8125aab75e25348d0aec5ab4551559b93
Merge: 4e0231a7a 689f8bb3d
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 28 01:12:39 2018 -0400

    Merge pull request #14153 from greenfox1505/patch-1

    Data Texture Update

commit 4e0231a7a73253d539338cb9dbf45eed65a01aa6
Merge: 01b556aa2 ce29ba081
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 28 01:10:56 2018 -0400

    Merge pull request #14151 from takahirox/DRACOLoaderMethodChaining

    DRACOLoader: Method chaining

commit 01b556aa27ab99c50855bb87d703496e65788ba5
Merge: b672cff9b 0fb20430f
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 28 01:09:44 2018 -0400

    Merge pull request #14157 from takahirox/MMDLoaderUserData2

    MMDLoader: add bones to BufferGeometry.userData

commit b672cff9b012c5014660ed0a9b3f25a28901134b
Merge: cce7e3170 6cb589832
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 28 01:08:37 2018 -0400

    Merge pull request #14155 from Mugen87/dev7

    BokehShader2: Fix Depth Sampling

commit 0fb20430f1afae0cb92ddf652c666a724071e018
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Mon May 28 06:44:50 2018 +0900

    MMDLoader: add bones to BufferGeometry.userData

commit 6cb58983267371e542e9cbdf15d54b8570497126
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Sun May 27 16:06:18 2018 +0200

    BokehShader2: Clean up

commit 80d3799c3bd20a2db66e8b5d3ab4480700ce9c43
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Sun May 27 14:54:53 2018 +0200

    BokehShader2: Fix Depth Sampling

commit 689f8bb3df214708980c82c64d000ee6aec47ae3
Author: greenfox1505 <RyanTLeverenz@gmail.com>
Date:   Sat May 26 18:25:09 2018 -0500

    Data Texture Update

    Data Texture does not update itself automatically. This is either a bug or a documentation issue (this behaviour is not described in documentation).

commit ce29ba08167d9e5f36318c6107ee5d0112a88500
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sun May 27 05:27:23 2018 +0900

    DRACOLoader: Method chaining

commit 71919368f27580a386f2322d8856432bbbf12fe6
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Sat May 26 11:02:17 2018 -0700

    Add PLYExporter to the pages list

commit cce7e3170ed6127123c12fb8d05a2eec03a0d78d
Merge: 9b09e0fa2 afb4b94b8
Author: Michael Herzog <michael.herzog@human-interactive.org>
Date:   Sat May 26 14:36:36 2018 +0200

    Merge pull request #14150 from mrdoob/revert-14093-dev7

    Revert "DOF2: Fix broken example"

commit afb4b94b82f8e4123fd82c0adde9130c1e231e6f
Author: Michael Herzog <michael.herzog@human-interactive.org>
Date:   Sat May 26 14:32:59 2018 +0200

    Revert "DOF2: Fix broken example"

commit 4c4365b121a2c622a70ed4037cf19149b4073671
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Fri May 25 18:00:42 2018 -0700

    Remove incorrect GLTFExporter documentation

commit d1fd56d26bde465cd5d60f5b9f54c3e452988244
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Fri May 25 16:32:56 2018 -0700

    grammar

commit 1a28ebcf11420c26c0d350aadbf1a540304a509e
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Fri May 25 15:44:59 2018 -0700

    more changes

commit 9b09e0fa28f0c546292ce77e4575289d3a8f2429
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 17:47:48 2018 -0400

    Fixed cross-origin in webvr_panorama. Fixes #14147.

commit a917ef9a7a60d83ce20adf5396c8578110c65be8
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 17:30:24 2018 -0400

    Updated builds.

commit 517bbd7bb4bdb01e2a6db5b138bcd15bfb753e6d
Merge: be2aa4a4e 0fa90fd9c
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 17:21:35 2018 -0400

    Merge pull request #14146 from mrdoob/webxr

    WebXRManager: Expose frameOfReferenceType

commit 0fa90fd9c430f0d631d7d64cf0b50f080924e8c9
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 17:20:21 2018 -0400

    Added frameOfReferenceType to relevant examples.

commit 8914853ba04d252c1763f0207c529d0c9a26c43a
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 17:18:58 2018 -0400

    WebXRManager: Expose frameOfReferenceType.

commit be2aa4a4e2db5520755e19d60a2de0093fe48d1b
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 16:43:36 2018 -0400

    Fixed webvr_sandbox outline on mobiles.

commit f04744d4841c9be0ca04ce3afdc0f2980a3881e8
Merge: b078ada12 314cfc382
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 15:15:02 2018 -0400

    Merge pull request #14144 from takahirox/MMDLoaderUserData

    MMDLoader: move MMD specific parameters into geometry.userData

commit b078ada128883d3d84f5130d54f119648a49e585
Merge: ef88a0c47 0beed36e1
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 25 15:05:38 2018 -0400

    Merge pull request #14141 from atul-mourya/patch-2

    Docs: added Useful Link

commit 314cfc3823aed146fea83c20bd74925fe3b6335a
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Fri May 25 23:45:18 2018 +0900

    MMDLoader: move MMD specific data into geometry.userData

commit 0beed36e10c3657b4b73e19f2cbdc5a251ad0e99
Author: Atul Mourya <atul.mourya@gmail.com>
Date:   Fri May 25 18:21:04 2018 +0530

    #14118

    A missing piece in useful link section. It's greatly helpful when creating a custom shader.
    Issue #14118

commit 95a7760051b9d320324e180df6511527e0801075
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Thu May 24 20:51:16 2018 -0700

    Updates

commit 764fb013869a7ba8db8f97dfee2b9ec6a1df54a2
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Thu May 24 20:41:43 2018 -0700

    Add initial doc for ply exporter

commit ef88a0c47dfa5c5ce1d75bbb45bfb658d1558130
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 16:55:12 2018 -0400

    Updated builds.

commit e0d7e315ce0a5ad61d3dce49f4cd2eb4dba62ff4
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 16:54:02 2018 -0400

    Reflector: Force render first and avoid unneeded framebuffer binds.

commit 94535fd6abd2c13630a17691cd075451beca241b
Merge: 28a209fd2 b1279ee32
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 16:46:06 2018 -0400

    Merge pull request #14136 from mrdoob/webxr

    WebXRManager: Apply parent transforms and update camera children

commit b1279ee3209f127bce9f844529661aa1655bef58
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 16:43:52 2018 -0400

    WebXRManager: Apply parent transforms and update camera children.

commit 28a209fd2398eb521171e3a87259521958627dff
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 14:36:46 2018 -0400

    Updated builds.

commit d44359fc91f3857f368d00fcbf3693704a2ab147
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 14:34:54 2018 -0400

    WebVRManager: Clean up.

commit bb72eec4af55a44ac30b78c46017f49ee0c66883
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 14:33:55 2018 -0400

    WebXRManager: Clean up.

commit e319f670f4e0230ffe277e790b2840110568cafa
Merge: dca56aa60 420a85e13
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 14:32:02 2018 -0400

    Merge pull request #14133 from Mugen87/dev7

    Global: Clean up

commit 420a85e1369cdf6113efc60d67785f3a619b7905
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 24 19:32:29 2018 +0200

    Global: Clean up

commit dca56aa60ff54291714efa3237a8cd6cb7300bff
Merge: 393fc60c8 b980f8516
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 12:36:12 2018 -0400

    Merge pull request #14130 from Mugen87/dev7

    Docs: Correct return value of raycasting methods

commit 393fc60c82f5832878b0839214d004b3b5d62ad0
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 12:32:37 2018 -0400

    Updated builds.

commit f2c4cfe6c1cc78270e01f6108f16ba34d12d7027
Merge: 84ae82bef 49cf7a66f
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 12:30:43 2018 -0400

    Merge pull request #14132 from mrdoob/webxr

    WebGLRenderer: Added setFramebuffer(). Fixes shadows in WebXR.

commit 49cf7a66f65c85cafb7690a344148e4adb6f062e
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 24 12:29:56 2018 -0400

    WebGLRenderer: Added setFramebuffer(). Fixes shadows in WebXR.

commit b980f85161ebdb8e3735703a9c7c48f6d1596b0d
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 24 16:31:19 2018 +0200

    Docs: Correct return value of raycasting methods

commit 84ae82bef6c3886829561eaf2bf248f1ae5b78ae
Merge: 99d5b58a7 73bcb8cc9
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 18:36:30 2018 -0400

    Merge pull request #14125 from sunag/dev-nodeuniform

    NodeUniform - fix caching for SingleUniform

commit 99d5b58a771fc09377d7393e913fc641f5d9aece
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 18:16:57 2018 -0400

    Updated builds.

commit 53cfc2e2e001a031d770bcb2c877cc1970d2b1f7
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 18:16:16 2018 -0400

    WebGLRenderer: Fixed missing method in dispose()

commit d30a14cabea6331badef1a542a3d015dd5015aad
Merge: 81395acc4 06903c44a
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 18:10:46 2018 -0400

    Merge pull request #14126 from mrdoob/webglrenderer

    WebGLRenderer: Added WebGLAnimation

commit 06903c44a2d9c8cb0a57373999e0596aa51d5627
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 18:09:25 2018 -0400

    WebGLRenderer: Added WebGLAnimation.

commit 73bcb8cc9af886baef195c815ac5e8c1dfc2a2b8
Author: sunag <contact@sunag.com.br>
Date:   Wed May 23 17:54:54 2018 -0300

    fix getWorldPosition target alert

commit 81395acc4bb5d23aa66c4a4b0b03dc29fdfbb228
Merge: c64a4527d b55374012
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 16:49:17 2018 -0400

    Merge pull request #14124 from mrdoob/webglrenderer

    WebGLRenderer: Renamed animate() to setAnimationLoop().

commit b55374012d1842c3c536b757adc7ad9ff5caa68d
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 16:48:38 2018 -0400

    WebGLRenderer: Renamed animate() to setAnimationLoop().

commit 68661ac3062cca63b6fa86d11ad9f1fbc3a29903
Author: sunag <contact@sunag.com.br>
Date:   Wed May 23 17:41:40 2018 -0300

    rename (FloatNode|IntNode).number to *.value

commit bd003d5fef3b6432cf798603dbce1d0e191ced5c
Author: sunag <contact@sunag.com.br>
Date:   Wed May 23 17:40:37 2018 -0300

    debug NodeUniform

commit c64a4527da327378ef318f018f83a7c897e3fa2f
Merge: 147d998ce 202bbb342
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 16:07:31 2018 -0400

    Merge pull request #13998 from mooncaker816/splitByUnicode

    Font: handle unicode string split properly

commit 147d998ce3889ed9d093e79a519f4df07ce34949
Merge: e6c992f8f 28f1672e5
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 15:30:14 2018 -0400

    Merge pull request #14123 from takahirox/CleanupBufferGeometryUtils

    Clean up BufferGeometryUtils

commit 28f1672e5ffd58cf29b3e4d50173963169ef8fb8
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Thu May 24 04:25:42 2018 +0900

    Clean up BufferGeometryUtils

commit e6c992f8fdfc1f8d018f055fbbba02bf66e07294
Merge: b8d8a8625 0a6f4c42d
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 12:37:06 2018 -0400

    Merge pull request #14112 from donmccurdy/feat-docs-chainable-style

    Docs: use ': this' for chainable methods in common classes.

commit b8d8a8625465bd634aa68e5846354d69f34d2ff5
Merge: c63bb302c 5608b30f4
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 12:18:59 2018 -0400

    Merge pull request #14119 from Mugen87/dev7

    ParametricGeometry: Fix examples

commit c63bb302c0bd7637d6f50051c72e6c785bfbd645
Merge: c4cc1595d 910a8202f
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 12:18:17 2018 -0400

    Merge pull request #14085 from paulmasson/patch-3

    Add error for new behavior of parametric geometries

commit 5608b30f4729ccbe33d5bfa145763c12400f1df5
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 23 18:01:05 2018 +0200

    ParametricGeometry: Remove return of surface equations

commit c4cc1595da095721fdf53f2ae265d57da3802ed0
Merge: f36c9c59d 5853e9ea0
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 11:51:26 2018 -0400

    Merge pull request #14122 from mrdoob/svgloader

    SVGLoader: Fixed getReflection() and fixed control point after c command

commit 5853e9ea0ddded8b7e0f16c8e98313130b5a6241
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 23 11:50:35 2018 -0400

    SVGLoader: Fixed getReflection() and fixed control point after c command.

commit 644d350e5ab850d59ca00ffed63b6520420a6b79
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 23 11:24:02 2018 +0200

    ParametricGeometry: Fix examples

commit 44aaa9c7bc57938427b9fc051b266433971d37b3
Author: Don McCurdy <donmccurdy@google.com>
Date:   Tue May 22 22:53:44 2018 -0700

    Remove Blender exporter, add 'Loading 3D models' guide.

commit 0a6f4c42d28d1badcdad70f9d8a6e2ce1a508309
Author: Don McCurdy <donmccurdy@google.com>
Date:   Tue May 22 17:00:23 2018 -0700

    Docs: use ': this' for chainable methods in common classes.

commit 910a8202f267c7b9b25027b1d486f9e8378281d7
Author: Paul Masson <paulmasson@comcast.net>
Date:   Tue May 22 16:43:13 2018 -0700

    Revert message

commit f36c9c59db9ab449e6f4285482573537a23f19c2
Merge: 5a1fb62e4 af174c5af
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 18:06:02 2018 -0400

    Merge pull request #13885 from ferrolho/dev

    Adds physics model parser to ColladaLoader.js

commit 5a1fb62e49d796cff22e1bf848f363aaedbef9fe
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 16:40:50 2018 -0400

    Updated builds.

commit c209347254eff973802088c7e4e336490db2597e
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 16:33:14 2018 -0400

    ImageLoader: Clean up.

commit a80da38ed28329400d63e9a3b205a77f781e1615
Merge: 9051b6858 6d916aed6
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 16:31:29 2018 -0400

    Merge pull request #13271 from emeyex/imageloader-removeeventlisteners

    ImageLoader: remove image event listeners explicitly

commit 9051b685820ce689f1d0b3eefaa372c425e47cf1
Merge: 9764f648b 5503b0bfa
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 13:07:15 2018 -0400

    Merge pull request #14105 from paulmasson/patch-4

    Add error message for case not handled in DirectGeometry

commit 9764f648b77b3d0efdffdfb90ace1cffa1b9a086
Merge: 6fd78839c 24f006de4
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 13:06:48 2018 -0400

    Merge pull request #14064 from paulmasson/patch-2

    Docs: Clarify fromGeometry/fromDirectGeometry re: faces

commit 6fd78839c24fd3941364eb9d00c8bb888f0b937b
Merge: be7923219 610865831
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 12:42:43 2018 -0400

    Merge pull request #14107 from WestLangley/dev-morph_points

    PointsMaterial: add morph target support

commit be792321977ee8b3098fd7b1ce61f6e27427e158
Merge: bc44c95de 3dfba94d7
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 12:37:39 2018 -0400

    Merge pull request #14102 from gkjohnson/ply-exporter-update

    Ply exporter update

commit bc44c95defd2a12bfaac6dcf8426c8128f11f4d4
Merge: efeb95f10 fdde74af5
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 22 11:56:19 2018 -0400

    Merge pull request #14044 from mquander/updatematrixworld-microoptimize

    Make Matrix4.compose more efficient

commit 3dfba94d763f516c923aad5b9b3ffc73a9213289
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Mon May 21 20:39:38 2018 -0700

    `excludeProperties` -> `excludeAttributes`

commit 5907d575e9253e2d93a36f678ffde7d9348f000d
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Mon May 21 20:31:48 2018 -0700

    Merge the PLYLoaders

commit 869cd160f56a46d1ae22b973c107bcc08f79ce0f
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Mon May 21 20:31:38 2018 -0700

    Add missing default 'binary' option to GLTFLoader

commit fdde74af5c6b30e984f43adcf8954131628b5df1
Author: Marshall Quander <marshall@quander.me>
Date:   Mon May 21 20:22:36 2018 -0700

    Prefer linear assignment order in Matrix4.compose

commit efeb95f10790ab4755171584139d5344177f2713
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 18:09:46 2018 -0400

    Updated builds.

commit 47e7134933eec3f8a16b0c3e84b73e0734753d0a
Merge: a24fe06a5 729c52f73
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 15:03:23 2018 -0700

    Merge pull request #14108 from mrdoob/svgloader

    SVGLoader: Handle double decimal values.

commit 729c52f7391024126f56a8d4d327b45a2e1c046e
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 17:59:59 2018 -0400

    SVGLoader: Handle double decimal values. See #13919

commit 610865831f12ad8048545719127dc2b2bb9cbfb4
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Mon May 21 17:10:01 2018 -0400

    PointsMaterial: add morph target support

commit c11662b22ffb2babba1754854f0449f956411188
Author: Marshall Quander <marshall@quander.me>
Date:   Mon May 21 13:20:55 2018 -0700

    Fix inaccurate comments in Matrix4

    These weren't really correct, since Matrix4 elements are stored in
    column-major order.

commit 5503b0bfa83516f3cddc810521161769806449fa
Author: Paul Masson <paulmasson@comcast.net>
Date:   Mon May 21 13:00:32 2018 -0700

    Cleanup

commit 30f103f0044d881d0c00166e58c80b770514d224
Author: Paul Masson <paulmasson@comcast.net>
Date:   Mon May 21 12:56:20 2018 -0700

    Update error message

commit a24fe06a506d4ebda065919930b8aad6380d3650
Merge: 0c5a184e1 22e44073b
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 12:51:31 2018 -0700

    Merge pull request #13921 from takahirox/BufferGeometryUserData

    Add userData to BufferGeometry

commit 03cdce01084b325f2ed061d4fe027dd160dd48a5
Author: Paul Masson <paulmasson@comcast.net>
Date:   Mon May 21 12:37:19 2018 -0700

    Add error message

commit 0c5a184e1d0783482eabd7e9668d22b857bfd376
Merge: 0ec348971 2df38a25d
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 12:12:06 2018 -0700

    Merge pull request #14086 from WestLangley/dev-points

    PointsMaterial: remove unused shadowmap chunks

commit 0ec348971d7ae4116afd4dd5df3b0f45a53c7c04
Merge: d695379af d4098309b
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 12:06:55 2018 -0700

    Merge pull request #14100 from takahirox/GLTFLoaderLessMaterialCloning

    GLTFLoader: Optimization, Less clone materials

commit d4098309b2c048c914ac500ffd166ddb1e2d526e
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 22 00:26:45 2018 +0900

    GLTFLoader: Rename cachedMaterial with clonedMaterial

commit d695379aff9b7bbff9d227b27252ae849d02ba91
Merge: f517ddc98 ab358fd28
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 08:00:36 2018 -0700

    Merge pull request #14097 from WestLangley/dev-hdr_loader

    RGBELoader example: custom shader no longer required

commit f517ddc9849f6152cbefb7f6ddd80e247d958db6
Merge: 7dffdd236 d5092d41b
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 21 07:46:40 2018 -0700

    Merge pull request #14103 from jimmyland/patch-1

    vetex->vertex

commit d5092d41b3687dc695d0551b1c7c9e52b6451409
Author: James Andrews <zaphos@gmail.com>
Date:   Mon May 21 03:02:02 2018 -0700

    vetex->vertex

commit 76eb28e6f1d55552869737fcf29f82b5c8723c99
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Sun May 20 13:37:14 2018 -0700

    Small correction

commit b55743ebcde87751606933bdbd6d45b25eb3a8be
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Sun May 20 13:33:50 2018 -0700

    Update error message

commit 5a44ac52bfd0c2f57a75d6483b29879701045685
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Sun May 20 13:20:19 2018 -0700

    Update PLY exporter and add binary verision

commit 95b1cd2eb6f05ed6422215627a24bdafdd930a58
Merge: ad227614d 7dffdd236
Author: Garrett Johnson <garrett.kjohnson@gmail.com>
Date:   Sun May 20 13:13:15 2018 -0700

    Merge pull request #1 from mrdoob/dev

    merge master

commit 3ee253822c8211c814399aca185f7c5cf6fe94cc
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Mon May 21 00:17:27 2018 +0900

    GLTFLoader: Less clone materials

commit ab358fd28e3bf18cfd0b3df343addc31bfd345d6
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Sat May 19 22:19:03 2018 -0400

    Custom shader no longer required

commit 7dffdd2367b691075ef5e3194d52918adaca2212
Merge: 2ec2aa084 707d575b4
Author: Mr.doob <info@mrdoob.com>
Date:   Sat May 19 10:40:20 2018 -0700

    Merge pull request #14095 from takahirox/MMDLoaderDocMinorUpdate

    MMDLoader doc: Minor update

commit 707d575b446a38f4971238ad6a74bb597fb2046c
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sun May 20 01:43:06 2018 +0900

    MMDLoader doc: Minor update

commit 2ec2aa084294f9d3aba7f8e1d0c359c5af7039f3
Merge: 17afe07fc 066e210d9
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 18 18:09:14 2018 -0700

    Merge pull request #14067 from takahirox/GLTFLoaderMultiMaterialMorphAnimation

    GLTFLoader: Fix loadAnimation for Morph + MultiMaterial

commit 17afe07fc4ff10fb767ec8302405eb505140b077
Merge: 45e55bb74 fb141549f
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 18 12:26:05 2018 -0700

    Merge pull request #14092 from takahirox/VRMLoaderPrototypeUpdate

    VRMLoader prototype update

commit 45e55bb74aa0c5a665ed1b15c9e361626ef0e9ca
Merge: 0e7eb7624 5153a2d72
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 18 12:23:40 2018 -0700

    Merge pull request #14084 from richardmonette/fix-exr-load-edge-case

    fix exr load edge case

commit 0e7eb7624f0764ced2f678044d10628846d8a4b6
Merge: f184feaf5 959dfcaa3
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 18 10:28:50 2018 -0700

    Merge pull request #14093 from Mugen87/dev7

    DOF2: Fix broken example

commit 066e210d9bedc867ef2e8e87ecde7d16b27b8278
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Fri May 18 12:09:34 2018 -0500

    GLTFLoader: Clean up loadAnimation

commit 959dfcaa32095e8fc4e0dfe2d36f8a22a0adcb6c
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 18 17:56:55 2018 +0200

    BokehShader2: Fix DOF calculation

commit 4896d6fc93897293f250562ffa97325543e383ed
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 18 17:42:16 2018 +0200

    BokehShader: Fix shader mode

commit 4fede64ffc8f519b1fb3e338a2da8bd5da63ffbb
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 18 17:38:02 2018 +0200

    DOF2: Fix broken example

commit fb141549f58e330b1b08b8b0db513ce6d4f955e2
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Fri May 18 23:48:14 2018 +0900

    VRMLoader prototype update

commit 2df38a25db138dad149ddf7e9c8dbae4f9c8e872
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Thu May 17 22:36:47 2018 -0400

    Remove unused shadowmap chunks

commit 0b39b0995b3688bfbef088ce3c3df98d4f447a6f
Author: Paul Masson <paulmasson@comcast.net>
Date:   Thu May 17 16:25:16 2018 -0700

    Update error message

commit 7851e77cefefdb589b3f844b23a73366e3488f64
Author: paulmasson <paulmasson@comcast.net>
Date:   Thu May 17 13:43:17 2018 -0700

    Add error for new behavior

commit 5153a2d7267f63166ac657bad87fd5adc1ff4068
Author: Richard Monette <richard.monette@shopify.com>
Date:   Thu May 17 16:18:23 2018 -0400

    fix exr load edge case

commit f184feaf53f5a99899e602085e6f86d431b887de
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 17 13:16:07 2018 -0700

    Updated builds.

commit d59f8fdc10ea655628878dd8b3d918bcac9c8ec2
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 17 20:41:04 2018 +0200

    Docs: Clean up copy/paste error

commit 8c1f735c675fe6bf01697019f00c120bbc9520d5
Merge: 41b6c8778 c6ec8b230
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 17 10:27:01 2018 -0700

    Merge pull request #14083 from Mugen87/dev7

    Docs: Added missing notes to ImageLoader

commit c6ec8b23046008e246ce745a415aab81e9843a25
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 17 18:37:46 2018 +0200

    Docs: Added missing notes to ImageLoader

commit 41b6c8778839e022d38556cc80427650b1c4cd74
Merge: d003192e0 affb727f1
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 17 09:25:11 2018 -0700

    Merge pull request #14015 from takahirox/GLTFExporterMaterialExtras

    GLTFExporter: Serialize material.userData

commit d003192e0c634d98d457b2831b1f209d6c155319
Merge: 4f69fb58d 12fc1833b
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 17 09:04:23 2018 -0700

    Merge pull request #14078 from Mugen87/dev4

    ParametricGeometries: Remove optional target

commit 4f69fb58d5f877d48847b4d5aacf8c5ab5daadb2
Merge: 9ba138520 b7faf4373
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 17 09:00:36 2018 -0700

    Merge pull request #14081 from Mugen87/dev11

    ImageBitmapLoader: Fix signature of load()

commit 9ba138520e5f09227058342e7f139dd835a8db33
Merge: 72a1a943f 5454f169d
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 17 08:54:49 2018 -0700

    Merge pull request #14082 from Mugen87/dev7

    Docs: Added missing notes to ImageBitmapLoader

commit 5454f169da39c3608b09a1bd19c778f26dd207d0
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 17 17:49:28 2018 +0200

    Docs: Added missing notes to ImageBitmapLoader

commit b7faf437355bda9f9beb4807efc0be184cef0c12
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 17 17:14:55 2018 +0200

    ImageBitmapLoader: Fix signature of load()

commit 72a1a943fa68a99d48f05290ba0fdfd90235be1f
Merge: d2655e36d 1794855c4
Author: Michael Herzog <michael.herzog@human-interactive.org>
Date:   Thu May 17 12:43:10 2018 +0200

    Merge pull request #14079 from Mugen87/dev11

    Docs: Added note for skinned meshes

commit 1794855c4df6d543cae40faedc223331e84539cb
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 17 12:42:26 2018 +0200

    Docs: Added note for skinned meshes

commit 12fc1833be0a5953106d14596b6f152ad40d8f67
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 17 12:23:07 2018 +0200

    ParametricGeometries: Remove optional target

commit d2655e36d0b8671b1a5e7fc32d338a6c999b977d
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 16 18:05:13 2018 -0700

    Updated builds.

commit b8473db901afed18143503c1ae9aa0ce4cd3e488
Merge: 3d04a8c9b 79af30b1f
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 16 14:52:07 2018 -0700

    Merge pull request #14072 from Mugen87/dev11

    FileLoader: Remove redundant code

commit 3d04a8c9ba2081a18e24bdafb6124d231ff8c8f3
Merge: 6cc604a0e 53ccb4688
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 16 14:49:35 2018 -0700

    Merge pull request #14071 from Mugen87/dev4

    ImageBitmapLoader: Added missing resolveURL() call

commit 6cc604a0e4cdfc9cfe97bf3e5f0d929ff1d37dac
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 16 14:35:03 2018 -0700

    Clean up.

commit 8004cf730b2e60f25b51af7d8b80e2be771535d8
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 16 14:24:36 2018 -0700

    Examples: Reverted standard material example to TrackballControls

commit 79af30b1f09ad1dc7036785f3a90d0e7ee75f310
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 16 10:47:22 2018 +0200

    FileLoader: Remove redundant code

commit 939d37e599e70f6857dbf685d99e72fd59e9ead0
Merge: cd97b90dc e0ec85998
Author: Michael Herzog <michael.herzog@human-interactive.org>
Date:   Wed May 16 10:38:20 2018 +0200

    Merge pull request #14046 from Mugen87/dev7

    ConvexObjectBreaker: Clean up

commit 53ccb46884c99e3711749c23bc3e9030d9188c13
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 16 10:26:36 2018 +0200

    ImageBitmapLoader: Added missing resolveURL() call

commit cd97b90dcc26fb70eb2d06875c5cd55c37435335
Merge: e026cef12 b7e900049
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 15 23:05:10 2018 -0700

    Merge pull request #14069 from WestLangley/dev-instancing_lambert2

    Lambert instancing example: replace ShaderMaterial with modified MeshLambertMaterial

commit b7e90004993867e82c60ee7ee013a4402a79f778
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Wed May 16 00:29:22 2018 -0400

    Replace ShaderMaterial with modified MeshLambertMaterial

commit e026cef12cc23fd60d84a5663816d99531319f97
Merge: 3e0fe7ad7 1a4217b66
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 15 18:34:13 2018 -0700

    Merge pull request #14061 from takahirox/VRMLoaderExampleBugFix

    Fix VRM Loader example. Material is MultiMaterial in general.

commit 3e0fe7ad766929aac0c6088dcb7e9d527f7ea48a
Merge: 6da565a1c d2a102e46
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 15 15:59:21 2018 -0700

    Merge pull request #14062 from FalkF/patch-1

    [Docs] Use more appropriate rotation speed

commit 6da565a1cc9775a4d053bf6ee1670b5d470837d2
Merge: 4de955d7b 03bfb1fc6
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 15 11:02:40 2018 -0700

    Merge pull request #14066 from richardmonette/fix-chromaticities-return

    fix chromaticities return

commit ae515953df2df8170a65b72a72dc7ab11b014295
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 15 23:34:10 2018 +0900

    GLTFLoader: Fix loadAnimation for Morph + MultiMaterial

commit 03bfb1fc6454d129d36dd2535c3b0b440b9aff72
Author: Richard Monette <richard.monette@shopify.com>
Date:   Tue May 15 10:07:26 2018 -0400

    fix chromaticities return

commit 24f006de4d5186e42837ef40f46be319d91c4ba2
Author: Paul Masson <paulmasson@comcast.net>
Date:   Mon May 14 18:03:57 2018 -0700

    Clarify fromGeometry/fromDirectGeometry re: faces

commit 4de955d7be3b076b69f52d416a635b0c9f445956
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 14 15:40:42 2018 -0700

    Updated builds

commit 3bd2353290c5fea0638ac93b1e84a61eb0479104
Merge: 950bbfac4 3268df102
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 14 13:30:15 2018 -0700

    Merge pull request #14057 from takahirox/AddAttributeReturnValue

     Fix inconsistency of return value from BufferGeometry .addAttribute

commit 950bbfac45703742c2a863cf088b5ca5039ddddf
Merge: 78f33cf6c 7d63f7780
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 14 13:23:57 2018 -0700

    Merge pull request #14045 from Mugen87/dev4

    WebGLUniforms: Added full caching for PureArrayUniform

commit 78f33cf6c8afb06acd65c571ce66706b8d665e2b
Merge: cd32a0ad2 dd90dbea1
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 14 13:21:51 2018 -0700

    Merge pull request #14056 from paulmasson/patch-1

    Minor cleanup

commit d2a102e463f08f22d98428d2183f8f4f5ae39720
Author: FalkF <fabian.obermaier@yahoo.de>
Date:   Mon May 14 20:55:24 2018 +0200

    Use more appropriate rotation speed

    Just fixing the dangerously fast rotation speed.

commit 1a4217b666f6688fcbff115ea3c23290d990ffd0
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 15 02:34:59 2018 +0900

    Fix VRM Loader example. Material is MultiMaterial in general.

commit 3268df1029fb9a88c98f32757bc6c48004d0c487
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sun May 13 16:44:09 2018 +0900

    Update BufferGeometry doc

commit 51d12de5e8bcc82dad2f2e75b690847b7d768c09
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sun May 13 16:43:38 2018 +0900

    Fix inconsistency of return value from BufferGeometry .addAttribute

commit dd90dbea11b74f2f218d5045c9b9df5c55141c07
Author: Paul Masson <paulmasson@comcast.net>
Date:   Sat May 12 17:23:29 2018 -0700

    Minor cleanup

commit e0ec85998494dececbd6402ee6b22e432b2cdcbb
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Sat May 12 11:09:11 2018 +0200

    ConvexObjectBreaker: Clean up

commit 7d63f7780b4ec444c365343285c6268777545e3e
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Sat May 12 10:45:26 2018 +0200

    WebGLUniforms: Added full caching for PureArrayUniform

commit fe4b89a167b69037305d55c7b5b310e10daf993a
Author: Marshall Quander <marshall@quander.me>
Date:   Fri May 11 23:59:48 2018 -0700

    Fix style bugs

commit 7f0a1234c2d6726f625740595455ff5274f7d5f6
Author: Marshall Quander <marshall@quander.me>
Date:   Fri May 11 23:33:24 2018 -0700

    Make Matrix4.compose more efficient

commit cd32a0ad237b14b0eb06b43e2dacf3c887a6f6f0
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 19:07:23 2018 -0700

    Added collision handling to Daydream example

commit 9d49330a58cca0cba21d0869c0e610e1b76c9e52
Merge: fcafe9331 fd1ad09fb
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 19:02:14 2018 -0700

    Merge pull request #14026 from paulmasson/webvr

    Add collision handling to GearVR example

commit fcafe933138233473085bc3653a16e6a27026043
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 18:30:32 2018 -0700

    Updated builds.

commit 467e404d8f3d2a2b41e132ff8ab8521051f0b3ce
Merge: 19f6d3cb6 a2a0f9912
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 18:28:32 2018 -0700

    Merge pull request #14028 from WestLangley/dev-alpha_test3

    Ensure alphaTest is formatted as a float

commit 19f6d3cb6277e147cc06435711f1aa1bab222017
Merge: 4858285ee ea4912325
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 17:53:38 2018 -0700

    Merge pull request #14036 from kaisalmen/OBJLoader2_V241

    OBJLoader2 V2.4.1 fixes five bugs

commit 4858285ee3eff724bc3999ed7bffab0a8f653d96
Merge: 47a4fdf42 7058bf8ea
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 17:40:34 2018 -0700

    Merge pull request #14039 from pcsteppan/patch-1

    Fixed variable name.

commit 47a4fdf42991e7554e615a3125943740d0f96eb2
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 17:19:51 2018 -0700

    Updated builds.

commit 624b961bc7b393e6d3fe8c02f244e6f1c0fd062c
Merge: 5431987e9 91f702bbd
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 17:10:13 2018 -0700

    Merge pull request #14040 from Mugen87/dev4

    WebGLUniforms: Added caching for setValueT1a/setValueT6a

commit 5431987e93f10da7a323dfc19234efd9535b7a05
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 11 12:56:56 2018 -0700

    WebVR: Added exit webxr support.

commit 91f702bbda19ea8d00686a6cb795bd0827040930
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 11 11:15:45 2018 +0200

    WebGLUniforms: Added caching for setValueT1a/setValueT6a

commit 7058bf8ea3a9f9c11bf76ef158e7b9a22757a74d
Author: Patrick Steppan <patrick.steppan@gmail.com>
Date:   Thu May 10 23:08:47 2018 -0500

    Fix variable name.

    Change the variable name 'cube' to 'klein'.

commit 50702559e1b39faf1c0144b8534ede8a52d1390b
Merge: a0c93c968 332471b85
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 10 20:01:08 2018 -0700

    Merge pull request #14038 from Mugen87/dev4

    WebGLUniforms: Clean up

commit 332471b85732d38887a251006b52d4f1709af665
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 10 23:54:17 2018 +0200

    WebGLUniforms: Clean up

commit a0c93c9688e1567bc252605bd64af926c982f39d
Merge: 635179212 03681b7bd
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 10 14:17:29 2018 -0700

    Merge pull request #14027 from mquander/updatematrixworld-microoptimize

    Add updateMatrixWorld benchmark

commit 635179212570586f8130ce9a287b4bbc4fb4338c
Merge: 1645dbfe3 dfb93f640
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 10 13:40:27 2018 -0700

    Merge pull request #14037 from takahirox/WebGLStateCleanup

    Clean up enableAttribute of WebGLState

commit dfb93f6409a57717e394fc042ac8a52535dbea30
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Fri May 11 01:21:45 2018 +0900

    Clean up enableAttribute of WebGLState

commit ea49123258e33f2c9e07bfe584872b4d50b30df8
Author: Kai Salmen <myself@kaisalmen.de>
Date:   Thu May 10 14:09:29 2018 +0200

    Updates OBJLoader2 to V2.4.1 which fixes the following bugs:
    - #14010: `TRHEE.OBJLoader2.loadMtl` transforms an ArrayBuffer to String `THREE.LoaderUtils.decodeText` if content is provided as ArrayBuffer
    - #14032: Vertex Color value was not correctly initialized. Vertex colors are now correctly used
    - Original repo issue 40: Added function `TRHEE.OBJLoader2.setUseOAsMesh` to enforce mesh creation on occurrence of "o". The default is false (spec compliant).
    - Original repo issue 39: Ensure name of `THREE.LoaderSupport.ResourceDescriptor` always has a default name
    - Original repo issue 38: Fixed onMeshAlter and onLoadMaterials callback usage in `THREE.LoaderSupport.WorkerDirector` and fixed handling of returned objects in `THREE.LoaderSupport.MeshBuilder`

commit 1645dbfe3ff1ad37904969f4e6b17fc3b87a1d96
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 9 18:23:40 2018 -0700

    Updated  builds.

commit 3b201685f5f20e8883a26ec6475809e0599c8913
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 9 18:18:44 2018 -0700

    WebXRManager: Added getStandingMatrix().

commit a9047c54cbcc9f53c358ca53db4c4f7c67687a41
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 9 13:14:06 2018 -0700

    Updated builds.

commit 139a4806c3e48a707d0a652768d0f7b397e59709
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 9 13:11:31 2018 -0700

    WebGLUniforms: Fixing js performance regression. See #14025

commit 2e538734877bd239bad3f9f92cb3089da53bcb48
Merge: ef11a1626 46ac01b6e
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 9 11:30:05 2018 -0700

    Merge pull request #14025 from Mugen87/dev4

    WebGLUniforms: Added caching for SingleUniform

commit 46ac01b6e971c6bcf0500e54c777d4ef84d428a7
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 9 10:51:27 2018 +0200

    WebGLUniforms: Clean up

commit 52f6cb3627e29bd592b0bac93cad2521b69a4adc
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 9 10:44:59 2018 +0200

    WebGLUniforms: Introduce helper functions for caching

commit b9ce7d71606f87613ed1651c549a2f8ed450f9ec
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 9 10:31:56 2018 +0200

    WebGLInfo: Remove "uniformUpdates"

commit a2a0f99129749da41178642bf6541e4b61e098c7
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Tue May 8 20:14:17 2018 -0400

    Ensure alphaTest is formatted as a float

commit 03681b7bd6e1a3910a667a03ba99f79d396289ac
Author: Marshall Quander <marshall@quander.me>
Date:   Tue May 8 16:07:33 2018 -0700

    Add updateMatrixWorld benchmark

commit a0bcb5635248d159a0087f9d8f64c7d7ad43ad33
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Tue May 8 23:22:57 2018 +0200

    WebGLUniforms: Format

commit fd1ad09fb8cf5d1af0c8f94ed107b035bafb90f3
Author: Paul Masson <paulmasson@comcast.net>
Date:   Tue May 8 14:20:19 2018 -0700

    Improve collision handling

commit 1efb2dc1a49444671cf053431e5e5a541824b512
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Tue May 8 23:14:01 2018 +0200

    WebGLUniforms: Added caching for SingleUniform

commit 63f7f8b0bc17795364fa72d34cd6ac7d71203cbe
Author: Paul Masson <paulmasson@comcast.net>
Date:   Tue May 8 13:54:35 2018 -0700

    Add collision handling

commit ef11a1626d450c3fd2f0e3a6b92637af3408a958
Merge: ee488e29e 11bf4819d
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 8 12:36:38 2018 -0700

    Merge pull request #14020 from Mugen87/dev11

    Audio: Honor new autoplay policy in examples

commit ee488e29e8ea075cfb003c312dbd86f101d49240
Merge: 65a6875d6 c8d849898
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 8 12:24:15 2018 -0700

    Merge pull request #14023 from Mugen87/dev4

    WebVR: Update origin trial token

commit c8d8498982571a1dfda1052ce887766dba3c339f
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Tue May 8 19:39:50 2018 +0200

    WebVR: Update origin trial token

commit affb727f1e4531a72478f9c76da826eb0f8605fd
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 8 19:50:07 2018 +0900

    GLTFExporter: Return an empty object if fails to serialize userData

commit 735787d916ca166c8488fa5f985a660cb1b3a571
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 8 19:44:39 2018 +0900

    GLTFExporter: Do not halt even if userData serialization fails.

commit 11bf4819d69b4c541f6055ee669b8b2519878b37
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Tue May 8 10:30:30 2018 +0200

    Examples: Format

commit f90e26be6fc73b358173cf0213b144a879c51697
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Tue May 8 10:23:44 2018 +0200

    Audio: Honor new autoplay policy in examples

commit 65a6875d604853fa8a73badf1c39a927997073af
Merge: e10057f07 4a13b34e9
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 18:23:03 2018 -0700

    Merge pull request #13707 from takahirox/GLTFLoaderMultiMaterial

    GLTFLoader: MultiMaterial support

commit e10057f07c2c4fc6b400b47646c3521896f95206
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 17:31:20 2018 -0700

    Updated builds.

commit d0a395284bcc0acdc0b40509f60342171b421fbb
Merge: e6c13503a 7bd830420
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 17:30:02 2018 -0700

    Merge pull request #14019 from mrdoob/webxr

    WebXRManager: Removed console.logs.

commit 7bd83042095acba3dfe05f031016692539c19ae7
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 17:29:35 2018 -0700

    WebXRManager: Removed console.logs.

commit e6c13503ac9a467f78bfe39f7a2c8fe4219308ec
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 17:09:08 2018 -0700

    Updated builds.

commit 95c229add6e5b218e0637175e3b8e481ff8b5b03
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 17:08:26 2018 -0700

    Box3: applyMatrix4 clean up.

commit 2521f1a76dfbe2126515e2ec78415b4198052da0
Merge: a846757d7 a355aa803
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 16:48:46 2018 -0700

    Merge pull request #13993 from mikialex/dev

    Fast Box3 applyMatrix4

commit a846757d7fa6a9b04d185be51110cf07279444e9
Merge: 2a7da72df 6163e2865
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 16:26:53 2018 -0700

    Merge pull request #14005 from Mugen87/dev7

    Examples: Clean up

commit 2a7da72dfc8f6fdad6cfb577442fa3b863ecd0bb
Merge: 8fe9d13fa 2b397ae8d
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 14:10:47 2018 -0700

    Merge pull request #14007 from takahirox/MMDLoaderUpdate2

    MMDLoader update part3

commit 8fe9d13faf1fb24ddac89b5de3530cf0704adc0a
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 13:55:59 2018 -0700

    Clean up.

commit fbe86b553034b2414343122afdfca0f61f8688f2
Merge: d953920c6 2f2e5f731
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 13:53:18 2018 -0700

    Merge branch 'master' into dev

commit 2f2e5f73181e7e3e1a845ab5d9c67192cb1e16e4
Merge: ba4489ded a2a744c89
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 13:51:42 2018 -0700

    Merge pull request #14014 from Dawars/patch-1

    [example] Fixing improper aspect ratio on window resize

commit d953920c628f6a571e785d6a260c4af9d5119ca6
Merge: 624b4e6a4 5262440b1
Author: Mr.doob <info@mrdoob.com>
Date:   Mon May 7 13:50:10 2018 -0700

    Merge pull request #14012 from WestLangley/dev-instancing_lambert

    New example: instancing with lambert shader and shadows

commit 39a01e4adf19c72e6910ae9570369e09be076219
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 8 02:00:06 2018 +0900

    GLTFExporter add missing argument for catch

commit cb9dc432ac2e4c2fb586f3131ce2a0e1376a28a1
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 8 01:09:41 2018 +0900

    GLTFExporter: Serialize material.userData

commit 5262440b18f287a3d384cad6b769a5fc87e04a30
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Mon May 7 11:34:44 2018 -0400

    handle resize event

commit a2a744c891020daf19fe0cf4ac1ee6760c802819
Author: Dávid Komorowicz <dawars00@gmail.com>
Date:   Mon May 7 13:20:09 2018 +0200

    Fixing improper aspect ratio on window resize

commit 53b1867a30e6bb7fb5f6796f62641899d319592b
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Mon May 7 01:26:25 2018 -0400

    Add instancing lambert example

commit 2b397ae8dc28df9785ae58ca95c1491c089cd256
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Mon May 7 04:15:57 2018 +0900

    Update CCDIKSolver doc

commit 5165c047a5b68d9108c47d9a1aa068a2f2365f3e
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Mon May 7 04:13:07 2018 +0900

    Change rotationMin/Max type to Vector3

commit a873cb081375285cfa2454b163040a2b24b7ca64
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Mon May 7 02:01:18 2018 +0900

    MMDLoader IK link rotationMin/Max support

commit d19a0fd742b8daaa29d188fa8553831f9576989d
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Mon May 7 02:00:14 2018 +0900

    CCDIKSolver rotationMin/Max support

commit 9d9d09f6924072c474fbb6603cc656713d1e4b75
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sun May 6 20:32:53 2018 +0900

    MMDLoader bug fix

commit fc77f814acce97efe816f95608aafa9c4aee8659
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sun May 6 20:32:07 2018 +0900

    Make solvers even animation is defined

commit 6163e28654ec3e13240894da193eeaa4c77a52db
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Sun May 6 11:02:10 2018 +0200

    Examples: Clean up

commit 624b4e6a45c4b123a87c2cb6b24fae5abca884be
Merge: 06068e744 c3d53b26b
Author: Michael Herzog <michael.herzog@human-interactive.org>
Date:   Sun May 6 10:32:46 2018 +0200

    Merge pull request #13994 from Mugen87/dev4

    Crossfade: Moved to BufferGeometry

commit 06068e744e39188637a0c6fb9bd4da5cb7ccfb8f
Merge: 7ed51314b c66280f1c
Author: Mr.doob <info@mrdoob.com>
Date:   Sat May 5 18:03:11 2018 -0700

    Merge pull request #14000 from WestLangley/dev-rt_mipmaps

    WebGLRenderTarget: honor options.generateMipmaps in constructor

commit 7ed51314b44546ddb34cdcef31f6845f0d251085
Merge: e1032aef1 d27bdc1dc
Author: Mr.doob <info@mrdoob.com>
Date:   Sat May 5 17:30:36 2018 -0700

    Merge pull request #13999 from WestLangley/dev-fat_line_clipping

    Fat Lines: clipping support

commit e1032aef1b3ecd2760cac1598bb2b91e31a4023d
Merge: 307d9ee99 84462a6d3
Author: Mr.doob <info@mrdoob.com>
Date:   Sat May 5 17:16:30 2018 -0700

    Merge pull request #13884 from Mugen87/dev3

    Examples: Fix god rays demo

commit 307d9ee99e2947bd9171453ea4eb3444dac1c6b1
Merge: 04e86d0e9 042ddbe21
Author: Mr.doob <info@mrdoob.com>
Date:   Sat May 5 16:32:13 2018 -0700

    Merge pull request #13996 from Mugen87/dev7

    WebXR: Added origin trials token

commit 04e86d0e9f7f4dafffc134064c36049a7368deca
Merge: 22f53d659 a8c3bb18d
Author: Mr.doob <info@mrdoob.com>
Date:   Sat May 5 16:30:34 2018 -0700

    Merge pull request #14002 from donmccurdy/bug-gltfloader-draco-normalized

    DRACOLoader: Update to v1.3.1, support typed attributes.

commit 22f53d6599a7a1028096e8db3e64577221ff23b7
Merge: e6aeced47 e364c86d3
Author: Mr.doob <info@mrdoob.com>
Date:   Sat May 5 16:26:03 2018 -0700

    Merge pull request #14001 from takahirox/MMDLoaderUpdate

    MMDLoader clean up part2

commit a8c3bb18d99bff810670a918583e4891c7694e62
Author: Don McCurdy <don.r.mccurdy@gmail.com>
Date:   Sat May 5 11:22:05 2018 -0700

    GLTFLoader: Fix case for uncompressed attribute in Draco primitive.

commit a4b52f8cb5569c69d3801e5b4ba236cd75fdfde9
Author: Don McCurdy <don.r.mccurdy@gmail.com>
Date:   Sat May 5 11:16:47 2018 -0700

    DRACOLoader: Update libs.

commit 0bf37822f3c693ed5f700845666cf2886c065b11
Author: Don McCurdy <don.r.mccurdy@gmail.com>
Date:   Sat May 5 11:16:34 2018 -0700

    DRACOLoader: Support attribute type map.

commit 1fa63b9166cd42be77c94eb1e1f899e8a7ee36bb
Author: Don McCurdy <don.r.mccurdy@gmail.com>
Date:   Thu May 3 23:03:41 2018 -0700

    GLTFLoader: Fix normalized attributes in Draco meshes.

commit 042ddbe21becdc2f8efe1058c43023877a01fc22
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Sat May 5 18:24:06 2018 +0200

    Editor: Added WebXR origin trials token

commit 7eaaf203be50a46a985579c212af4b7df1848b71
Merge: 0165725fc e6aeced47
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Sat May 5 18:22:29 2018 +0200

    Merge remote-tracking branch 'upstream/dev' into dev7

commit e364c86d3088d118384a22b9450eaec7ca462278
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 22:01:01 2018 +0900

    Update docs/list.js

commit b61a4713d1a06c8fb282f75ddb81cae958431722
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 22:00:37 2018 +0900

    Add MMDPhysics doc

commit b2db307a6f47197b2b9638994f37d12e045f3454
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 22:00:12 2018 +0900

    Add CCDIKSolver doc

commit c90f19e276215244cf0d4eca3ffa7bcca2237931
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 21:59:50 2018 +0900

    Update MMDAnimationHelper doc

commit 8fd4c92da6f296cc4e5a7f2a60a9f80cd915bd6e
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 21:58:54 2018 +0900

    Update MMDLoader example

commit 6ba371adff1492657169c3ce88ffd67ea97a0955
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 21:58:25 2018 +0900

    Update MMDPhysics

commit ba54e42b73fdbe9d5a16a5c983f5a4365247cfa4
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 21:58:01 2018 +0900

    Update CCDIKSolver

commit c66280f1c6eb01b4d6600bb0d017d9ff03bc78f9
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Sat May 5 02:44:20 2018 -0400

    Clean up

commit 695320ba80c16d80e07b230ff48c313b30e9f561
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Sat May 5 02:06:21 2018 -0400

    Honor options.generateMipmaps in constructor

commit d27bdc1dc647a6dd2e0d6cc65d9c1d664497c10f
Author: WestLangley <WestLangley@users.noreply.github.com>
Date:   Sat May 5 01:33:00 2018 -0400

    Clipping support

commit 202bbb3422e0884db972df6d022dec11393f7e99
Author: Mingle <MingleGu@gmail.com>
Date:   Sat May 5 09:08:46 2018 +0800

    fix minor issue #13988

commit e6aeced47b6961590658f701715d6689d3936155
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 4 16:54:28 2018 -0700

    Added webvr token to editor

commit 0165725fce68b48768ebaab6526bb98b07b5682d
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 4 22:41:15 2018 +0200

    WebXR: Added origin trials token

commit c3d53b26b3c4310978e816fc9f7e9910f159661a
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 4 22:37:29 2018 +0200

    Crossfade: Correct color values

commit d5c5c46ea03e8e73483d1acf877e8016f0824463
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 4 22:12:13 2018 +0200

    Crossfade: Clean up

commit 21ed07070719fc08cba79e1372069327cfe03e70
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 4 21:51:06 2018 +0200

    Crossfade: Moved to BufferGeometry

commit 99d02c8add3a3f60232f52f376d5e2faffe03645
Merge: df4fc95b3 3cef16521
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 4 10:56:51 2018 -0700

    Merge pull request #13826 from donmccurdy/feat-gltf-extensions

    GLTFLoader: Preserve unknown extension data on nodes and materials.

commit df4fc95b30a4211a7b92185cbec3d0bc0f01d128
Merge: f455e853c 52ab356ce
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 4 10:49:39 2018 -0700

    Merge pull request #13987 from Mugen87/dev4

    Examples: Clean up

commit f455e853c3dd9896154c20f552fd6baf8cd0f73c
Merge: 75883b2ff 1d97a7fd0
Author: Mr.doob <info@mrdoob.com>
Date:   Fri May 4 10:30:47 2018 -0700

    Merge pull request #13986 from Mugen87/dev7

    MarchingsCubes: Clean up

commit 0e50b65369d81f2c7c9857488d4a19a3e37df0e1
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 01:09:58 2018 +0900

    Update MMDLoader example

commit 20e91eb08de29b51c969f65bfd1e60dd6e42026f
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 01:06:20 2018 +0900

    Update MMDPhysics

commit 5dc082cc2e31db98424293a7232b68521592e4d3
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 01:05:56 2018 +0900

    Update MMDAnimationHelper

commit 847ecb4d678f9f40b31dd7139bc40b2cffa34830
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Sat May 5 01:05:18 2018 +0900

    Update CCDIKSolver

commit a355aa803bb47d0725bf17bf39e9a0a8865e981b
Author: MikiAlex <18516340862@163.com>
Date:   Fri May 4 23:17:29 2018 +0800

    use var instead of const

commit 155d58c0c4f623ae496ec8967630f051312a153b
Author: MikiAlex <18516340862@163.com>
Date:   Fri May 4 23:13:41 2018 +0800

    fast box3 applyMatrix4

commit 4304028780b5b88a7b7e66ea7aadb2aaa99d2c4d
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Fri May 4 23:56:40 2018 +0900

    Update MMDAnimationHelper doc

commit cc3d60f8d860326264ca7416b25ffca5386a9a27
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Fri May 4 23:56:15 2018 +0900

    Update MMDPhysics

commit 7ab9f8ac025db2daf35962c779363e42c4a58f33
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Fri May 4 23:55:21 2018 +0900

    Update MMDAnimationHelper

commit 52ab356cec585844f7a6b68c135a10c2604687c7
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 4 10:16:01 2018 +0200

    Examples: Clean up

commit 1d97a7fd04354ee13154bdbc3a266fb538de77e3
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Fri May 4 09:41:54 2018 +0200

    MarchingsCubes: Clean up

commit 75883b2ff2919356aecb58cb56fc946ee5fbc65a
Merge: 54060c805 b3508596a
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 17:38:50 2018 -0700

    Merge pull request #13985 from mrdoob/marchingcubes

    MarchingCubes: Deprecated generateGeometry()

commit b3508596a84fc3f29248f24ed71e40769807b5e7
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 17:37:57 2018 -0700

    MarchingCubes: Deprecated generateGeometry()

commit 54060c805b1da6bef634789009dc255868f55109
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 17:35:50 2018 -0700

    MarchingCubes: Clean up.

commit 17641da7908423368ff079f73338e0df979172a2
Merge: 4a32ee68a 27f07c986
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 17:26:54 2018 -0700

    Merge pull request #13955 from spite/marchingcubes-buffergeometry

    BufferGeometry from MarchingCubes

commit 4a32ee68a7e8986802f7e112476a1db3c88a28ee
Merge: 2012e3efe c5fc74382
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 17:06:07 2018 -0700

    Merge pull request #13936 from Mugen87/dev11

    Examples: Clean up

commit 2012e3efebe184304c6402cba4c0422fd98fac53
Merge: 7e8fa8329 14dce44a1
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 16:01:07 2018 -0700

    Merge pull request #13984 from woodchuck00/patch-1

    Update README.md

commit 14dce44a1dd96f547bc13e8d7bc456fd55e3b83a
Author: theo <tatheodor@gmail.com>
Date:   Thu May 3 17:49:29 2018 -0400

    Update README.md

    This is the location of the addon folder if you are using Blender 2.79

commit 7e8fa8329a666a3f20891b195c0868ec19b2c77e
Merge: aa1153b06 72338d26b
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 12:42:42 2018 -0700

    Merge pull request #13974 from Mugen87/dev4

    Examples: Refactor webgl_multiple_elements_text

commit aa1153b069382a3e82bbe80f1d3294b82c443fe6
Merge: 60e365aa2 7143d8ddc
Author: Mr.doob <info@mrdoob.com>
Date:   Thu May 3 12:23:44 2018 -0700

    Merge pull request #13980 from Mugen87/dev7

    Examples: Clarify shader code

commit 7143d8ddca500d8094c624e8783fab420061032a
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Thu May 3 10:56:26 2018 +0200

    Examples: Clarify shader code

commit 60e365aa2cb9a3e58bab5e4d83441f96f8679590
Merge: c3de325d4 dc2eda69a
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 2 20:18:17 2018 -0700

    Merge pull request #13975 from takahirox/MMDLoaderV2

    MMDLoader clean up and document

commit c3de325d4197dada32265b408cd7f8d477510b68
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 2 13:57:52 2018 -0700

    Updated builds.

commit bd63a6cc8dd7fe11b530410fab9f67a9de359be8
Merge: bbfbe98cb 8f2c2fa0b
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 2 13:55:42 2018 -0700

    Merge pull request #13978 from mrdoob/webxr

    Added basic WebXR support

commit 8f2c2fa0b138783bcde21ee61ade0855e5196c36
Author: Mr.doob <info@mrdoob.com>
Date:   Wed May 2 13:54:16 2018 -0700

    Added basic WebXR support.

commit c5fc743826eb6669c28aa4484255382f80a4423f
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 2 20:05:04 2018 +0200

    Revert "Examples: New UV Debug Texture"

    This reverts commit 5ea0211260d91c90fd6143f4504e1d432dba732b.

commit dc2eda69a8d941940f300098ae3e9fd9f84d4356
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:08:20 2018 +0900

    Update docs/list.js

commit fc38b8ca4fcd5d465b028387cd5b025be5f1bd2a
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:07:48 2018 +0900

    Add MMDAnimationHelper documentation

commit 83ed893f1ba50617cdc4db232779e89a3a11ae72
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:07:10 2018 +0900

    Add MMDLoader documentation

commit 21043ad1601b0d9e89558b4ec5cb36e64e234ca8
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:06:06 2018 +0900

    Update MMD examples

commit cd18a7cbad944c397a847b0209db5dfa3a560ff2
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:04:51 2018 +0900

    Minor update of MMDPhysics

commit f3f33b5c5a661c04062cd0b8bf98f74d85e2abb7
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:04:10 2018 +0900

    Clean up MMDLoader

commit 7ebb52392c530d20a3caf88d1f3f23d68a7b2a4f
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:02:39 2018 +0900

    Separating MMDAnimationHelper from MMDLoader.js

commit 5d3fff3ec2df9de4ea33ab15f70ed6f700c75f74
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Wed May 2 22:00:58 2018 +0900

    Change OutlineEffect parameter format for serialization

commit 72338d26bf317703bab7146b78f21bd8dc28d554
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 2 11:49:46 2018 +0200

    Examples: Clean up

commit 9da8e6ad25f468594cf454c9e39070ce6a16c4b1
Author: Mugen87 <michael.herzog@human-interactive.org>
Date:   Wed May 2 11:48:24 2018 +0200

    Examples: Refactor webgl_multiple_elements_text

commit bbfbe98cb7e602aa5d969b3a236cac1a7a3197d3
Merge: 1b6b04431 f2e3a813b
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 1 17:46:34 2018 -0700

    Merge pull request #13943 from etr2460/patch-1

    Add uuid field to AnimationClip.toJSON

commit 1b6b04431d62a97ae8c03c085facaf8fe26c482b
Merge: 8916048b7 ae4bf3bc4
Author: Mr.doob <info@mrdoob.com>
Date:   Tue May 1 15:59:46 2018 -0700

    Merge pull request #13945 from daoshengmu/resize_thicknessmap

    Resize the subsurface scatting thickness map.

commit ae4bf3bc4547e6fe56272d95273e1ae6e624905b
Author: Daosheng Mu <daoshengmu@gmail.com>
Date:   Wed May 2 06:21:47 2018 +0800

    Adding the gui for controlling the parameters of thickness.

commit 8037cbca86c85a571316d38341678e0869408648
Author: Daosheng Mu <daoshengmu@gmail.com>
Date:   Wed May 2 06:14:58 2018 +0800

    Adjust the size of the thickness map and invert its black/white color.

commit 8916048b78616e8297ab4ce9a40b214072546919
Author: Mr.doob <info@mrdoob.com>
Date:   Mon Apr 30 17:36:41 2018 -0700

    SVGLoader: Clean up.

commit 60751a3ec5d1172c4df0497c3430669c4565ae75
Merge: 97f61ed83 256aaab94
Author: Mr.doob <info@mrdoob.com>
Date:   Mon Apr 30 16:47:12 2018 -0700

    Merge pull request #13954 from Mugen87/dev4

    Audio: Added .setMediaElementSource()

commit 97f61ed8334a3d90c70dc91cb95a71206fb62449
Merge: ad2f0ad01 1b56759e4
Author: Mr.doob <info@mrdoob.com>
Date:   Mon Apr 30 16:37:38 2018 -0700

    Merge pull request #13957 from WestLangley/dev-orbit_aspect

    OrbitControls: prevent aspect from affecting rotate speed

commit ad2f0ad0141c6502c36ea095d0f6666973dd575c
Merge: afd78c820 0ea3ec02b
Author: Mr.doob <info@mrdoob.com>
Date:   Mon Apr 30 16:35:18 2018 -0700

    Merge pull request #13958 from WestLangley/dev-msgpack

    MessagePack example: clean up

commit afd78c8204694780d165c331409dcd6f9e6a5235
Merge: 8c6280bf9 9954afdf8
Author: Mr.doob <info@mrdoob.com>
Date:   Mon Apr 30 16:29:24 2018 -0700

    Merge pull request #13968 from takahirox/MMDPhysicsMinorOptimization

    MMDPhysics minor optimization

commit 9954afdf899e46608429fb299dad546e29532c76
Author: Takahiro <hogehoge@gachapin.jp>
Date:   Tue May 1 06:27:41 2018 +0900

    MMDPhysics minor optimization

commit 8c6280bf92305a39eeb351a1e14514774fa5d4d8
Author: Mr.doob <info@mrdoob.com>
Date:   Mon Apr 30 11:13:21 2018 -0700

    Updated builds.

commit 7521d0e3d6d7f670647b1a775b9d8d5f317ba130
Merge: 261379e67 3141eb5b0
Author: Mr.doob <info@mrdoob.com>
Date:   Mon Apr 30 11:09:07 2018 -0700

    Merge pull request #13962 from ndebeiss/SVGLoader_sweep_flag

    SVGLoader : correction for sweep_flag

commit f2e3a813b2b533145b80be1febd5db7a41447e28
Author: Erik Ritter <erik.ritter@caffeine.tv>
Date:   Mon Apr 30 11:07:26 2018 -0700

    Use singleline if for uuid validation

commit 27f07c9867617823cb671b1a65452ecd18df5add
Author: Jaume Sanchez <the.spite@gmail.com>
Date:   Mon Apr 30 16:41:31 2018 +0100

    added concatenate

commit 232586ee65f5951957efef4050fefeaef9664a36
Author: Erik Ritter <erik.ritter@caffeine.tv>
Date:   Mon Apr 30 08:39:10 2018 -0700

    Set UUID (if exists) in ObjectLoader for AnimationClip

commit 3141eb5b06a004442de98b05575de315dc406441
Author: Nicolas Debeissat <ndebeiss@gmail.com>
Date:   Mon Apr 30 13:47:21 2018 +0200

    SVGLoader : correction for sweep_flag

commit 412f58aa546da5627a1fc8fd83b3efe17a8f3083
Author: yomotsu <oyamada@pxgrid.com>
Date:   Mon Apr 30 19:27:17 2018 +0900

    rename css2d renderer instance

commit 3fb9d61eb91d6fdb0e541061aede623c9b067f3a
Author: yomotsu <oyamada@pxgrid.com>
Date:   Mon Apr 30 19:25:44 2018 +0900

    fix lint error

commit 4f780dceb7514561bd2aa43d8dc8e425a608323f
A…
  • Loading branch information
@aymanhab
aymanhab committed Nov 20, 2018
1 parent 534f36d commit 013a7fe
Show file tree
Hide file tree
Showing 466 changed files with 33,774 additions and 25,243 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
##### Three.js version

- [ ] Dev
- [ ] r91
- [ ] r93
- [ ] ...

##### Browser
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ node_modules
npm-debug.log
.jshintrc
.vs/
test/unit/three.*.unit.js
5 changes: 5 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: node_js
node_js:
- "8.9.4"
script:
- npm run travis
85 changes: 83 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,86 @@
# three.js
JavaScript 3D library.
three.js
========

[![Latest NPM release][npm-badge]][npm-badge-url]
[![License][license-badge]][license-badge-url]
[![Dependencies][dependencies-badge]][dependencies-badge-url]
[![Dev Dependencies][devDependencies-badge]][devDependencies-badge-url]
[![Build Status](https://travis-ci.org/mrdoob/three.js.svg?branch=dev)](https://travis-ci.org/mrdoob/three.js)

#### JavaScript 3D library ####

The aim of the project is to create an easy to use, lightweight, 3D library. The library provides &lt;canvas&gt;, &lt;svg&gt;, CSS3D and WebGL renderers.

[Examples](http://threejs.org/examples/) &mdash;
[Documentation](http://threejs.org/docs/) &mdash;
[Wiki](https://github.com/mrdoob/three.js/wiki) &mdash;
[Migrating](https://github.com/mrdoob/three.js/wiki/Migration-Guide) &mdash;
[Questions](http://stackoverflow.com/questions/tagged/three.js) &mdash;
[Forum](https://discourse.threejs.org/) &mdash;
[Gitter](https://gitter.im/mrdoob/three.js) &mdash;
[Slack](https://threejs-slack.herokuapp.com/)

### Usage ###

Download the [minified library](http://threejs.org/build/three.min.js) and include it in your HTML, or install and import it as a [module](http://threejs.org/docs/#manual/introduction/Import-via-modules),
Alternatively see [how to build the library yourself](https://github.com/mrdoob/three.js/wiki/Build-instructions).

```html
<script src="js/three.min.js"></script>
```

This code creates a scene, a camera, and a geometric cube, and it adds the cube to the scene. It then creates a `WebGL` renderer for the scene and camera, and it adds that viewport to the document.body element. Finally, it animates the cube within the scene for the camera.

```javascript
var camera, scene, renderer;
var geometry, material, mesh;

init();
animate();

function init() {

camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 10 );
camera.position.z = 1;

scene = new THREE.Scene();

geometry = new THREE.BoxGeometry( 0.2, 0.2, 0.2 );
material = new THREE.MeshNormalMaterial();

mesh = new THREE.Mesh( geometry, material );
scene.add( mesh );

renderer = new THREE.WebGLRenderer( { antialias: true } );
renderer.setSize( window.innerWidth, window.innerHeight );
document.body.appendChild( renderer.domElement );

}

function animate() {

requestAnimationFrame( animate );

mesh.rotation.x += 0.01;
mesh.rotation.y += 0.02;

renderer.render( scene, camera );

}
```

If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).

### Change log ###

[releases](https://github.com/mrdoob/three.js/releases)


[npm-badge]: https://img.shields.io/npm/v/three.svg
[npm-badge-url]: https://www.npmjs.com/package/three
[license-badge]: https://img.shields.io/npm/l/three.svg
[license-badge-url]: ./LICENSE
[dependencies-badge]: https://img.shields.io/david/mrdoob/three.js.svg
[dependencies-badge-url]: https://david-dm.org/mrdoob/three.js
[devDependencies-badge]: https://img.shields.io/david/dev/mrdoob/three.js.svg
[devDependencies-badge-url]: https://david-dm.org/mrdoob/three.js#info=devDependencies
2,006 changes: 1,315 additions & 691 deletions build/three.js
View file

Large diffs are not rendered by default.

1,625 changes: 818 additions & 807 deletions build/three.min.js
View file

Large diffs are not rendered by default.

2,006 changes: 1,315 additions & 691 deletions build/three.module.js
View file

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions docs/page.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,18 @@ h3 {
margin-top: 40px;
}

p, ul, ol {
margin-top: 0;
margin-bottom: 20px;
max-width: 780px;
}

div {
/* padding-left: 30px; */
margin-bottom: 20px;
}

div.desc {
.desc {
padding-left: 0px;
}

Expand Down Expand Up @@ -123,4 +129,4 @@ span.param {

a.param:hover {
color: #777;
}
}
2 changes: 1 addition & 1 deletion docs/page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function onDocumentLoad( event ) {
text = text.replace( /\[example:([\w\_]+)\]/gi, "[example:$1 $1]" ); // [example:name] to [example:name title]
text = text.replace( /\[example:([\w\_]+) ([\w\:\/\.\-\_ \s]+)\]/gi, "<a href=\"../examples/#$1\" target=\"_blank\">$2</a>" ); // [example:name title]

text = text.replace( /<a class="param" onclick="window.parent.setUrlFragment\('\w+'\)">(null|Boolean|Object|Array|Number|String|Integer|Float|TypedArray|ArrayBuffer)<\/a>/gi, '<span class="param">$1</span>' ); // remove links to primitive types
text = text.replace( /<a class="param" onclick="window.parent.setUrlFragment\('\w+'\)">(null|this|Boolean|Object|Array|Number|String|Integer|Float|TypedArray|ArrayBuffer)<\/a>/gi, '<span class="param">$1</span>' ); // remove links to primitive types

document.body.innerHTML = text;

Expand Down
8 changes: 4 additions & 4 deletions docs/scenes/js/geometry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ var guis = {

var data = {
steps: 2,
amount: 16,
depth: 16,
bevelEnabled: true,
bevelThickness: 1,
bevelSize: 1,
Expand Down Expand Up @@ -1292,7 +1292,7 @@ var guis = {
var folder = gui.addFolder( 'THREE.ExtrudeGeometry' );

folder.add( data, 'steps', 1, 10 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'amount', 1, 20 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'depth', 1, 20 ).onChange( generateGeometry );
folder.add( data, 'bevelThickness', 1, 5 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'bevelSize', 1, 5 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'bevelSegments', 1, 5 ).step( 1 ).onChange( generateGeometry );
Expand All @@ -1305,7 +1305,7 @@ var guis = {

var data = {
steps: 2,
amount: 16,
depth: 16,
bevelEnabled: true,
bevelThickness: 1,
bevelSize: 1,
Expand Down Expand Up @@ -1333,7 +1333,7 @@ var guis = {
var folder = gui.addFolder( 'THREE.ExtrudeBufferGeometry' );

folder.add( data, 'steps', 1, 10 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'amount', 1, 20 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'depth', 1, 20 ).onChange( generateGeometry );
folder.add( data, 'bevelThickness', 1, 5 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'bevelSize', 1, 5 ).step( 1 ).onChange( generateGeometry );
folder.add( data, 'bevelSegments', 1, 5 ).step( 1 ).onChange( generateGeometry );
Expand Down
4 changes: 0 additions & 4 deletions editor/css/dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,3 @@ select {
.Outliner .option.active {
background-color: rgba(21,60,94,1);
}
#stats { position: absolute; bottom:0; left: 0 }
#stats #fps { background: transparent !important }
#stats #fps #fpsText { color: #777 !important }
#stats #fps #fpsGraph { display: none }
5 changes: 0 additions & 5 deletions editor/css/light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,3 @@ select {
.Outliner .option.active {
background-color: rgba(0,0,0,0.04);
}

#stats { position: absolute; bottom:0; left: 0 }
#stats #fps { background: transparent !important }
#stats #fps #fpsText { color: #000 !important }
#stats #fps #fpsGraph { display: none }
12 changes: 10 additions & 2 deletions editor/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<title>OpenSim 4.0 Visualizer 041518</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
<!-- Origin Trial Token, feature = WebVR (For Chrome M62+), origin = https://threejs.org, expires = 2018-06-19 -->
<meta http-equiv="origin-trial" data-feature="WebVR (For Chrome M62+)" data-expires="2018-06-19" content="Alxt96tYGgIr9l6EXU0eeI360zcmzOY6Kuo3kcTfBGIRDOQbgFIZKRQ1joExQ74WZr1einsE+cUMHgSclNHCQQ4AAABQeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJWUjEuMU02MiIsImV4cGlyeSI6MTUyOTM5NzgyOH0=">
<!-- Origin Trial Token, feature = WebXR Device API, origin = https://threejs.org, expires = 2018-06-15 -->
<meta http-equiv="origin-trial" data-feature="WebXR Device API" data-expires="2018-06-15" content="AtJH9g6nn0B87bnjJt+9m1joZXEYDmLSlRvtMr5qJD52hMcm3S86S7jg5I7y2I5cgQglE0rzsXzti5DECQLb8QkAAABQeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZSIsImV4cGlyeSI6MTUyOTA4NDY2OH0=">
<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2018-06-15 -->
<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2018-06-15" content="Aihhr0yXkVlCKF0DIpTbH8WX7ZmEexUhI/95+t8aoLfvBkePMiZ/iOoDPU3xefyfuczkDahH1L6eiPvRsuzITAAAAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTI5MDg0NjY4fQ==">
<script src="stats.min.js"></script>
</head>
<body ontouchstart="">
<link href="css/main.css" rel="stylesheet" />
<link id="theme" href="css/minimal.css" rel="stylesheet" />

<script src="../build/three.min.js"></script>
<script src="../build/three.js"></script>
<script src="js/SkinnedMuscle.js"></script>
<script src="js/OpenSimLoader.js"></script>
<script src="../examples/js/libs/system.min.js"></script>
Expand Down Expand Up @@ -38,6 +44,7 @@
<script src="../examples/js/loaders/PlayCanvasLoader.js"></script>
<script src="../examples/js/loaders/PLYLoader.js"></script>
<script src="../examples/js/loaders/STLLoader.js"></script>
<script src="../examples/js/loaders/SVGLoader.js"></script>
<script src="../examples/js/loaders/TGALoader.js"></script>
<script src="../examples/js/loaders/TDSLoader.js"></script>
<script src="../examples/js/loaders/UTF8Loader.js"></script>
Expand Down Expand Up @@ -109,6 +116,7 @@
<script src="js/Menubar.Movies.js"></script>
<script src="js/Menubar.View.js"></script>
<!-- <script src="js/Menubar.View.js"></script> -->
<!-- <script src="js/Menubar.View.js"></script> -->
<script src="js/Menubar.Examples.js"></script>
<script src="js/Menubar.Help.js"></script>
<script src="js/Menubar.Status.js"></script>
Expand Down
4 changes: 3 additions & 1 deletion editor/js/Config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
* @author mrdoob / http://mrdoob.com/
*/

var Config = function ( name ) {
var Config = function () {

var name = 'threejs-editor';

var storage = {
'autosave': true,
Expand Down
2 changes: 1 addition & 1 deletion editor/js/Editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var Editor = function () {

};

this.config = new Config( 'threejs-editor' );
this.config = new Config();
this.history = new History( this );
this.storage = new Storage();
this.loader = new Loader( this );
Expand Down
46 changes: 46 additions & 0 deletions editor/js/Loader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,52 @@ var Loader = function ( editor ) {

break;

case 'svg':

reader.addEventListener( 'load', function ( event ) {

var contents = event.target.result;

var loader = new THREE.SVGLoader();
var paths = loader.parse( contents );

//

var group = new THREE.Group();
group.scale.multiplyScalar( 0.1 );
group.scale.y *= -1;

for ( var i = 0; i < paths.length; i ++ ) {

var path = paths[ i ];

var material = new THREE.MeshBasicMaterial( {
color: path.color,
depthWrite: false
} );

var shapes = path.toShapes( true );

for ( var j = 0; j < shapes.length; j ++ ) {

var shape = shapes[ j ];

var geometry = new THREE.ShapeBufferGeometry( shape );
var mesh = new THREE.Mesh( geometry, material );

group.add( mesh );

}

}

editor.execute( new AddObjectCommand( group ) );

}, false );
reader.readAsText( file );

break;

/*
case 'utf8':
Expand Down
1 change: 1 addition & 0 deletions editor/js/Script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ var Script = function ( editor ) {
}

} );

return container;

};
Loading

0 comments on commit 013a7fe

Please sign in to comment.