Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 5360a81b8c557ed255e97b87c49e7d00b546b795
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 10:42:06 2018 -0400

    r98

commit f8dc0a9335a18eda38bf028e54cca562ea11e0d5
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 10:36:28 2018 -0400

    ObjectLoader: Refactored MultiMatrial cache code.

commit f636032609ced118edfd23c06b2c19c19589ca1f
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 10:15:42 2018 -0400

    Removed misc_ubiquity_test example.

commit 7b1d857d8d3b2c002cecb5bc0f50f66ae34c0d6c
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 10:14:26 2018 -0400

    Removed misc_lights_text example.

commit 744835688e4bd901d8c2478a3ebcd15da1eb5a4a
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:57:47 2018 -0400

    Improved webvr_ballshooter example.

commit 6d85bcdeca7e0dec1b835fcba79a85f98c8b0e1a
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:54:43 2018 -0400

    Improved webgl_effects_ascii example.

commit 2f1ba8febecb285eb073f1ffa5f6600309fbedd4
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:36:02 2018 -0400

    Clean up.

commit c286362af9f6b0a6c124867865283306f669f010
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:27:56 2018 -0400

    SMAAPass: Clean up.

commit 4bda01ea27b3f8df242b87737c4883954ec01942
Merge: d3bff25fc 8d071faf6
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:24:25 2018 -0400

    Merge pull request #15165 from cadenasgmbh/SMAAPass_texture_complete

    SMAAPass: Texture marked for update but image is incomplete

commit d3bff25fc38c6143665b7ef482f2ebef3073b3af
Merge: e10845b6d 28606a29d
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:19:44 2018 -0400

    Merge pull request #15084 from donmccurdy/bug-draco-primitive-comparison

    GLTFLoader + DRACOLoader: Fix bugs in glTF+Draco decompression.

commit e10845b6d205819aaf1263134e7eb49479c097f0
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:16:13 2018 -0400

    Examples: Clean up.

commit 424ac9d2f60fa7d86cbc54c1b619b427fb540033
Merge: e6db949c1 a2ee6bc18
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:09:47 2018 -0400

    Merge pull request #15148 from looeee/examples_buffergeometry_morph

    [EXAMPLES] Added BufferGeometry morph example

commit e6db949c1f93dcf7a5bbfef858d503c8e7d5a96b
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 09:08:26 2018 -0400

    Editor: Clean up.

commit ef9c0fe87255ace0dfcfe28549e479baa9a7a964
Merge: 6081478ba e59c0b633
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 08:50:22 2018 -0400

    Merge pull request #15138 from WestLangley/dev-background_offset_repeat

    Background shader: support texture offset/repeat

commit 6081478baad6632ca78eb21734030927791bcf23
Merge: 486075335 38fd96a00
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 08:47:05 2018 -0400

    Merge pull request #15128 from mixtur/patch-2

    ObjectLoader: Fix loading multiple materials with the same uuid

commit 4860753355c45e9c43a47c51aa1f2cacd598904f
Merge: 171e283fe 21cc8fc67
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 08:25:15 2018 -0400

    Merge pull request #15179 from linbingquan/dev

    Editor: i18n

commit 21cc8fc67ebb1267361fcb2f8f10e72c7a2b7ab9
Author: 林炳权 <[email protected]>
Date:   Wed Oct 31 16:57:53 2018 +0800

    fixed position of options with i18n

commit 8dcc2f7d7957d16745fcd9328743c3a2c401f10c
Author: 林炳权 <[email protected]>
Date:   Wed Oct 31 15:59:51 2018 +0800

    cleanup

commit 885c3f72ca5e984cdc432b63d89984c62fb70f49
Author: 林炳权 <[email protected]>
Date:   Wed Oct 31 15:50:11 2018 +0800

    i18n

commit 86bd6f5717883168db7ea3ebd1a7b78213da6f34
Author: 林炳权 <[email protected]>
Date:   Wed Oct 31 15:46:59 2018 +0800

    rename

commit 171e283fea1db7e114f5b3649de875f53b12d810
Merge: 6a066f14d b32c3a754
Author: Mr.doob <[email protected]>
Date:   Wed Oct 31 00:34:22 2018 -0400

    Merge pull request #15177 from TyLindberg/draco_prefetch

    Prefetch DRACO decoder on DRACO endcoded glTF load

commit b32c3a75442b7d260ee5d25c505376ab91dd4d44
Author: Tyler Lindberg <[email protected]>
Date:   Tue Oct 30 15:12:37 2018 -0700

    Prefetch DRACO decoder on DRACO endcoded glTF load

commit 6a066f14d1e85f60f6439513abb9b8f96b7a2c58
Merge: 0df99a8f6 b4416217c
Author: Mr.doob <[email protected]>
Date:   Tue Oct 30 16:16:46 2018 -0400

    Merge pull request #15174 from gogoend/dev

    Docs: Zh translation for texture folder,some new pages and list.js,and corrections for some wrong characters.

commit b4416217c4b33e8e557f321aa79a769e117deb2a
Author: gogoend <[email protected]>
Date:   Wed Oct 31 00:33:08 2018 +0800

    Delete some old line in list.js.

commit f972e7e4a8d69d6e9e02b8081d64cef3976953f1
Author: gogoend <[email protected]>
Date:   Wed Oct 31 00:24:27 2018 +0800

    Translate the How-to-use-WebGL2.html into zh.

commit 344805d603f626a8095710a7c10fba683c483e50
Author: gogoend <[email protected]>
Date:   Tue Oct 30 23:34:34 2018 +0800

    Zh translation for list.js

commit 307808e127f0925f517c64955f895acdc66e4c7a
Merge: 02f80c101 0df99a8f6
Author: gogoend <[email protected]>
Date:   Tue Oct 30 22:51:02 2018 +0800

    Merge pull request #4 from mrdoob/dev

    merge the commit from upstream

commit 02f80c1012c5d87938245476ee32d8098931dd4a
Author: gogoend <[email protected]>
Date:   Tue Oct 30 22:50:18 2018 +0800

    Update list.js

commit 38fd96a001c56863b7fd93deb5b7cc2065ccb830
Author: Michael Turkeev <[email protected]>
Date:   Tue Oct 30 17:29:42 2018 +0300

    ObjectLoader: fix indentation

commit 0df99a8f6a098919e9637064a53e07ebb9fbf892
Merge: 330dcef98 a1f3889ea
Author: Michael Herzog <[email protected]>
Date:   Tue Oct 30 10:33:49 2018 +0100

    Merge pull request #15172 from mrdoob/Mugen87-patch-1

    Update JSONLoader.html

commit a1f3889ea1a5c44244fd10f531f4d8f47fd2e050
Author: Michael Herzog <[email protected]>
Date:   Tue Oct 30 10:32:35 2018 +0100

    Update JSONLoader.html

    Removed dead link.

commit a2ee6bc188043e1e31d503b3dc85f7353222460d
Author: Lewy Blue <[email protected]>
Date:   Tue Oct 30 12:11:22 2018 +0530

    switch to spherify and twist targets

commit 330dcef981c3e4fb22307eeb131000cb89a6cb13
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 23:19:21 2018 -0400

    Texture: Clean up.

commit f1fd4faa990085e21b0465807f5d4eb0a85c8e98
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 23:11:03 2018 -0400

    Updated builds.

commit 923073075ec7c7924c4fa993a0d70afe12aae76c
Merge: 54ad0eb06 f35784d8b
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 23:01:16 2018 -0400

    Merge pull request #15126 from zprodev/feature/improve-loadingmanager-error

    Improve error handling for LoadingManager

commit 54ad0eb066a1a3d146b0c3c0a776aaa639de958b
Author: WestLangley <[email protected]>
Date:   Mon Oct 29 20:07:15 2018 -0400

    Update SVGLoader.html

commit 876bcfa9bac122a3b317ba4a467bfb3fb719833d
Merge: 613825127 4a477b7b0
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 15:51:25 2018 -0400

    Merge pull request #15146 from WestLangley/dev-texture_rotation_example

    Texture rotation example: clean up

commit 613825127e33fcb4f35d38abe3466656cc96ad2d
Merge: e8a311bb4 2aaea0e8a
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 15:50:20 2018 -0400

    Merge pull request #15158 from gero3/Webglrenderertests

    unittest WebglRenderer

commit e8a311bb4373588182aca89fc031b7d8c1db0a7e
Merge: e5d8de01c b20e18616
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 15:16:45 2018 -0400

    Merge pull request #15156 from WestLangley/dev-instanced_buffer_attr

    Accommodate change in signature of InstancedBufferAttribute constructor

commit e5d8de01cfece233e587c254cf52e78553d4423f
Merge: 27ba8e1c7 e5e4cf05c
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 15:09:54 2018 -0400

    Merge pull request #15151 from Mugen87/dev11

    Audio: Use linearRampToValueAtTime()

commit 27ba8e1c73750084aa47cff7b13f44753d886a79
Merge: 0c360b767 3809b1fa4
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 15:01:41 2018 -0400

    Merge pull request #15145 from WestLangley/dev-waves_example

    Particles waves example: convert to THREE.Points

commit 61503c4e0f1d6934192ebbbec0e19eaae5e0b34d
Author: Michael Turkeev <[email protected]>
Date:   Mon Oct 29 22:00:20 2018 +0300

    do not parse the same single material twice

commit 0c360b76788efc460f05db124972429f204a77ab
Merge: 666edb3dd fa5956aa5
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 14:57:47 2018 -0400

    Merge pull request #15140 from leshkovichpvl/orbital-control/custom-pan-keys

    OrbitControls: support panning with left mouse + shift key

commit 666edb3dd7c38f02f6b799e8cbf4c759f21e7759
Merge: cb0dd38d2 634587f86
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 14:57:08 2018 -0400

    Merge pull request #15166 from WestLangley/dev-map_controls_shift_key

    MapControls: support orbiting with mouse + shift key

commit 634587f868d0bf824008bef105cb7d8705da06c1
Author: WestLangley <[email protected]>
Date:   Mon Oct 29 14:13:30 2018 -0400

    Support shift key to orbit

commit fa5956aa539e2b9552b61844e7700397fec71e19
Author: leshkovichpvl <[email protected]>
Date:   Mon Oct 29 20:49:17 2018 +0300

    fix description

commit 8d071faf632704fa00148b746601af1c3c57d0d1
Author: Daniel Toplak <[email protected]>
Date:   Mon Oct 29 18:15:25 2018 +0100

    #15162 fix: remove needsUpdate = false and use onload callbacks of Image's

commit cb0dd38d2dccfa803415e5eb2eb1279c901e1b7c
Merge: db3cdee1c 8c536956c
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 11:49:12 2018 -0400

    Merge pull request #15161 from WestLangley/dev-to_buffer_geometry

    Cleanup: Geometry -> BufferGeometry

commit db3cdee1c5d6394864d146a36835ce6c8b6956df
Merge: 4b217f812 9a3441cd4
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 11:42:35 2018 -0400

    Merge pull request #15153 from WestLangley/dev-cleanup_undefined

    Cleanup

commit 04a4880906e70e70e22db5eef89797205f98b059
Author: Pavel Leshkovich <[email protected]>
Date:   Mon Oct 29 18:29:22 2018 +0300

    revert && add shiftKey

commit 4b217f812c02e5921e62718ab01d821e4358d4c6
Merge: c0dbf052e cafc255b6
Author: Mr.doob <[email protected]>
Date:   Mon Oct 29 11:23:45 2018 -0400

    Merge pull request #15164 from Mugen87/dev17

    Examples: Clean up

commit a8607ccb10a29e4296a7cb65c8383b38a28b247b
Author: Daniel Toplak <[email protected]>
Date:   Mon Oct 29 14:32:26 2018 +0100

    #15162 fix: mark textures for update asynchronously

commit cafc255b6eb6763a7a48c0826b21ac71f88d0aaf
Author: Mugen87 <[email protected]>
Date:   Mon Oct 29 14:07:08 2018 +0100

    Examples: Clean up

commit 8c536956cf0c32d7827943e0e73c7132177d66d1
Author: WestLangley <[email protected]>
Date:   Sun Oct 28 23:51:20 2018 -0400

    Geometry -> BufferGeometry

commit 7d58dfd689d4bfbf6f52de979947333b2ca6f3fb
Author: 林炳权 <[email protected]>
Date:   Mon Oct 29 09:34:40 2018 +0800

    Editor: i18n

commit 2aaea0e8adcaad54e17adf412e2dd41afa8fed06
Author: gero3 <[email protected]>
Date:   Sun Oct 28 14:07:55 2018 +0100

    cleanup test

commit 203a62ce57430c9b8942e9f22429d8c86bcbe1a3
Author: gero3 <[email protected]>
Date:   Sun Oct 28 13:40:29 2018 +0100

    test constructor WebglRenderer

commit b20e18616e89600f9ea6d9f4328c92b516dee87a
Author: WestLangley <[email protected]>
Date:   Sun Oct 28 02:00:10 2018 -0400

    Accommodate change in InstancedBufferAttribute signature

commit 9a3441cd4c57c3b598ba34395656cda3f49fe48d
Author: WestLangley <[email protected]>
Date:   Sat Oct 27 15:26:48 2018 -0400

    Cleanup

commit e5e4cf05c88af1fa5d4af366b5d5e3599f1dc000
Author: Mugen87 <[email protected]>
Date:   Sat Oct 27 11:42:53 2018 +0200

    Audio: Use linearRampToValueAtTime()

commit 3ff1a8de0380b41bfc9148c426c466b159e4ed75
Author: Lewy Blue <[email protected]>
Date:   Sat Oct 27 13:18:55 2018 +0530

    tidy

commit d8bc641b68857492b56375b86a2352bf35ad2ace
Author: Lewy Blue <[email protected]>
Date:   Sat Oct 27 13:16:04 2018 +0530

    added buffergeometry morph example

commit 4936e19dc94b538d4a99129330f69af1d4a42d2c
Author: 林炳权 <[email protected]>
Date:   Sat Oct 27 14:08:49 2018 +0800

    Editor: i18n

commit 4a477b7b0d874d2d7036ebf4aedd62760ccf7c90
Author: WestLangley <[email protected]>
Date:   Fri Oct 26 21:07:07 2018 -0400

    Clean up

commit 3809b1fa49ed95bdadb12c98cf54a160981113a1
Author: WestLangley <[email protected]>
Date:   Fri Oct 26 20:39:55 2018 -0400

    Clean up

commit 5e23ac587804786c95974b5c6b1e022d7e1957ab
Author: WestLangley <[email protected]>
Date:   Fri Oct 26 20:26:21 2018 -0400

    Convert to THREE.Points

commit 00a8e03ce25f64c061a3d3cba95f9034c9c273b6
Author: Pavel Leshkovich <[email protected]>
Date:   Fri Oct 26 14:36:17 2018 +0300

    callback was moved from some function

commit b64d2233dbc3c12b21adbe220dfa158913190c78
Author: Pavel Leshkovich <[email protected]>
Date:   Fri Oct 26 12:56:36 2018 +0300

    remove arrow function & added reuse method isPanEvent

commit d2c5df8c80bc6d0def6e77d7f4f7a27f96f77d39
Author: Pavel Leshkovich <[email protected]>
Date:   Fri Oct 26 12:23:32 2018 +0300

    Made custom pan keys

commit e59c0b63381d988ff8dbd0d90330ca8725b95630
Author: WestLangley <[email protected]>
Date:   Thu Oct 25 23:44:03 2018 -0400

    background shader: support offset/repeat

commit c0dbf052eb276e407a0d2ea881b010303859d9cd
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 18:54:12 2018 -0700

    Examples: Renamed webgl_interactive_boxselection to misc_boxselection

commit 4f74c90db31ef66ed99555a71cb156969f8b52ad
Merge: 152d5e333 b651de5ca
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 17:44:22 2018 -0700

    Merge pull request #14508 from HypnosNova/BoxSelection

    Add boxselection demo

commit 152d5e3332237a498e0b55929bdf9dbd43ccee7b
Merge: ee6ac8505 3dbb73518
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 17:33:33 2018 -0700

    Merge pull request #15132 from donmccurdy/feat-skinning-robot-demo

    Examples: Update skinning + morph example.

commit ee6ac8505e75d75f01e637d0844caa6088f40adc
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 17:29:25 2018 -0700

    Updated builds.

commit 94e47d47c992365261a3ee6fad489a22aa2c8461
Merge: ceeeba468 2c7393a73
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 17:15:26 2018 -0700

    Merge pull request #14547 from erasta/dev_geomfrombuff

    Reduce memory allocation on Geometry.fromBufferGeometry

commit ceeeba4683f8fb2b5764290b3b14b361c5be7bbe
Merge: 4b6903625 e5bc952a1
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 17:10:29 2018 -0700

    Merge pull request #14881 from ieskudero/patch-1

    Update geometry.html

commit 4b6903625c5c61afc0b8b73892a3a2192b6aa345
Merge: 0db40fa9d d9e67c122
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 17:01:49 2018 -0700

    Merge pull request #14813 from soadzoor/add-webxr-inputsource-into-controllers-userdata

    WebXRManager: Save inputSource in userData of controller

commit 0db40fa9d39f0ba8b7ab9119cffd0c1836944283
Merge: 1343a0a70 e16b960f7
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 14:59:42 2018 -0700

    Merge pull request #15135 from linbingquan/dev

    Editor: Fixed toolbar button layout error

commit 1343a0a7043df3fb45e28beea64a136602f06b58
Author: WestLangley <[email protected]>
Date:   Thu Oct 25 17:34:02 2018 -0400

    Added webgl_points_waves.html

commit 095ca6897b22f03808c37e8cc952c0b4741b10eb
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 14:08:02 2018 -0700

    Removed webvr_frustum example.

commit 55e054864a4cea0794e2fd85f3e53aac8ce0f0c9
Merge: 00ba931cd 976c6f96d
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 11:41:54 2018 -0700

    Merge pull request #15124 from Mugen87/dev17

    Examples: Added webgl_effects_ascii

commit 00ba931cd416f1b0689a28c15a35d3cbb6fc13e7
Merge: 12450bedb 5a5f8a955
Author: Mr.doob <[email protected]>
Date:   Thu Oct 25 11:40:52 2018 -0700

    Merge pull request #15137 from moraxy/wrong_doc_tags

    Docs: Fix two tags

commit 5a5f8a955707e109827cfb80697d7151c189ea6d
Author: moraxy <[email protected]>
Date:   Thu Oct 25 15:33:54 2018 +0200

    Docs: Wrong tag in BufferGeometry and wrong closing bracket in ShaderMaterial

commit e16b960f7b9e78d483268b12c0993894a3280e15
Author: 林炳权 <[email protected]>
Date:   Thu Oct 25 20:51:47 2018 +0800

    fixed toolbar button layout error

commit 976c6f96d596ea5681ece5e545f44e20c6b5c191
Author: Mugen87 <[email protected]>
Date:   Thu Oct 25 10:05:46 2018 +0200

    Examples: Clean up

commit 3dbb73518c8482b6a6679b377fdfe7b6546393da
Author: Don McCurdy <[email protected]>
Date:   Wed Oct 24 20:33:22 2018 -0700

    Update webgl_animation_skinning_morph.html

commit a7c88cda895009a184c5e12cc7b934dfd5bd8b04
Author: Don McCurdy <[email protected]>
Date:   Wed Oct 24 20:33:00 2018 -0700

    Update README.md

commit 12450bedbef53649992cf55f10d7c1b9a253570f
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 20:21:19 2018 -0700

    Updated builds.

commit a8379e330b9ba418c5e773cdba8f9986dfd1e487
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 20:20:32 2018 -0700

    Clean up.

commit 0bc3b31dde625b6ec5100f61a2cfa3377619c161
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 20:13:22 2018 -0700

    Updated builds.

commit a8ec3e70cc8bea235ec921412023b02cc1b532a0
Merge: 8cca287fa fe38f31e3
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 20:06:39 2018 -0700

    Merge pull request #15133 from jsantell/frustumfix

    Increase top/bottom frustum extents for the WebVR camera union to accommodate camera's new position

commit fe38f31e36d5046d9138cbd268714b0c0f4d35d1
Author: Jordan Santell <[email protected]>
Date:   Wed Oct 24 19:59:51 2018 -0700

    Increase top/bottom frustum extents for the WebVR camera union to accomodate the camera's new position

commit 8cca287fa5717bc786b46d058480215558616a26
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 19:59:21 2018 -0700

    webvr_ballshooter: adjusted shooting speed

commit e71d7209a9b12266325178661a56474f2330f3a8
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 19:25:39 2018 -0700

    webvr_ballshooter: Improved delta code and added coloring on impact.

commit b924f0cad4058dc4dde71445c796980c3cd5b5ed
Author: Don McCurdy <[email protected]>
Date:   Wed Oct 24 18:39:34 2018 -0700

    Add RobotExpressive demo.

commit db9a3029b92d515d76ffafa1bb314ec508b3f039
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 18:35:17 2018 -0700

    Added delta to webvr_ballshooter example.

commit a97c61de5a2fb2a751f36b2780c5252e1a64e220
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 17:43:25 2018 -0700

    Editor: Localised more elements.

commit 1103be35329ec065cd61b41f2d67f2948ddd0971
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 16:46:27 2018 -0700

    Updated builds.

commit 3eac1a1b24fbea47360c6e71cbbfa5317e579b63
Merge: 5a8ed1156 3b9a26403
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 16:24:47 2018 -0700

    Merge pull request #15130 from jsantell/combined-frustum

    Fix combined frustum calculation used in setProjectionFromUnion for WebVR/WebXR

commit 3b9a26403dc1fea1ef4d7fa3c5de1a5205cc08c3
Author: Jordan Santell <[email protected]>
Date:   Wed Oct 24 13:46:09 2018 -0700

    Fix combined frustum calculation used in setProjectionFromUnion for WebVR/WebXR

commit 5a8ed115627e881b54f3bb810c43702339ff87a8
Merge: 90a6f0481 7637d3439
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 12:45:40 2018 -0700

    Merge pull request #15123 from WestLangley/dev-webgl_waves

    Ported canvas particles waves example to webgl

commit 90a6f0481200269cb4077580eb4bb7b0b0f55548
Merge: 843996276 31153bcaf
Author: Mr.doob <[email protected]>
Date:   Wed Oct 24 12:43:56 2018 -0700

    Merge pull request #15127 from Mugen87/dev11

    Examples: Removed usage of JSONLoader in misc_fps.html

commit 396fbd3fc1a57260ef34ddc1ae3b229e5bcd285a
Author: Mugen87 <[email protected]>
Date:   Wed Oct 24 18:49:22 2018 +0200

    Examples: Added comment to webgl_effects_ascii.html

commit 44d9c06f305d8f85ce7851c14b7473a015f5ff60
Author: Michael Turkeev <[email protected]>
Date:   Wed Oct 24 15:42:36 2018 +0300

    fix more eslint requirements

commit 6f47a254cd586ca65a6b4b05659f57f5a618ac32
Author: Michael Turkeev <[email protected]>
Date:   Wed Oct 24 15:39:11 2018 +0300

    fix eslint requirements

commit 3b6c7f4c7693dd57bf0b31cdeb2204974fe83d23
Author: Michael Turkeev <[email protected]>
Date:   Wed Oct 24 14:59:38 2018 +0300

    Fix loading multiple materials with the same uuid

    It fixes the problem when json contains multiple MultiMaterials containing the same material. Something like

    ```
    MultiMaterialA = [X, Y]
    MultiMaterialB = [X, Z]
    ```

    then X will be created twice even though it is exactly the same.

    I know MultiMaterial is deprecated, but the problem still stands for us as we are using io_three, which gives us MultiMaterials.

commit 31153bcaf137fb1eaf8343b451b4216b21ae9cd2
Author: Mugen87 <[email protected]>
Date:   Wed Oct 24 13:52:05 2018 +0200

    Examples: Clean up

commit a563fd95a74e907dcc519648eb3b1be57d9be3b8
Author: Mugen87 <[email protected]>
Date:   Wed Oct 24 13:48:31 2018 +0200

    Examples: Restore platform.jpg

commit 74df0cebff590a37cfbd20573758847e0730f71f
Author: Mugen87 <[email protected]>
Date:   Wed Oct 24 12:04:01 2018 +0200

    Examples: Removed usage of JSONLoader in misc_fps.html

commit 02c41491a895abe46b12dde50f04c46c2958cd14
Author: Mugen87 <[email protected]>
Date:   Wed Oct 24 11:21:35 2018 +0200

    Examples: Added webgl_effects_ascii

commit f35784d8b7e647f7b11ca745f87c0187d39c98dc
Author: zprodev <[email protected]>
Date:   Wed Oct 24 18:09:31 2018 +0900

    Improve error handling for LoadingManager

commit 843996276b0d24b88f4007876d5ec91aa516c93d
Merge: e371fe259 de4abeaba
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 22:23:29 2018 -0700

    Merge pull request #15122 from WestLangley/dev-cloth

    Cloth Animation Example: convert to BufferGeometry

commit 7637d3439c04b22f83c363c3b85f9214b994ae35
Author: WestLangley <[email protected]>
Date:   Tue Oct 23 22:59:27 2018 -0400

    Ported canvas example to webgl

commit de4abeaba605eafc6109133c959a4c0dcbc3c6d0
Author: WestLangley <[email protected]>
Date:   Tue Oct 23 22:19:00 2018 -0400

    Convert to BufferGeometry

commit e371fe2596762d808fab22fe87a6898d0502b0f2
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 18:21:12 2018 -0700

    Editor: Localised Export STL (Binary)

commit 1a7b7c5edfe5cfb54e84621f7a97ffe4758ed92e
Merge: 55af39b4c cecacf0a9
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 18:01:32 2018 -0700

    Merge pull request #15093 from hassadee/dev

    Add STL exporter in binary format to menu bar

commit 55af39b4c2bdbe41effc1d0c690550245f6e0b68
Merge: 7152be6af fa66eae49
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 17:27:21 2018 -0700

    Merge pull request #14788 from Mugen87/dev17

    Examples: Added BufferGeometry version of QRCode model

commit 7152be6af258d7a1f77ffdda3e53df9ef3a38bff
Merge: 8d5c02d65 8a5ca09d5
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 17:14:44 2018 -0700

    Merge pull request #15118 from donmccurdy/docs-loading-example

    Docs: Add example to model loading page.

commit 8d5c02d654ece3357c6e439744323cf83072a31b
Merge: fffb5f887 e25c2e76a
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 17:12:37 2018 -0700

    Merge pull request #15120 from fats/fix-water-reflection

    Fix water reflection sampling coordinates

commit fffb5f887e7996b6dde69ea08e0cb3f29bc074d3
Merge: 7c291f6f6 536782123
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 16:13:36 2018 -0700

    Merge pull request #15112 from EliasHasle/patch-7

    Add default frustum to OrthographicCamera

commit e25c2e76ad8850d99aacd3e7228441ab4e439d9a
Author: Osman Keskin <[email protected]>
Date:   Wed Oct 24 00:51:58 2018 +0200

    Fix water reflection sampling coordinates

commit 7c291f6f63061431ed4551a08a733d56fbe0a2f8
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 15:49:41 2018 -0700

    Updated builds.

commit cf9f8ee16fd3bca1d4d451c94936e7775e78dfae
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 15:47:28 2018 -0700

    WebVRUtils: setProjectionFromUnion() now produces the correct frustum (changed thing blindly though)

commit f25d81ede3b841e9f43d5dc7c190d95f8e830843
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 15:11:23 2018 -0700

    WebVRUtils: Fix NaNs and Infinity in setProjectionFromUnion().

commit acaba2e48c1b45d93e799f583d438860899f6a7d
Merge: 0dc83308c c0cad9d05
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 14:49:14 2018 -0700

    Merge pull request #15114 from Mugen87/dev11

    Projector/SVGLoader: Added support for vertex colors

commit 8a5ca09d56ea03d43ad0c60ee28204ad93206497
Author: Don McCurdy <[email protected]>
Date:   Tue Oct 23 14:34:51 2018 -0700

    Add example to model loading page.

commit 5367821230677fa02e54009bc7cefbc55962ad79
Author: Elias Hasle <[email protected]>
Date:   Tue Oct 23 19:09:10 2018 +0200

    Added spaces after signs

commit fa66eae4967e166586534f79df8657a88d2cbf1b
Author: Mugen87 <[email protected]>
Date:   Tue Oct 23 17:42:16 2018 +0200

    Clean up

commit c0cad9d052590db3553caa3358e598bab9ee9cad
Author: Mugen87 <[email protected]>
Date:   Tue Oct 23 17:36:12 2018 +0200

    SVGRenderer: Added support for vertex colors

commit d60e5d91458f1541f3f06ac4513cf05f30b70c08
Author: Mugen87 <[email protected]>
Date:   Tue Oct 23 17:32:51 2018 +0200

    Projector: Added support for vertex colors

commit 0dc83308cfcfc54b9d4c5fc7af7c9ab94b6518a5
Merge: abc70b780 d98f5dc70
Author: Mr.doob <[email protected]>
Date:   Tue Oct 23 08:17:31 2018 -0700

    Merge pull request #15113 from linbingquan/dev

    Editor: i18n

commit d98f5dc703c655139f13cb078f5248892b02b8e3
Author: 林炳权 <[email protected]>
Date:   Tue Oct 23 19:32:05 2018 +0800

    i18n

commit 461f7cf3554cd52c145975435ca093f40c86caef
Author: Elias Hasle <[email protected]>
Date:   Tue Oct 23 11:54:48 2018 +0200

    Fixed typo

commit e4a12e8b61c0af85839a8fb68e7c5720df454f45
Author: Elias Hasle <[email protected]>
Date:   Tue Oct 23 11:29:34 2018 +0200

    Add default frustum to OrthographicCamera

commit cecacf0a9ea012ee06ea9c5c599f4c2efefe386f
Author: Hassadee Pimsuwan <[email protected]>
Date:   Tue Oct 23 15:31:23 2018 +0700

    Change saveString() to saveArrayBuffer()

    Change saveString() to saveArrayBuffer() for STL binary exporter.

commit abc70b78086e8dcfb6511bfc535b33dbfc0f8572
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 22:08:57 2018 -0700

    Clean up.

commit d4777b568f6963897de0df08b8f3c20ac48ecc1e
Merge: de6f8f723 b2ce63ce2
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 22:01:43 2018 -0700

    Merge pull request #15110 from mrdoob/editor

    Editor: Added localisation support.

commit b2ce63ce2b38bd7bdaf383fbc09c51b908224dbd
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 21:59:47 2018 -0700

    Editor: Added localisation support.

commit de6f8f7235093606f77425f9eb7c04ea5c947218
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 21:58:17 2018 -0700

    Editor: Removed CanvasRenderer code.

commit 38a644bf24ab19707bf60379373cf71c5cc8839f
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 19:14:14 2018 -0700

    Updated builds.

commit 23ebe2684fc4a2e8744a018bb52e059bc9ac7054
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 19:13:35 2018 -0700

    Web*RManager: framebufferScaleFactor to setFramebufferScaleFactor().

commit e7dcca743dc0c10c48bf980f88c89c4f75437e91
Merge: bbf39680c 463855d07
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 19:08:09 2018 -0700

    Merge pull request #14115 from joshpatt2/scalingfactor

    Add scaling factor for webvr renderers

commit bbf39680c336a506a7c0f65b39f67d82dd1f8643
Merge: f66fbee2b c73817f64
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 18:11:38 2018 -0700

    Merge pull request #15109 from mrdoob/docs

    Docs: Automatically set language from hash.

commit c73817f64b133b6ae3b3e5394fbc04429bb62cf2
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 18:10:44 2018 -0700

    Docs: Automatically set language from hash.

commit f66fbee2b781677f214dd417d05cc34386f4539a
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 17:54:49 2018 -0700

    Docs: Clean up.

commit dab285d9c4909e68d0b4853bf5d9643b121ad85b
Merge: 80cd24c0f 5e6cbc5df
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 17:18:03 2018 -0700

    Merge pull request #13831 from donmccurdy/feat-gltfloader-texturetransform

    GLTFLoader: Implement KHR_texture_transform extension.

commit 5e6cbc5dff31ca59ea1bfd52d029219c62091d34
Author: Don McCurdy <[email protected]>
Date:   Mon Oct 22 17:04:55 2018 -0700

    Clean up.

commit 91cd51830a05824eaafb1377baf80977dcbec8e3
Author: Don McCurdy <[email protected]>
Date:   Mon Oct 22 17:00:23 2018 -0700

    Improve endnote docs.

commit d3e31910050da4b27dd015c53635a0216407b43e
Author: Don McCurdy <[email protected]>
Date:   Mon Aug 20 22:06:50 2018 -0700

    GLTFLoader: Clean up.

commit 73160feba1684a24e9753bbbb05cd23108980c8b
Author: Don McCurdy <[email protected]>
Date:   Tue Aug 7 15:25:21 2018 -0700

    GLTFLoader: Warn on unsupported texCoord override.

commit c747fcb6a4681da68de2479d76cb927316b232a9
Author: Don McCurdy <[email protected]>
Date:   Sat Jul 21 15:57:40 2018 -0700

    GLTFLoader: Docs cleanup.

commit 951ab07daae4db0373029be47161822e42b9ff62
Author: Don McCurdy <[email protected]>
Date:   Thu Feb 22 11:25:26 2018 -0800

    GLTFLoader: Implement KHR_texture_transform.

commit 80cd24c0f2831e4e1c51e4ef25811226c43100b9
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 16:33:09 2018 -0700

    Updated builds.

commit 3c904f38ae6d4ef71ae4b3f5b96b90222eb8d2bb
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 16:32:49 2018 -0700

    WebVR: Moved setProjectionFromUnion method to internal WebVRUtils.

commit f565ac4069f16535fcf909451330746c1bdeec27
Merge: f98fd6e4b a5ba2cb94
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 15:22:48 2018 -0700

    Merge pull request #15092 from yomboprime/transforms

    SVG Loader: Accept multiple transforms in a single node

commit f98fd6e4b3ca85455c1924c66d2f1b42257dd3a3
Merge: d2a92781a 3d2b80ff1
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 15:11:57 2018 -0700

    Merge pull request #15108 from WestLangley/dev-background_order

    WebGLBackground: clarify background's render order

commit 3d2b80ff108f7f8f7492b2e44e9a194f2d70868b
Author: WestLangley <[email protected]>
Date:   Mon Oct 22 17:40:16 2018 -0400

    Clarify background render order

commit d2a92781a48da91d806281945ed08a92df60950d
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 13:18:26 2018 -0700

    Updated builds.

commit 2688590d08c7ce1b9d49a61692137b66c3958f0c
Merge: d31264cd5 3ccce0ec3
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 13:15:56 2018 -0700

    Merge pull request #15099 from algrs/master

    Allow for the ascii header to end with CRLF

commit d31264cd500f3518d5c84b048987b6691c9cb135
Merge: 36dc7fc55 01aaf6238
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 13:08:10 2018 -0700

    Merge pull request #15106 from WestLangley/dev-gamma_factor

    Support real-time changes to gammaFactor

commit 36dc7fc55e6e89c26c4440465aeab2e8a5ea2577
Merge: 8b5da8c4c 5e7b524ac
Author: Mr.doob <[email protected]>
Date:   Mon Oct 22 12:32:10 2018 -0700

    Merge pull request #15098 from Mugen87/dev11

    WebXR: Updated tokens

commit 01aaf62388783f34b02f20b503f3cb99513cf6f8
Author: WestLangley <[email protected]>
Date:   Mon Oct 22 14:56:40 2018 -0400

    Support changes to gammaFactor

commit 3ccce0ec39b55060cb90d74b5cc209d3842a70e0
Author: Alex Weiss <[email protected]>
Date:   Sun Oct 21 14:44:41 2018 -0400

    Allow for the ascii header to end with CRLF

    Previously we assumed that the header of a ply file had to end with

        end_header\n

    but it is there are systems that write the end as

        end_header\r\n

    This previously left the rest of the file read off by one byte.

    Fixes issue 14937

commit 5e7b524ac9468ab8231271f452b7ee022b674a0b
Author: Mugen87 <[email protected]>
Date:   Sun Oct 21 15:48:16 2018 +0200

    WebXR: Updated tokens

commit 7888f3c06c0fee2eef8f22babdc69566e0547bc6
Merge: d81b2b4c6 d0156cf32
Author: Mugen87 <[email protected]>
Date:   Sun Oct 21 13:26:28 2018 +0200

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

commit b63ec3e8caf7e6ccefb1b4a9c38f61a02b4f2945
Author: Hassadee Pimsuwan <[email protected]>
Date:   Sat Oct 20 13:29:22 2018 +0700

    Add STL exporter in binary format to menu bar

commit a5ba2cb94f8acfa38d4661ce76a6475acebb1e83
Author: yomboprime <[email protected]>
Date:   Sat Oct 20 03:12:06 2018 +0200

    SVG Loader: simplify transforms code

commit 3e784651dce3e3de0d6fcf68a9f4a6a255fd8668
Author: yomboprime <[email protected]>
Date:   Sat Oct 20 02:19:34 2018 +0200

    SVG Loader: Accept multiple transforms in a single node

commit 8b5da8c4c4466210e8a40e638e63ea41da6b294f
Merge: 31f8f9031 1837a4e03
Author: Mr.doob <[email protected]>
Date:   Fri Oct 19 15:38:12 2018 -0700

    Merge pull request #15042 from XanderLuciano/fix-trackball-html

    [Examples] Prevent content overflow in some demos

commit 31f8f9031e33941946e343bb93535975434ea014
Author: Mr.doob <[email protected]>
Date:   Fri Oct 19 12:54:56 2018 -0700

    Updated builds.

commit 2cb40fa07930335e6820a275b6cecd58888c4b2d
Merge: 307a80773 32ed279cb
Author: Mr.doob <[email protected]>
Date:   Fri Oct 19 11:57:59 2018 -0700

    Merge pull request #15083 from WestLangley/dev-dynamic_cubemap_example

    Dynamic Cubemap example: center background mesh on camera position

commit 307a80773f1c6d8923718cdf5d2aadc4e116c0db
Merge: c5865f726 b8f08250a
Author: Mr.doob <[email protected]>
Date:   Fri Oct 19 11:56:27 2018 -0700

    Merge pull request #15086 from WestLangley/dev-cube_camera_options

    CubeCamera: add options arg to constructor

commit 28606a29d98b3cd24b9ae7a790e3fd0051c75a6b
Author: Don McCurdy <[email protected]>
Date:   Fri Oct 19 11:46:40 2018 -0700

    GLTFLoader+DRACOLoader: Fix attribute ID resolution, and primitive-related bugs.

commit b8f08250a678b29944ab4a3e7369b4933e34d8b7
Author: WestLangley <[email protected]>
Date:   Fri Oct 19 00:25:22 2018 -0400

    Add options arg to constructor

commit c5865f72696fc0145da1eef85833293f5ca8732d
Merge: 05ee6d551 806102dee
Author: Mr.doob <[email protected]>
Date:   Thu Oct 18 20:26:32 2018 -0700

    Merge pull request #15085 from sunag/dev-triplanar-node

    NodeMaterial - Triplanar Mapping example

commit 806102dee61fd789ddd223157cd3bef58717c976
Author: sunag <[email protected]>
Date:   Thu Oct 18 23:56:55 2018 -0300

    blend factor comments

commit 27e67ae613646c44eb166d2398b9e1c121d6e711
Author: sunag <[email protected]>
Date:   Thu Oct 18 23:55:27 2018 -0300

    cleanup

commit 0426cf02769996c346a3aa58a5a0c5d58b196497
Author: sunag <[email protected]>
Date:   Thu Oct 18 23:48:47 2018 -0300

    triplanar-mapping

commit 521222b96cec8ab8178963117e18de3b88659d35
Author: Don McCurdy <[email protected]>
Date:   Thu Oct 18 18:52:50 2018 -0700

    GLTFLoader: Fix bug in draco primitive comparison.

commit 32ed279cb65c65e05154349f422267b883a99a56
Author: WestLangley <[email protected]>
Date:   Thu Oct 18 21:30:30 2018 -0400

    Center background mesh on camera position

commit 05ee6d551269d1d6be272b5ce426f6b6edb1f7e4
Merge: e82663847 fda784a27
Author: Mr.doob <[email protected]>
Date:   Thu Oct 18 18:01:28 2018 -0700

    Merge pull request #15069 from MosasoM/lut.html_modify_setMin_setMax

    correct method names setMin(),setMax() in Lut.html

commit e8266384759483c76454617083b529cacc65bdbe
Merge: f74217c2a 44b40c7fc
Author: Mr.doob <[email protected]>
Date:   Thu Oct 18 17:50:36 2018 -0700

    Merge pull request #15073 from br4sco/dev

    AnimationLoader: Added to build

commit f74217c2a54b727da04d2fc54e503b84c4549f26
Merge: 8cc48283b 42c3814cb
Author: Mr.doob <[email protected]>
Date:   Thu Oct 18 06:52:28 2018 -0700

    Merge pull request #15082 from gero3/patch-5

    Cleanup:remove commented code

commit 42c3814cb52b2c8f7641045b4a3f6dc804a6ac74
Author: gero3 <[email protected]>
Date:   Thu Oct 18 13:15:03 2018 +0200

    Cleanup:remove commented code

commit 8cc48283b210aea792d279736db757077a595bce
Merge: e2dd8ce65 43bfdaf1e
Author: Mr.doob <[email protected]>
Date:   Wed Oct 17 22:04:40 2018 -0700

    Merge pull request #15081 from WestLangley/dev-background_rtcube

    Scene Background: support WebGLRenderTargetCube

commit 43bfdaf1e0417a262a8e9d8fcb8a3b5eadcda244
Author: WestLangley <[email protected]>
Date:   Thu Oct 18 00:17:00 2018 -0400

    Support WebGLRenderTargetCube background

commit 1b15542010cc6751084cd56bac6e9ade21026ce1
Author: gogoend <[email protected]>
Date:   Thu Oct 18 09:24:41 2018 +0800

    Little fix.

commit e2dd8ce657ca564bd48a5ccc66742f4800823f1b
Merge: 5dc348d94 502f5816c
Author: Mr.doob <[email protected]>
Date:   Wed Oct 17 17:06:08 2018 -0700

    Merge pull request #15071 from kaisalmen/OBJLoader2_V250_Doc

    OBJLoader2_V250 documentation update

commit 5dc348d941db932e6bb4fe42515b23672026deb7
Merge: 591c558a4 f214a7baf
Author: Mr.doob <[email protected]>
Date:   Wed Oct 17 14:03:09 2018 -0700

    Merge pull request #15077 from nidin/patch-1

    [Documentation] Property type correction

commit 591c558a4f07dbcdfa28054caf55938c31dca543
Merge: d0156cf32 5c609aa00
Author: Mr.doob <[email protected]>
Date:   Wed Oct 17 14:02:34 2018 -0700

    Merge pull request #15080 from WestLangley/dev-glsl_world_dir

    Cube and Equirect shaders: improve nomenclature

commit 5c609aa00e9abc37511ad994edab4a07d291f564
Author: WestLangley <[email protected]>
Date:   Wed Oct 17 15:13:31 2018 -0400

    Rename varying

commit f214a7baf2ce6c20a6cce0dcf1347e6858d72070
Author: Nidin Vinayakan <[email protected]>
Date:   Wed Oct 17 19:08:53 2018 +0200

    Property type correction

    Fixed property types of  `isInterleavedBuffer` and `needsUpdate`

commit 968581b4ac689b3b81b6648bf1f0a1c602c43aba
Author: gogoend <[email protected]>
Date:   Thu Oct 18 00:51:19 2018 +0800

    translate most files in the textures floder,and modify list.js

commit 44b40c7fc780e644182d24a85f875b8dc7297146
Author: Oscar Eriksson <[email protected]>
Date:   Wed Oct 17 10:08:16 2018 +0200

    Fix for issue #15072

commit fda784a273dddccc1fabebc0f7fe225f75842644
Author: 橋本翔 <[email protected]>
Date:   Wed Oct 17 12:44:35 2018 +0900

    correct method names setMin(),setMax()

commit 502f5816cc44fb69d54ed145863f37e3d245dc4b
Author: Kai Salmen <[email protected]>
Date:   Tue Oct 16 21:21:37 2018 +0200

    #15060 Updated documentation

commit d0156cf32ea1e805994cdf8cbe43fb1078570f0b
Author: Mr.doob <[email protected]>
Date:   Tue Oct 16 07:51:26 2018 -0700

    Docs: Removed Material.overdraw from zh docs.

commit e7ff8ca1be184316132f28a7c48d6bfdf26e2db0
Merge: 6bf05eb0c 8f2439c2d
Author: Mr.doob <[email protected]>
Date:   Tue Oct 16 07:50:05 2018 -0700

    Merge pull request #15065 from WestLangley/dev-overdraw

    Remove Material.overdraw property

commit 8f2439c2d0c71113c8c57096dc1c038260b83520
Author: WestLangley <[email protected]>
Date:   Mon Oct 15 23:13:21 2018 -0400

    Remove Material.overdraw property

commit 6bf05eb0c97d9e5ced96ff12cf43c765d2a869f8
Merge: 7ebe6f94d 7cf3f82f9
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 19:42:19 2018 -0700

    Merge pull request #15046 from looeee/examples_add_scene_comparison

    [Examples] added scene comparison example

commit 7ebe6f94d659a9a81af4eda9c558e29f265b4812
Merge: 6c7a0e1e0 dd91b0ad7
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 19:32:51 2018 -0700

    Merge pull request #14985 from looeee/add_esling_plugin_html

    Add eslint-plugin-html

commit 6c7a0e1e055210133fe273d496ff62193b9dec7f
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 19:23:01 2018 -0700

    Updated builds.

commit 1383f381c04df27adaa58f29cf60bb725457f52a
Merge: ae9570142 fe8d66b63
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 19:21:14 2018 -0700

    Merge pull request #15029 from WestLangley/dev-remove_canas_renderer

    Remove CanvasRenderer

commit ae9570142c277e3004647457a2e7061930f318ed
Merge: bc844a70f b52044b25
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 18:49:03 2018 -0700

    Merge pull request #15063 from WestLangley/dev-boxhelper_copy_clone

    BoxHelper: added copy and clone methods

commit bc844a70f3575e3563f905810362649f1b7a961d
Merge: 49cd315a6 a99eac613
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 18:48:03 2018 -0700

    Merge pull request #15062 from WestLangley/dev-line_clone_copy

    Line: fix copy and clone methods

commit b52044b25710c880c309de73d3d3f953a05ec1d8
Author: WestLangley <[email protected]>
Date:   Mon Oct 15 21:33:04 2018 -0400

    Added copy and clone methods

commit a99eac6138a368f88c6639b4888d33c5a6c518ce
Author: WestLangley <[email protected]>
Date:   Mon Oct 15 21:26:02 2018 -0400

    Fix copy and clone methods

commit 49cd315a6ce3097c83daabc44a6b6d9b66a6d2f4
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 17:13:50 2018 -0700

    Updated builds.

commit bf8f59667c705e6e16672e5621376d2444f565c2
Merge: 067b4da34 60a728d17
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 17:11:52 2018 -0700

    Merge pull request #15061 from mrdoob/rollup_glconstants

    Rollup: Added plugin for converting gl constants to their values.

commit 60a728d1736beea2f7117dbfa2a9fa86e9784406
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 17:06:55 2018 -0700

    Rollup: Added plugin for converting gl constants to their values.

commit 067b4da3436c7627e71c2871b5859fdbb671caa2
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 16:53:58 2018 -0700

    Fixed tonemapping example.

commit 361cf92fb2d3b2d2d62f05f99056770ad6e2fe43
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 14:54:30 2018 -0700

    Updated builds.

commit d649e79f711f647ac388e892c32f640ba188486f
Merge: fb6efa9f7 c1016a6c7
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 13:37:52 2018 -0700

    Merge pull request #15060 from kaisalmen/OBJLoader2_V250

    OBJLoader2 V2.5.0

commit c1016a6c7e58ccae5e89dd5129e77350cc0eadcf
Author: Kai Salmen <[email protected]>
Date:   Mon Oct 15 22:26:16 2018 +0200

    - Original Repo Issue 47: Fixed incorrect vertex color pointerC initialization (omitting first set of values)
    - Original Repo Pull Request 46: It is now possible to run `THREE.OBJLoader2` in nodejs 10.5.0+. Thanks to @Cobertos
    - Replaced Singletons with pure function/prototype definitions (backport from dev (V3.0.0)). Reason: Counter issues with worker code Blob generation from minified code base (e.g when using webpack)
    - #12942: Align `setPath` and `setResourcePath` meaning and handling

commit fb6efa9f7f050a8cbc65ff398feb7f19ed856420
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 13:16:46 2018 -0700

    Fixed EXRLoader example in some Adreno GPUs. See #15026

commit 3447ee8dece6af31e709a6148b9e279a1de06274
Merge: 5fa442d2d 7648f2b99
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 13:01:03 2018 -0700

    Merge pull request #15057 from WestLangley/dev-arrow_helper_clone

    ArrowHelper: support cloning

commit 5fa442d2d4478f6ef1a8697a969abeef92b51507
Merge: fe0777472 6769fd8e7
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 11:15:59 2018 -0700

    Merge pull request #15031 from looeee/examples_fix_linter_errors4

    Fix linter errors in WebGL examples

commit fe0777472aebb4a8782a7e6a5c2cfb1ccd8ba15e
Merge: c8ae258ec c34c1d068
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 10:58:50 2018 -0700

    Merge pull request #15056 from WestLangley/dev-rgbe_loader_float

    RGBELoader: support FloatType output

commit c8ae258ecf85f8e8a6b34a8242ea840541b35b25
Merge: 1590aeec1 d25ed8378
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 10:57:35 2018 -0700

    Merge pull request #15055 from WestLangley/dev-equi_to_cube_gen

    EquirectangularToCubeGenerator: support alternate encodings

commit 1590aeec12a05afab3e2e45e590f891910a970e0
Merge: feb480aaf 15b0d2b67
Author: Mr.doob <[email protected]>
Date:   Mon Oct 15 10:53:17 2018 -0700

    Merge pull request #15059 from Mugen87/dev19

    Docs: Added manual page about WebGL 2

commit c94eaed4d5d28e1fb0d6dbff9dc3189ca4f34cdc
Author: gogoend <[email protected]>
Date:   Tue Oct 16 00:48:09 2018 +0800

    Some fixes for the wrong expressions.

commit dca696c783b2bc62154f48aa13dcdcc7007d1b54
Author: gogoend <[email protected]>
Date:   Tue Oct 16 00:28:02 2018 +0800

    Translate the the page about creacting VR scene,and fix the link of this page.

commit 8eee455cdad65351dadd943ebf68fdc4a2b2b7f5
Author: gogoend <[email protected]>
Date:   Tue Oct 16 00:18:06 2018 +0800

    Translate the list.js,and add the page about creacting VR scene from the en doc.

commit 15b0d2b67337ce964e8533cd2e917e08966139a1
Author: Mugen87 <[email protected]>
Date:   Mon Oct 15 18:08:57 2018 +0200

    Docs: Added manual page about WebGL 2

commit da30349ef19e80c73954b1a280432015244f5640
Merge: 1299eea11 feb480aaf
Author: gogoend <[email protected]>
Date:   Mon Oct 15 19:32:19 2018 +0800

    Merge pull request #3 from mrdoob/dev

    Merge the new version code.

commit 7648f2b998987dcf0330dd2f960d64aaffcf56ab
Author: WestLangley <[email protected]>
Date:   Sun Oct 14 22:39:19 2018 -0400

    Support cloning

commit c34c1d0684a117b5db07e3a496258130fac3d73d
Author: WestLangley <[email protected]>
Date:   Sun Oct 14 22:20:46 2018 -0400

    Support FloatType output

commit d25ed8378ad06a99ba6fd6e0d1a870e8553d20c9
Author: WestLangley <[email protected]>
Date:   Sun Oct 14 20:27:29 2018 -0400

    Support encodings such as RGBE

commit feb480aaffe97d6dea51a0872c2e3c58f329a026
Merge: 0d6fa8400 f954a2d11
Author: Mr.doob <[email protected]>
Date:   Sun Oct 14 10:31:20 2018 -0700

    Merge pull request #15051 from Mugen87/dev2

    Docs: Added DataTexture3D page

commit 0d6fa8400e04ccac2ee47a2abb2417c329e309ab
Merge: f638d6218 5e38b007f
Author: Mr.doob <[email protected]>
Date:   Sun Oct 14 10:30:36 2018 -0700

    Merge pull request #15052 from Mugen87/dev19

    Docs: Clean up

commit f638d621868f5069e30d1739a803e344b6084a5c
Merge: 344ff23af 694764d57
Author: Mr.doob <[email protected]>
Date:   Sun Oct 14 10:30:15 2018 -0700

    Merge pull request #15053 from nicholas-yangding/translation-zh

    Translation zh

commit 694764d57cd9e019200d669b94e9fb390988a578
Merge: c131bb2b2 344ff23af
Author: nicholas-yangding <[email protected]>
Date:   Sun Oct 14 22:28:24 2018 +0800

    Merge branch 'dev' into translation-zh

commit 5e38b007f6be03bc37e2bba2a977ba640638ef79
Author: Mugen87 <[email protected]>
Date:   Sun Oct 14 15:20:22 2018 +0200

    Docs: Clean up

commit f954a2d11e09e06821779d6c3e2396aefcc3bf40
Author: Mugen87 <[email protected]>
Date:   Sun Oct 14 13:08:20 2018 +0200

    Docs: Added DataTexture3D page

commit 6769fd8e7330bdea222fa12f393365ab7bf37beb
Merge: 1c6684012 344ff23af
Author: Lewy Blue <[email protected]>
Date:   Sun Oct 14 12:56:02 2018 +0530

    merge dev

commit 7cf3f82f9ad314c004fd8e469bb200f01661be84
Author: Lewy Blue <[email protected]>
Date:   Sun Oct 14 10:37:34 2018 +0530

    fix for touch devices

commit 3e3fbeda4f627df5f24a1bdd609f7b3310b51566
Author: Lewy Blue <[email protected]>
Date:   Sat Oct 13 19:04:28 2018 +0530

    added scene comparison example

commit 344ff23af6c1f19af78294a6e8014ca73a499c7c
Merge: aa044f697 af6d46159
Author: Mr.doob <[email protected]>
Date:   Fri Oct 12 16:53:24 2018 -0700

    Merge pull request #15026 from WestLangley/dev-exr_example

    EXR example: remove custom tone mapping shader

commit aa044f69737f7099bcfb4f32355aab266258b323
Merge: c501d0fc7 29f4739f7
Author: Mr.doob <[email protected]>
Date:   Fri Oct 12 16:07:37 2018 -0700

    Merge pull request #15038 from WestLangley/dev-tonemapping_example

    Tonemapping example: clean up

commit c501d0fc7f83207b1dd41fd1b21e6fd385807449
Merge: 7406e3c58 2fc1e5bbd
Author: Mr.doob <[email protected]>
Date:   Fri Oct 12 16:04:13 2018 -0700

    Merge pull request #15041 from Mugen87/dev2

    XLoader: Added setCrossOrigin(), setPath() and setResourcePath()

commit 1299eea117ff5c067c41643fc7ee7e7331ee66ee
Author: gogoend <[email protected]>
Date:   Fri Oct 12 18:46:25 2018 +0800

    Revert "translation for helpers and geometries."

    This reverts commit 74b5a1533af17e973dddb534b769bd16825b1020.

commit 2fc1e5bbd68da982d49f2f52c02097fd87bde401
Author: Mugen87 <[email protected]>
Date:   Fri Oct 12 11:27:56 2018 +0200

    XLoader: Added setCrossOrigin(), setPath() and setResourcePath()

commit 1837a4e0366fb7cdd3fcb50c9b2c355dd784289d
Author: Xander Luciano <[email protected]>
Date:   Fri Oct 12 02:25:17 2018 -0700

    Fix box sizing on examples

    Using width:100% and padding without proper box-sizing causes elements to overflow on mobile, enabling overscroll-behavior in the X direction.

commit 6b6efdeea7d9494cdfd17cd195342e4aa999e405
Merge: eb9a2e3af ae64821d1
Author: Xander Luciano <[email protected]>
Date:   Fri Oct 12 02:13:47 2018 -0700

    Merge branch 'fix-trackball-html' of https://github.com/XanderLuciano/three.js into fix-trackball-html

commit eb9a2e3af01eb013493c951091be0b8a527dbdd7
Author: Xander Luciano <[email protected]>
Date:   Thu Aug 2 12:35:13 2018 -0700

    Update stats every frame

commit b5ce0c777a1a7863500033a7c5bba84043a4ef42
Author: Xander Luciano <[email protected]>
Date:   Thu Aug 2 11:14:38 2018 -0700

    Update box sizing on orbit controls

    Might as well fix the sizing here also.

commit b4663501c64829307148328d4f1337b807d12c7d
Author: Xander Luciano <[email protected]>
Date:   Thu Aug 2 11:09:59 2018 -0700

    Revert to 5px padding on edges

    On mobile this gives the text a little extra padding from the sides of the screen. This is safe to do now that we use the right box sizing.

commit dad0c8d2a7539c98dd70ceded270dd3ec76050aa
Author: Xander Luciano <[email protected]>
Date:   Thu Aug 2 10:33:12 2018 -0700

    Fix incorrect body size

commit b63d0346f526a33cf16e016ed8764b34cf7921f9
Author: Xander Luciano <[email protected]>
Date:   Thu Aug 2 10:25:01 2018 -0700

    Fix the overflowing div

    The side padding with 100% width causes the div to overflow the screen. So we remove the side padding (no used anyways), and also tell it to use box-sizing: border box to properly calculate the box sizing as expected.

commit fd5c86eedac99710f59ba832a817f6d3f5f43d94
Author: Xander Luciano <[email protected]>
Date:   Thu Aug 2 10:12:13 2018 -0700

    Properly size HTML elements to prevent zooming.

    Also should prevent it from thinking it can scroll.

commit 29f4739f7c5f6757b6344157c5ab20668f1fbbd9
Author: WestLangley <[email protected]>
Date:   Thu Oct 11 21:21:59 2018 -0400

    Clean up

commit 7406e3c58135cd798c12876c7171878fd9f78ea9
Merge: 07b24f7f0 08f44d307
Author: Michael Herzog <[email protected]>
Date:   Thu Oct 11 18:53:26 2018 +0200

    Merge pull request #15037 from OndrejSpanel/dev

    Fix code style to match ESLint requirements.

commit 08f44d3078771f13e8568ba7dd91f6debe340bad
Author: Ondřej Španěl <[email protected]>
Date:   Thu Oct 11 17:26:35 2018 +0200

    Fix code style to match ESLint requirements.

commit 74b5a1533af17e973dddb534b769bd16825b1020
Author: gogoend <[email protected]>
Date:   Thu Oct 11 22:01:11 2018 +0800

    translation for helpers and geometries.

commit c131bb2b2d4dea38c77f28e94d804665caee44a8
Merge: aa0b6696c 8d9cebbc9
Author: nicholas-yangding <[email protected]>
Date:   Thu Oct 11 18:49:06 2018 +0800

    Merge pull request #1 from sweerwen/translation-zh

    translate helper folder

commit aa0b6696caac3aa03f1475cd3f15523bbc3a1686
Merge: 06b2adce1 7ec8b0268
Author: zhaojunb <[email protected]>
Date:   Thu Oct 11 18:48:29 2018 +0800

    Merge remote-tracking branch 'origin/translation-zh' into translation-zh

commit 06b2adce1e753ca0366fdae6f36f5960893bcb03
Author: zhaojunb <[email protected]>
Date:   Thu Oct 11 17:12:16 2018 +0800

    commit all core part translation,first commit

commit 7ec8b026835138d2289d2a624925d7df93210c19
Author: zhangpeng26 <[email protected]>
Date:   Wed Oct 10 17:09:00 2018 +0800

    translate

commit 1c66840124c7245ed7b10eaa9a5010614891a218
Merge: 6fe568e7d 07b24f7f0
Author: Lewy Blue <[email protected]>
Date:   Wed Oct 10 14:13:50 2018 +0530

    merge dev

commit 6fe568e7de7cc0363971ab22dfdaa43818a8fd73
Author: Lewy Blue <[email protected]>
Date:   Wed Oct 10 14:04:43 2018 +0530

    fix indentation

commit 946a65821a3f9401d4915a077d7963e0a6672021
Author: Lewy Blue <[email protected]>
Date:   Wed Oct 10 13:59:43 2018 +0530

    fix linter errors

commit a5b45d15ed3e18587fac1253aa96113549a22e3a
Author: Lewy Blue <[email protected]>
Date:   Wed Oct 10 13:42:45 2018 +0530

    fix linter errors in webgl M to W

commit fe8d66b63655064376f8de0bb90e18f570ff59dc
Author: WestLangley <[email protected]>
Date:   Tue Oct 9 22:35:01 2018 -0400

    Remove CanvasRenderer

commit 07b24f7f03e73174278152f062d98068124d6ff2
Merge: 835aec0b9 c73a491cb
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 18:15:21 2018 -0700

    Merge pull request #11134 from sublambda/dev

    make Object3D properties (pos,rot,quat,scale) configurable

commit 835aec0b9489d524989a68f6bed36852390a5398
Merge: 00a998071 cb2cd1216
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 18:11:35 2018 -0700

    Merge pull request #15028 from donmccurdy/bug-nonphysical-decay

    Lights: Fix regression in non-physical attenuation.

commit cb2cd121652793a5c112c7af14d98afcd972639d
Author: Don McCurdy <[email protected]>
Date:   Tue Oct 9 17:01:06 2018 -0700

    Lights: Fix regression in non-physical attenuation.

commit 00a9980717294321a7981c81109de8258074971b
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 16:33:13 2018 -0700

    Updated builds.

commit f676cab17a2a4991709772936a057694286f171f
Merge: 3395231fd fd5077bd2
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 16:27:07 2018 -0700

    Merge pull request #14950 from jsantell/frustum-fix

    Use a combined frustum for culling when in VR

commit 3395231fda2ff95783588b9d0a40111b07742dd1
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 16:15:17 2018 -0700

    Updated builds.

commit 916af9d3906595d90a8e37d06eefcf12b6caa3cf
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 16:14:11 2018 -0700

    r98dev

commit 58e3288baaed4542bbf2f65898b8252c675b3cf6
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 16:10:26 2018 -0700

    Updated builds.

commit c1a175dd1f7aad2f6b62228a08f1726196b17c1c
Merge: fc3751a67 963bcc814
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 15:50:59 2018 -0700

    Merge pull request #14977 from Mugen87/dev9

    ObjectLoader: Added setPath(), setTexturePath() -> setResourcePath().

commit fc3751a676b998e9bbf3879d818f1384e0d38bc1
Merge: 54c5665b1 b912545ef
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 15:49:18 2018 -0700

    Merge pull request #14974 from takahirox/FixGLTFExampleLight

    GLTFLoader Extension Example: Fix Spotlight

commit 54c5665b176722ccc1b27e089e57cde19684de01
Merge: 96ec75e36 5ae96fa93
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 15:12:32 2018 -0700

    Merge pull request #14779 from takahirox/GLTFLoaderEfficientLoad

    GLTFLoader: Efficient load

commit 96ec75e36a1ac6df89d2d1c630e59eac116e8783
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 15:04:06 2018 -0700

    Examples clean up.

commit 8c482dbcef8f1a0a27a8f4dd39fb6e2dfb2ea3f6
Merge: d3bd4db57 9d57a0d9d
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 14:19:56 2018 -0700

    Merge pull request #15012 from jbaicoianu/worker-fixes

    Fix undefined object errors when loading assets in workers

commit d3bd4db57d060582186326c36c7585741fb2678d
Merge: 6e1dc707f 71e474c75
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 14:08:01 2018 -0700

    Merge pull request #14942 from yomboprime/moses

    Stabilized webgl_gpgpu_water simulation

commit 6e1dc707fea13761f0ea57e024e87c2d8083d588
Merge: b87bf0ab1 9a9d5906c
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 13:08:18 2018 -0700

    Merge pull request #15018 from rtpHarry/patch-1

    improve some wording in animation docs

commit b87bf0ab18cca71f88e30a511abb84cff4704181
Merge: f60792802 a872fbd32
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 13:06:57 2018 -0700

    Merge pull request #15016 from looeee/cars_materials_tweak

    Example materials car: fix shadow

commit f60792802ec71afaaf86c93ae8d2721a2c68978e
Merge: 0d8083450 36110ea91
Author: Mr.doob <[email protected]>
Date:   Tue Oct 9 13:05:59 2018 -0700

    Merge pull request #15025 from anderscognite/anderscognite/typo

    Fixed typo in variable

commit af6d46159e8c82515fa775915757dba716552a0b
Author: WestLangley <[email protected]>
Date:   Tue Oct 9 11:04:50 2018 -0400

    Remove custom tonemapping shader; clean up

commit 8d9cebbc94044ccb1046864a7563f728a9a95cb6
Author: Leven <[email protected]>
Date:   Tue Oct 9 17:57:48 2018 +0800

    Update Polyfills.html

commit 36110ea91906495afb751be31e3e01aa92cec981
Author: Anders Hafreager <[email protected]>
Date:   Tue Oct 9 11:41:47 2018 +0200

    Fixed typo in variable

commit 9d57a0d9ded8534b9bc437154bff6edd2257480e
Author: James Baicoianu <[email protected]>
Date:   Mon Oct 8 22:24:12 2018 -0700

    Fixed else if

commit 0d33d726b7b6e6397e3c3c183c47b0a05bf444f7
Author: sweerwen <[email protected]>
Date:   Tue Oct 9 11:03:01 2018 +0800

    translate helper folder

commit bf10f07188af06b475c51bd683e1b26b04c8e90f
Author: hucijiao <[email protected]>
Date:   Mon Oct 8 20:36:32 2018 +0800

    doc(shaders, scenes, webgl):中文文档

commit 4894f4e44448fdf18ea5f4181e4eba252e276a88
Author: Lewy Blue <[email protected]>
Date:   Mon Oct 8 14:52:14 2018 +0530

    Fix linter errors in examples WebGL A-L

commit 0d808345069701da51833ffb1de87c9d73433e72
Merge: 63560a127 14ecfab5b
Author: Mr.doob <[email protected]>
Date:   Sun Oct 7 17:48:17 2018 -0700

    Merge pull request #15017 from looeee/fbxloader_use_array_filter

    FBXLoader: use Array.filter instead of forEach

commit 9a9d5906c99062e9193fae526b8790b2f31484c6
Author: Matthew Harris <[email protected]>
Date:   Sat Oct 6 17:23:33 2018 +0700

    improve some wording in animation docs

commit 71e474c75fae8f341468c3b98fcf98ddacc27701
Author: yomboprime <[email protected]>
Date:   Sat Oct 6 11:36:14 2018 +0200

    Changed water algorithm and added tennis balls

commit 14ecfab5b4dfe237548ac4eaf3031fac2de75e87
Author: Lewy Blue <[email protected]>
Date:   Sat Oct 6 12:54:35 2018 +0530

    use array.filter

commit a872fbd32ff390a10933b66ca972dbd10dfabafd
Author: Lewy Blue <[email protected]>
Date:   Sat Oct 6 12:18:22 2018 +0530

    extend shadow far

commit 63560a127a2c07f2cac949ea8e49314a2b4e79d3
Merge: 1a6572b43 492bcfe2f
Author: Mr.doob <[email protected]>
Date:   Fri Oct 5 10:08:50 2018 -0700

    Merge pull request #14989 from Mugen87/dev7

    Loaders: Added missing .setPath() in remaining core loaders.

commit 31f81c65442ec4c9c4e86431e0309ad6820fbe43
Author: James Baicoianu <[email protected]>
Date:   Thu Oct 4 20:13:05 2018 -0700

    Remove unnecessary window references

commit 1a6572b43c49719ec49de24f98d19b4252459ba4
Merge: 02e7da2df 70ff172db
Author: Mr.doob <[email protected]>
Date:   Thu Oct 4 18:20:40 2018 -0400

    Merge pull request #15002 from YariPL/patch-1

    Update README.md

commit 02e7da2df69f12b7efd04f5345f4d33113708122
Merge: fdd849738 6f41c43af
Author: Mr.doob <[email protected]>
Date:   Thu Oct 4 16:39:44 2018 -0400

    Merge pull request #15007 from baba1472/dev

    Fix for PCD Loader to display proper RGB values

commit 69e4809382a5d8830506ec039bd8ebf1d7835e58
Author: yomboprime <[email protected]>
Date:   Thu Oct 4 08:16:33 2018 +0200

    Compute uniform value only once.

commit 7b0966cbb49e057a96b642998048e6f8a5756aab
Author: yomboprime <[email protected]>
Date:   Thu Oct 4 07:14:13 2018 +0200

    Distributed evenly the drain across time.

commit 9c90bedda362a3c89b5f04a4db266ff14810426b
Author: yomboprime <[email protected]>
Date:   Thu Oct 4 05:08:58 2018 +0200

    Substitute water level for volume

commit 8d3cae2f28e23e7215d3f92dd2c69457398345af
Author: yomboprime <[email protected]>
Date:   Thu Oct 4 02:24:16 2018 +0200

    Changed water reset feedback to sample 1 point

commit 6f41c43af222b378beea61d0af7473c8868fdb62
Author: Babatunde Ogunfemi <[email protected]>
Date:   Wed Oct 3 14:52:36 2018 -0500

    Fix for PCD Loader to display proper RGB values

    This fixes #12207 to ensure the right color values are displayed. This fixes both ascii and binary data file renderings.

commit 70ff172db2f55c0afa3c39d64c00ffca3ea5fb65
Author: Yaroslav Khudchenko <[email protected]>
Date:   Wed Oct 3 01:05:08 2018 +0200

    Update README.md

commit fdd849738cb47198382cc27aec2b9ef22274aa62
Merge: 85a1a5660 5f8501676
Author: Mr.doob <[email protected]>
Date:   Mon Oct 1 08:46:14 2018 -0400

    Merge pull request #14998 from WestLangley/dev-exrloader

    EXRLoader: make thrown exceptions more informative

commit 85a1a5660a359a50821240fdf954b5167c2203d4
Merge: 2f46e2a6e c9d90a726
Author: Mr.doob <[email protected]>
Date:   Mon Oct 1 08:45:51 2018 -0400

    Merge pull request #14999 from stormwin/patch-1

    Update DRACOLoader.js

commit 52229e7522582d2a5638f1e4cd0ddcc4a7782b63
Merge: 159a284c0 2f46e2a6e
Author: gogoend <[email protected]>
Date:   Mon Oct 1 10:55:16 2018 +0800

    Merge pull request #1 from mrdoob/dev

    Update the changes form the origin repo.

commit 5f85016762ea8131cd7347bb9837bc4a6cf156cb
Author: WestLangley <[email protected]>
Date:   Sun Sep 30 16:58:21 2018 -0400

    Make thrown exceptions more informative

commit 2f46e2a6ed597423c1aee7789cc1ad0e988a8772
Merge: 42d596778 132c15a12
Author: Mr.doob <[email protected]>
Date:   Sun Sep 30 14:46:37 2018 -0400

    Merge pull request #14995 from Mugen87/dev2

    Examples: Adjusted path handling in VRMLoader and LegacyGLTFLoader.

commit 132c15a128946ca2a4d6bb510c5a8115f8abc610
Author: Mugen87 <[email protected]>
Date:   Sun Sep 30 12:18:02 2018 +0200

    Examples: Adjusted path handling in VRMLoader and LegacyGLTFLoader.

commit 42d5967785220b3db593ef8f126da6f22194aa28
Merge: eaf95ff71 baa7bec6f
Author: Mr.doob <[email protected]>
Date:   Sat Sep 29 13:21:35 2018 -0400

    Merge pull request #14990 from gero3/patch-4

    remove unnecessary checks

commit eaf95ff71d65f94a57a8ca35b6ee2d57eda727da
Merge: 6f63631dc 099d5a377
Author: Mr.doob <[email protected]>
Date:   Sat Sep 29 13:18:12 2018 -0400

    Merge pull request #14987 from looeee/examples_fix_linter_errors2

    Fix more linter errors in examples

commit 6f63631dcce2e980fa33797dc1dffcd6bc52f1e1
Merge: eb0118682 89db424a3
Author: Mr.doob <[email protected]>
Date:   Sat Sep 29 13:16:16 2018 -0400

    Merge pull request #14992 from looeee/examples_fix_linter_errors3

    Fix linter errors in misc and WebVR examples

commit 099d5a377188bf3597de69a0327d179b8d751f89
Author: Lewy Blue <[email protected]>
Date:   Sat Sep 29 17:12:42 2018 +0100

    Move statements to individual lines

commit 89db424a342ae0eb339636c64b079deb30d6246e
Author: Lewy Blue <[email protected]>
Date:   Sat Sep 29 17:08:10 2018 +0100

    Move statements to seperate lines

commit 0f14339f82ece6cd2a15e303b61ae268e94d7812
Author: Lewy Blue <[email protected]>
Date:   Sat Sep 29 17:01:39 2018 +0100

    Move statements onto seperate lines

commit c1f6878d23b0401e718776e9e80b77fa7e25832c
Author: Lewy Blue <[email protected]>
Date:   Sat Sep 29 16:31:15 2018 +0100

    Fix linter errors

commit 8958274fdca3feb9130bbea3c68885c6ff7d4823
Author: Lewy Blue <[email protected]>
Date:   Sat Sep 29 15:53:54 2018 +0100

    Fixed linter errors

commit baa7bec6fd58d7b0baef2cf79847a91fca495bca
Author: gero3 <[email protected]>
Date:   Sat Sep 29 11:09:12 2018 +0200

    remove unnecessary checks

commit eb0118682a0802ce54ba7ad62f5…
  • Loading branch information
aymanhab committed Dec 3, 2018
1 parent 94f8188 commit 0b41ada
Show file tree
Hide file tree
Showing 661 changed files with 22,244 additions and 35,438 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
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
- [ ] r97
- [ ] r98
- [ ] ...

##### Browser
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).

### Change log ###

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


[npm-badge]: https://img.shields.io/npm/v/three.svg
Expand Down
7,270 changes: 3,745 additions & 3,525 deletions build/three.js

Large diffs are not rendered by default.

1,601 changes: 799 additions & 802 deletions build/three.min.js

Large diffs are not rendered by default.

7,271 changes: 3,745 additions & 3,526 deletions build/three.module.js

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions docs/api/en/audio/Audio.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,15 @@ <h3>[property:Boolean hasPlaybackControl]</h3>
<p>Whether playback can be controlled using the [page:Audio.play play](),
[page:Audio.pause pause]() etc. methods. Default is *true*.</p>

<h3>[property:Number playbackRate]</h3>
<p>Speed of playback. Default is *1*.</p>

<h3>[property:Boolean isPlaying]</h3>
<p>Whether the audio is currently playing.</p>

<h3>[property:AudioListener listener]</h3>
<p>A reference to the listener object of this audio.</p>

<h3>[property:Number playbackRate]</h3>
<p>Speed of playback. Default is *1*.</p>

<h3>[property:Number startTime]</h3>
<p>The time at which the sound should begin to play. Same as the *when* paramter of [link:https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode/start AudioBufferSourceNode.start](). Default is *0*.</p>

Expand Down
2 changes: 2 additions & 0 deletions docs/api/en/audio/AudioListener.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ <h3>[property:GainNode gain]</h3>
<h3>[property:AudioNode filter]</h3>
<p>Default is *null*.</p>

<h3>[property:Number timeDelta]</h3>
<p>Time delta value for audio entities. Use in context of [link:https://developer.mozilla.org/en-US/docs/Web/API/AudioParam/linearRampToValueAtTime AudioParam.linearRampToValueAtTimeDefault](). Default is *0*.</p>

<h2>Methods</h2>

Expand Down
10 changes: 8 additions & 2 deletions docs/api/en/cameras/CubeCamera.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,17 @@ <h2>Examples</h2>
<h2>Constructor</h2>


<h3>[name]( [param:Number near], [param:Number far], [param:Number cubeResolution] )</h3>
<h3>[name]( [param:Number near], [param:Number far], [param:Number cubeResolution], [param:Object options] )</h3>
<p>
near -- The near clipping distance. <br />
far -- The far clipping distance <br />
cubeResolution -- Sets the length of the cube's edges.
cubeResolution -- Sets the length of the cube's edges. <br />
options - (optional) object that holds texture parameters passed to the auto-generated WebGLRenderTargetCube.
If not specified, the options default to:
<code>
{ format: RGBFormat, magFilter: LinearFilter, minFilter: LinearFilter }
</code>

</p>
<p>
Constructs a CubeCamera that contains 6 [page:PerspectiveCamera PerspectiveCameras] that
Expand Down
1 change: 0 additions & 1 deletion docs/api/en/cameras/OrthographicCamera.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ <h1>[name]</h1>

<h2>Example</h2>

<p>[example:canvas_camera_orthographic camera / orthographic ]</p>
<p>[example:webgl_camera camera ]</p>
<p>[example:webgl_interactive_cubes_ortho interactive / cubes / ortho ]</p>
<p>[example:webgl_materials_cubemap_dynamic materials / cubemap / dynamic ]</p>
Expand Down
2 changes: 0 additions & 2 deletions docs/api/en/cameras/PerspectiveCamera.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ <h1>[name]</h1>

<h2>Example</h2>

<p>[example:canvas_geometry_birds geometry / birds ]</p>
<p>[example:canvas_geometry_cube geometry / cube ]</p>
<p>[example:webgl_animation_skinning_blending animation / skinning / blending ]</p>
<p>[example:webgl_animation_skinning_morph animation / skinning / blending ]</p>
<p>[example:webgl_effects_stereo effects / stereo ]</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/en/core/BufferGeometry.html
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ <h3>[method:null clearGroups]( )</h3>

<h3>[method:null computeBoundingBox]()</h3>
<p>
Computes bounding box of the geometry, updating [param:.boundingBox] attribute.<br />
Computes bounding box of the geometry, updating [page:.boundingBox] attribute.<br />
Bounding boxes aren't computed by default. They need to be explicitly computed, otherwise they are *null*.
</p>

Expand Down
3 changes: 2 additions & 1 deletion docs/api/en/core/Geometry.html
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ <h3>[method:null dispose]()</h3>
</p>

<h3>[method:Geometry fromBufferGeometry]( [param:BufferGeometry geometry] )</h3>
<p>Convert a [page:BufferGeometry] to a Geometry.</p>
<p>Convert a [page:BufferGeometry] to a Geometry. <br />
The array used to store the vertices in the bufferGeometry is a non indexed array, so the resultant geometry may contain duplicated vertices. Use [page:mergeVertices] to remove them.</p>

<h3>[method:Geometry lookAt] ( [param:Vector3 vector] )</h3>
<p>
Expand Down
4 changes: 2 additions & 2 deletions docs/api/en/core/InterleavedBuffer.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ <h3>[property:Integer version]</h3>
A version number, incremented every time the needsUpdate property is set to true.
</p>

<h3>[property:Integer isInterleavedBuffer]</h3>
<h3>[property:Boolean isInterleavedBuffer]</h3>
<p>
Default is *true*.
</p>

<h3>[property:Integer needsUpdate]</h3>
<h3>[property:Boolean needsUpdate]</h3>
<p>
Default is *false*. Setting this to true increments [page:InterleavedBuffer.version version].
</p>
Expand Down
6 changes: 3 additions & 3 deletions docs/api/en/deprecated/DeprecatedList.html
Original file line number Diff line number Diff line change
Expand Up @@ -501,11 +501,11 @@ <h3>[page:Shape]</h3>



<h2>Renderer</h2>
<h2>Renderers</h2>

<h3>[page:Projector]</h3>
<h3>[page:CanvasRenderer]</h3>
<p>
CanvasRenderer has been moved to [link:https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CanvasRenderer.js /examples/js/renderers/CanvasRenderer.js].
CanvasRenderer has been removed.
</p>

<h3>[page:Projector]</h3>
Expand Down
11 changes: 0 additions & 11 deletions docs/api/en/extras/curves/ArcCurve.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,6 @@ <h3>[property:Boolean isArcCurve]</h3>
</p>


<h2>Properties</h2>
<div>See the [page:EllipseCurve] class for common properties.</div>

<h3>[property:Boolean isArcCurve]</h3>
<div>
Used to check whether this or derived classes are ArcCurves. Default is *true*.<br /><br />

You should not change this, as it used internally for optimisation.
</div>


<h2>Source</h2>

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
Expand Down
4 changes: 0 additions & 4 deletions docs/api/en/lights/AmbientLight.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ <h1>[name]</h1>

<h2>Example</h2>
<p>
[example:canvas_camera_orthographic camera / orthographic ]<br />
[example:canvas_interactive_voxelpainter interactive / voxelpainter ]<br />
[example:canvas_materials materials ]<br />
[example:canvas_sandbox sandbox ]<br />
[example:webgl_animation_cloth animation / cloth ]<br />
[example:webgl_animation_skinning_blending animation / skinning / blending ]
</p>
Expand Down
1 change: 0 additions & 1 deletion docs/api/en/lights/DirectionalLight.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ <h2>A Note about Position, Target and rotation</h2>

<h2>Example</h2>
<p>
[example:canvas_morphtargets_horse morphtargets / horse ]<br />
[example:misc_controls_fly controls / fly ]<br />
[example:misc_lights_test lights / test ]<br />
[example:webvr_cubes cubes ]<br />
Expand Down
1 change: 0 additions & 1 deletion docs/api/en/lights/PointLight.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ <h1>[name]</h1>
<h2>Example</h2>

<p>
[example:canvas_lights_pointlights lights / pointlights ]<br />
[example:webgl_lights_pointlights lights / pointlights ]<br />
[example:webgl_lights_pointlights2 lights / pointlights2 ]<br />
[example:webgldeferred_animation animation ]<br />
Expand Down
8 changes: 8 additions & 0 deletions docs/api/en/loaders/AnimationLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ <h3>[method:null parse]( [param:JSON json], [param:Function onLoad] )</h3>
be parsed with [page:AnimationClip.parse].
</p>

<h3>[method:AnimationLoader setPath]( [param:String path] )</h3>
<p>
[page:String path] — Base path of the file to load.<br /><br />

Sets the base path or URL from which to load files. This can be useful if
you are loading many animations from the same directory.
</p>

<h2>Source</h2>

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
Expand Down
8 changes: 8 additions & 0 deletions docs/api/en/loaders/AudioLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ <h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Func
Begin loading from url and pass the loaded [page:String AudioBuffer] to onLoad.
</p>

<h3>[method:AudioLoader setPath]( [param:String path] )</h3>
<p>
[page:String path] — Base path of the file to load.<br /><br />

Sets the base path or URL from which to load files. This can be useful if
you are loading many audios from the same directory.
</p>

<h2>Source</h2>

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
Expand Down
8 changes: 8 additions & 0 deletions docs/api/en/loaders/BufferGeometryLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ <h3>[method:BufferGeometry parse]( [param:Object json] )</h3>
Parse a <em>JSON</em> structure and return a [page:BufferGeometry].
</p>

<h3>[method:BufferGeometryLoader setPath]( [param:String path] )</h3>
<p>
[page:String path] — Base path of the file to load.<br /><br />

Sets the base path or URL from which to load files. This can be useful if
you are loading many geometries from the same directory.
</p>

<h2>Source</h2>

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
Expand Down
8 changes: 8 additions & 0 deletions docs/api/en/loaders/DataTextureLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ <h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Func
Begin loading from url and pass the loaded texture to onLoad.
</p>

<h3>[method:DataTextureLoader setPath]( [param:String path] )</h3>
<p>
[page:String path] — Base path of the file to load.<br /><br />

Sets the base path or URL from which to load files. This can be useful if
you are loading many data textures from the same directory.
</p>

<h2>Source</h2>

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
Expand Down
3 changes: 1 addition & 2 deletions docs/api/en/loaders/JSONLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ <h1>[name]</h1>
<h2>Example</h2>

<p>
[example:webgl_loader_json WebGL / loader / json]<br />
[example:webgl_loader_json_objconverter WebGL / loader / json / objconverter]
[example:webgl_loader_json WebGL / loader / json]
</p>

<code>
Expand Down
12 changes: 9 additions & 3 deletions docs/api/en/loaders/MaterialLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,18 @@ <h3>[method:Material parse]( [param:Object json] )</h3>
Parse a <em>JSON</em> structure and create a new [page:Material] of the type [page:String json.type] with parameters defined in the json object.
</p>

<h3>[method:null setTextures]( [param:Object textures] )</h3>
<h3>[method:MaterialLoader setPath]( [param:String path] )</h3>
<p>
[page:Object textures] — object containing any textures used by the material.
</p>
[page:String path] — Base path of the file to load.<br /><br />

Sets the base path or URL from which to load files. This can be useful if
you are loading many materials from the same directory.
</p>

<h3>[method:MaterialLoader setTextures]( [param:Object textures] )</h3>
<p>
[page:Object textures] — object containing any textures used by the material.
</p>

<h2>Source</h2>

Expand Down
13 changes: 8 additions & 5 deletions docs/api/en/loaders/ObjectLoader.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ <h3>[property:LoadingManager manager]</h3>
The [page:LoadingManager loadingManager] the loader is using. Default is [page:DefaultLoadingManager].
</p>

<h3>[property:String texturePath]</h3>
<h3>[property:String resourcePath]</h3>
<p>
The base path or URL from which textures will be loaded. See [page:.setTexturePath].
The base path or URL from which additional resources like textuures will be loaded. See [page:.setResourcePath].
Default is the empty string.
</p>

Expand Down Expand Up @@ -217,11 +217,14 @@ <h3>[method:ObjectLoader setCrossOrigin]( [param:String value] )</h3>
[page:String value] — The crossOrigin string to implement CORS for loading the url from a different domain that allows CORS.
</p>

<h3>[method:ObjectLoader setTexturePath]( [param:String value] )</h3>
<h3>[method:ObjectLoader setPath]( [param:String value] )</h3>
<p>
[page:String value] — The base path or URL from which textures will be loaded.<br /><br />

Set the base path for the original file.
</p>

<h3>[method:ObjectLoader setResourcePath]( [param:String value] )</h3>
<p>
Set the base path for dependent resources like textures.
</p>

<h2>Source</h2>
Expand Down
1 change: 0 additions & 1 deletion docs/api/en/materials/LineDashedMaterial.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ <h2>Examples</h2>

<p>
[example:webgl_lines_dashed WebGL / lines / dashed]<br />
[example:canvas_lines_dashed Canvas / lines /dashed]
</p>

<code>
Expand Down
7 changes: 0 additions & 7 deletions docs/api/en/materials/Material.html
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,6 @@ <h3>[property:Float opacity]</h3>
Default is *1.0*.
</p>

<h3>[property:Float overdraw]</h3>
<p>
Amount of triangle expansion at draw time.
This is a workaround for cases when gaps appear between triangles when using [page:CanvasRenderer].
*0.5* tends to give good results across browsers. Default is *0*.
</p>

<h3>[property:Boolean polygonOffset]</h3>
<p>
Whether to use polygon offset. Default is *false*. This corresponds to the *GL_POLYGON_OFFSET_FILL* WebGL feature.
Expand Down
2 changes: 1 addition & 1 deletion docs/api/en/materials/ShaderMaterial.html
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ <h3>[property:Boolean wireframe]</h3>
<h3>[property:Float wireframeLinewidth]</h3>
<p>Controls wireframe thickness. Default is 1.<br /><br />

Due to limitations of the [link:https://www.khronos.org/registry/OpenGL/specs/gl/glspec46.core.pdf OpenGL Core Profile)
Due to limitations of the [link:https://www.khronos.org/registry/OpenGL/specs/gl/glspec46.core.pdf OpenGL Core Profile]
with the [page:WebGLRenderer WebGL] renderer on most platforms linewidth will
always be 1 regardless of the set value.
</p>
Expand Down
1 change: 0 additions & 1 deletion docs/api/en/materials/SpriteMaterial.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ <h2>Examples</h2>
<div>
[example:webgl_sprites WebGL / sprites]<br />
[example:misc_ubiquity_test misc / ubiquity / test]<br />
[example:misc_ubiquity_test2 misc / ubiquity / test2]<br />
[example:software_sandbox software / sandbox]<br />
[example:svg_sandbox svg / sandbox]<br />
[example:webgl_materials_cubemap_dynamic webgl / materials / cubemap / dynamic]
Expand Down
27 changes: 0 additions & 27 deletions docs/api/en/textures/DataTexture.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,33 +60,6 @@ <h2>Example</h2>
texture.needsUpdate = true
</code>

<h2>Example</h2>

<code>
// create a buffer with color data

var size = width * height;
var data = new Uint8Array( 3 * size );

var r = Math.floor( color.r * 255 );
var g = Math.floor( color.g * 255 );
var b = Math.floor( color.b * 255 );

for ( var i = 0; i < size; i ++ ) {

var stride = i * 3;

data[ stride ] = r;
data[ stride + 1 ] = g;
data[ stride + 2 ] = b;

}

// used the buffer to create a [name]

var texture = new THREE.DataTexture( data, width, height, THREE.RGBFormat );
</code>

<h2>Properties</h2>

<h3>[property:Image image]</h3>
Expand Down
Loading

0 comments on commit 0b41ada

Please sign in to comment.