Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mrdoob/three.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d462397786bde5537eec141dbb6754fbadb8306d
Choose a base ref
...
head repository: mrdoob/three.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 327c9dde64fcaae88dc4a5d48c4397886ca7ada9
Choose a head ref

Commits on Jun 23, 2017

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6c5ed9e View commit details

Commits on Mar 14, 2018

  1. Copy the full SHA
    80e542c View commit details

Commits on Oct 3, 2018

  1. Copy the full SHA
    9e339ae View commit details
  2. Copy the full SHA
    9f4cbe3 View commit details

Commits on Dec 7, 2018

  1. Copy the full SHA
    240d2ca View commit details
  2. clean up

    WestLangley committed Dec 7, 2018
    Copy the full SHA
    4e2e96d View commit details

Commits on Dec 14, 2018

  1. Implements #15321: use object as cache for GTLF loader instead of array

    Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it>
    Riccardo Padovani committed Dec 14, 2018
    Copy the full SHA
    a2f3f2f View commit details
  2. Pull request comments + eslint

    Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it>
    Riccardo Padovani committed Dec 14, 2018
    Copy the full SHA
    12129ac View commit details
  3. Add primitivedef.mode

    Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it>
    Riccardo Padovani committed Dec 14, 2018
    Copy the full SHA
    8f45203 View commit details

Commits on Dec 21, 2018

  1. Pull request comments

    Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it>
    Riccardo Padovani committed Dec 21, 2018
    Copy the full SHA
    2da12cc View commit details
  2. Use standard for instead for of

    Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it>
    Riccardo Padovani committed Dec 21, 2018
    Copy the full SHA
    2c32a6f View commit details

Commits on Jan 7, 2019

  1. Improve implementation accordingly to PR reviews

    Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it>
    Riccardo Padovani committed Jan 7, 2019
    Copy the full SHA
    4510e93 View commit details

Commits on Jan 13, 2019

  1. deprecated renderTarget and forceClear from WebGLRenderer.render()

    resolves #15420
    Marc-Sefan Cassola committed Jan 13, 2019
    Copy the full SHA
    6f62caa View commit details
  2. updated docs to account for deprecation of parameters renderTarget an…

    …d forceClear from WebGLRenderer.render()
    Marc-Sefan Cassola committed Jan 13, 2019
    Copy the full SHA
    90df746 View commit details

Commits on Jan 14, 2019

  1. removed renderTarget and forceClear from WebGLRenderer.render() in ex…

    …ample code
    Marc-Sefan Cassola committed Jan 14, 2019
    Copy the full SHA
    85f911f View commit details

Commits on Jan 17, 2019

  1. WebGLTextures: Refactoring

    Mugen87 committed Jan 17, 2019
    Copy the full SHA
    ef9ece3 View commit details

Commits on Jan 21, 2019

  1. Copy the full SHA
    414f2a4 View commit details
  2. Pull request comments

    rpadovani committed Jan 21, 2019
    Copy the full SHA
    46ef152 View commit details

Commits on Jan 23, 2019

  1. Copy the full SHA
    a7b0bbb View commit details

Commits on Jan 26, 2019

  1. Copy the full SHA
    510326d View commit details

Commits on Jan 27, 2019

  1. Copy the full SHA
    18f2788 View commit details

Commits on Jan 29, 2019

  1. little wrong grammar.

    gogoend committed Jan 29, 2019
    Copy the full SHA
    aa1503b View commit details
  2. Copy the full SHA
    510468f View commit details

Commits on Feb 1, 2019

  1. Copy the full SHA
    ad1c992 View commit details
  2. Clean up rollup.config.js

    Mugen87 committed Feb 1, 2019
    Copy the full SHA
    7d75fe6 View commit details
  3. add glsl comment tag

    linbingquan committed Feb 1, 2019
    Copy the full SHA
    99a213e View commit details
  4. Merge pull request #15688 from linbingquan/glsl-shader

    Shader: glsl comment tag
    mrdoob authored Feb 1, 2019
    Copy the full SHA
    d5779c2 View commit details
  5. Merge pull request #15687 from Mugen87/dev26

    Clean up rollup.config.js
    mrdoob authored Feb 1, 2019
    Copy the full SHA
    4ba0a98 View commit details
  6. Copy the full SHA
    ba8cc68 View commit details

Commits on Feb 2, 2019

  1. Copy the full SHA
    5a11fea View commit details

Commits on Feb 3, 2019

  1. add module for public

    linbingquan committed Feb 3, 2019
    Copy the full SHA
    7b53b66 View commit details
  2. Copy the full SHA
    d1f553f View commit details
  3. Fixed coding style

    Temdog007 committed Feb 3, 2019
    Copy the full SHA
    2db8a4a View commit details
  4. Add types property to indicate the main declaration file

    Add `types` property to indicate the main declaration file.
    [docs](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html)
    hujiulong authored Feb 3, 2019
    Copy the full SHA
    cc86baf View commit details
  5. Copy the full SHA
    ccd86cc View commit details
  6. Fixed erroneous bit operation

    Took 4 minutes
    Usnul committed Feb 3, 2019
    Copy the full SHA
    ee56115 View commit details

Commits on Feb 4, 2019

  1. Examples: Clean up

    Mugen87 committed Feb 4, 2019
    Copy the full SHA
    2bcb326 View commit details
  2. GLTFExporter: Warn when exporting Geometry

    Don McCurdy authored Feb 4, 2019
    Copy the full SHA
    4c2c33f View commit details
  3. Clean up

    linbingquan committed Feb 4, 2019
    Copy the full SHA
    08aab18 View commit details
  4. Copy the full SHA
    7c44921 View commit details
  5. Merge pull request #15705 from Mugen87/dev27

    Examples: Clean up
    mrdoob authored Feb 4, 2019
    Copy the full SHA
    0903c17 View commit details
  6. Merge pull request #15709 from linbingquan/clean-up

    Editor: Clean up
    mrdoob authored Feb 4, 2019
    Copy the full SHA
    32abb07 View commit details
  7. Merge pull request #15702 from Usnul/dev

    WebGLRenderer: Fixed erroneous bit operation
    mrdoob authored Feb 4, 2019
    Copy the full SHA
    17e932d View commit details
  8. Merge pull request #15715 from arodic/transform_controls_fix_15713

    Removed preventDefault() from TransformControls.
    mrdoob authored Feb 4, 2019
    Copy the full SHA
    f9f7df1 View commit details

Commits on Feb 5, 2019

  1. Copy the full SHA
    ca84c14 View commit details
  2. Updated builds.

    mrdoob committed Feb 5, 2019
    Copy the full SHA
    ee3c598 View commit details
  3. Fixed travis build.

    mrdoob committed Feb 5, 2019
    Copy the full SHA
    734941d View commit details
  4. Merge pull request #15690 from Mugen87/dev26

    CubemapGenerator: Ensure options is never undefined
    Mugen87 authored Feb 5, 2019
    Copy the full SHA
    ecfaeeb View commit details
  5. Merge pull request #15693 from greggman/only-preventdefault-on-used-keys

    OrbitControls: Only call preventDefault() on used keys
    Mugen87 authored Feb 5, 2019
    Copy the full SHA
    ac68fc0 View commit details
  6. Merge pull request #15602 from Mugen87/dev21

    WebGLTextures: Refactoring
    mrdoob authored Feb 5, 2019
    Copy the full SHA
    c4dff1c View commit details
Showing with 5,213 additions and 2,865 deletions.
  1. +1 −1 .github/ISSUE_TEMPLATE.md
  2. +0 −1 .npmignore
  3. +1 −1 README.md
  4. +478 −155 build/three.js
  5. +822 −816 build/three.min.js
  6. +478 −156 build/three.module.js
  7. +1 −1 docs/api/en/audio/Audio.html
  8. +1 −1 docs/api/en/audio/AudioAnalyser.html
  9. +4 −4 docs/api/en/audio/AudioListener.html
  10. +2 −2 docs/api/en/audio/PositionalAudio.html
  11. +1 −0 docs/api/en/constants/Renderer.html
  12. +1 −1 docs/api/en/core/Object3D.html
  13. +4 −1 docs/api/en/extras/core/ShapePath.html
  14. +73 −0 docs/api/en/helpers/PositionalAudioHelper.html
  15. +7 −0 docs/api/en/materials/Material.html
  16. +0 −6 docs/api/en/renderers/WebGLRenderTargetCube.html
  17. +67 −22 docs/api/en/renderers/WebGLRenderer.html
  18. +10 −2 docs/api/en/textures/DataTexture3D.html
  19. +1 −1 docs/api/zh/audio/Audio.html
  20. +1 −1 docs/api/zh/audio/AudioAnalyser.html
  21. +4 −4 docs/api/zh/audio/AudioListener.html
  22. +2 −2 docs/api/zh/audio/PositionalAudio.html
  23. +1 −1 docs/api/zh/core/Object3D.html
  24. +73 −0 docs/api/zh/helpers/PositionalAudioHelper.html
  25. +4 −0 docs/api/zh/materials/Material.html
  26. +0 −5 docs/api/zh/renderers/WebGLRenderTargetCube.html
  27. +6 −4 docs/api/zh/renderers/WebGLRenderer.html
  28. +1 −1 docs/api/zh/textures/Texture.html
  29. +6 −1 docs/list.js
  30. +126 −0 docs/manual/en/introduction/How-to-dispose-of-objects.html
  31. +1 −1 docs/manual/zh/introduction/Creating-a-scene.html
  32. +125 −0 docs/manual/zh/introduction/How-to-dispose-of-objects.html
  33. +0 −2 editor/examples/arkanoid.app.json
  34. +0 −2 editor/examples/camera.app.json
  35. +0 −2 editor/examples/particles.app.json
  36. +0 −2 editor/examples/pong.app.json
  37. +0 −2 editor/examples/shaders.app.json
  38. +3 −4 editor/index.html
  39. +0 −2 editor/js/Config.js
  40. +22 −8 editor/js/Editor.js
  41. +25 −10 editor/js/Loader.js
  42. +41 −18 editor/js/Menubar.Add.js
  43. +1 −1 editor/js/Menubar.Edit.js
  44. +65 −5 editor/js/Sidebar.Animation.js
  45. +1 −1 editor/js/Sidebar.Geometry.BufferGeometry.js
  46. +1 −1 editor/js/Sidebar.Geometry.Geometry.js
  47. +1 −1 editor/js/Sidebar.Geometry.Modifiers.js
  48. +185 −0 editor/js/Sidebar.Geometry.TubeGeometry.js
  49. +1 −1 editor/js/Sidebar.Geometry.js
  50. +3 −3 editor/js/Sidebar.Material.js
  51. +2 −2 editor/js/Sidebar.Object.js
  52. +5 −28 editor/js/Sidebar.Project.js
  53. +3 −3 editor/js/Sidebar.Scene.js
  54. +10 −4 editor/js/Strings.js
  55. +3 −3 editor/js/Viewport.Info.js
  56. +27 −3 editor/js/Viewport.js
  57. +1 −2 editor/js/libs/app.js
  58. +1 −5 editor/js/libs/tern-threejs/threejs.js
  59. +5 −5 editor/js/libs/ui.js
  60. +8 −2 examples/js/GPUComputationRenderer.js
  61. +200 −64 examples/js/MarchingCubes.js
  62. +39 −14 examples/js/Ocean.js
  63. +11 −2 examples/js/cameras/CinematicCamera.js
  64. +16 −8 examples/js/controls/OrbitControls.js
  65. +0 −14 examples/js/controls/TransformControls.js
  66. +11 −3 examples/js/crossfade/scenes.js
  67. +4 −2 examples/js/crossfade/transition.js
  68. +13 −2 examples/js/effects/AnaglyphEffect.js
  69. +27 −6 examples/js/effects/OutlineEffect.js
  70. +9 −2 examples/js/effects/ParallaxBarrierEffect.js
  71. +2 −1 examples/js/effects/StereoEffect.js
  72. +3 −1 examples/js/exporters/GLTFExporter.js
  73. +7 −3 examples/js/loaders/AssimpJSONLoader.js
  74. +2 −2 examples/js/loaders/ColladaLoader.js
  75. +14 −6 examples/js/loaders/EquirectangularToCubeGenerator.js
  76. +17 −3 examples/js/loaders/FBXLoader.js
  77. +65 −65 examples/js/loaders/GLTFLoader.js
  78. +57 −67 examples/js/loaders/LDrawLoader.js
  79. +19 −4 examples/js/loaders/SVGLoader.js
  80. +4 −2 examples/js/loaders/TGALoader.js
  81. +29 −11 examples/js/loaders/VRMLLoader.js
  82. +23 −19 examples/js/loaders/deprecated/LegacyGLTFLoader.js
  83. +6 −2 examples/js/nodes/inputs/RTTNode.js
  84. +4 −2 examples/js/nodes/postprocessing/NodePostProcessing.js
  85. +12 −6 examples/js/objects/Fire.js
  86. +1 −1 examples/js/objects/Lensflare.js
  87. +5 −2 examples/js/objects/Reflector.js
  88. +5 −2 examples/js/objects/Refractor.js
  89. +3 −1 examples/js/objects/Water.js
  90. +2 −1 examples/js/pmrem/PMREMCubeUVPacker.js
  91. +3 −2 examples/js/pmrem/PMREMGenerator.js
  92. +35 −27 examples/js/postprocessing/AdaptiveToneMappingPass.js
  93. +18 −10 examples/js/postprocessing/AfterimagePass.js
  94. +11 −5 examples/js/postprocessing/BloomPass.js
  95. +9 −4 examples/js/postprocessing/BokehPass.js
  96. +3 −1 examples/js/postprocessing/CubeTexturePass.js
  97. +5 −2 examples/js/postprocessing/DotScreenPass.js
  98. +7 −3 examples/js/postprocessing/EffectComposer.js
  99. +5 −2 examples/js/postprocessing/FilmPass.js
  100. +7 −4 examples/js/postprocessing/GlitchPass.js
  101. +7 −4 examples/js/postprocessing/HalftonePass.js
  102. +8 −3 examples/js/postprocessing/MaskPass.js
  103. +27 −9 examples/js/postprocessing/OutlinePass.js
  104. +6 −1 examples/js/postprocessing/RenderPass.js
  105. +12 −7 examples/js/postprocessing/SAOPass.js
  106. +13 −4 examples/js/postprocessing/SMAAPass.js
  107. +8 −3 examples/js/postprocessing/SSAARenderPass.js
  108. +13 −9 examples/js/postprocessing/SSAOPass.js
  109. +3 −1 examples/js/postprocessing/SavePass.js
  110. +5 −2 examples/js/postprocessing/ShaderPass.js
  111. +14 −5 examples/js/postprocessing/TAARenderPass.js
  112. +4 −2 examples/js/postprocessing/TexturePass.js
  113. +19 −7 examples/js/postprocessing/UnrealBloomPass.js
  114. +2 −2 examples/js/renderers/WebGLDeferredRenderer.js
  115. BIN examples/models/svg/tests/8.png
  116. +31 −0 examples/models/svg/tests/8.svg
  117. +1 −1 examples/software_sandbox.html
  118. BIN examples/textures/tri_pattern.jpg
  119. +27 −20 examples/webaudio_orientation.html
  120. +1 −1 examples/webgl2_multisampled_renderbuffers.html
  121. +1 −1 examples/webgl_animation_skinning_morph.html
  122. +3 −2 examples/webgl_depth_texture.html
  123. +9 −9 examples/webgl_gpgpu_birds.html
  124. +3 −1 examples/webgl_interactive_cubes_gpu.html
  125. +5 −2 examples/webgl_interactive_instances_gpu.html
  126. +2 −2 examples/webgl_lines_fat.html
  127. +28 −18 examples/webgl_loader_gltf.html
  128. +41 −46 examples/webgl_loader_gltf_extensions.html
  129. +13 −13 examples/webgl_loader_ldraw.html
  130. +1 −1 examples/webgl_loader_nodes.html
  131. +10 −10 examples/webgl_loader_pcd.html
  132. +86 −38 examples/webgl_loader_svg.html
  133. +97 −213 examples/webgl_marchingcubes.html
  134. +47 −61 examples/webgl_materials_cars.html
  135. +4 −0 examples/webgl_materials_envmaps_hdr.html
  136. +18 −16 examples/webgl_materials_nodes.html
  137. +10 −19 examples/webgl_materials_standard.html
  138. +54 −3 examples/webgl_materials_video.html
  139. +3 −3 examples/webgl_multiple_elements.html
  140. +3 −3 examples/webgl_multiple_elements_text.html
  141. +6 −6 examples/webgl_multiple_views.html
  142. +1 −1 examples/webgl_performance_nodes.html
  143. +1 −0 examples/webgl_performance_static.html
  144. +8 −2 examples/webgl_postprocessing_dof2.html
  145. +17 −9 examples/webgl_postprocessing_godrays.html
  146. +2 −2 examples/webgl_postprocessing_nodes.html
  147. +1 −1 examples/webgl_postprocessing_nodes_pass.html
  148. +4 −1 examples/webgl_read_float_buffer.html
  149. +5 −2 examples/webgl_rtt.html
  150. +3 −1 examples/webgl_simple_gi.html
  151. +7 −2 examples/webgl_terrain_dynamic.html
  152. +2 −1 examples/webgl_tiled_forward.html
  153. +2 −4 examples/webvr_ballshooter.html
  154. +2 −4 examples/webvr_cubes.html
  155. +2 −4 examples/webvr_dragging.html
  156. +2 −4 examples/webvr_lorenzattractor.html
  157. +2 −4 examples/webvr_paint.html
  158. +2 −4 examples/webvr_panorama.html
  159. +2 −4 examples/webvr_rollercoaster.html
  160. +2 −4 examples/webvr_sandbox.html
  161. +2 −4 examples/webvr_sculpt.html
  162. +2 −4 examples/webvr_video.html
  163. +2 −4 examples/webvr_vive_paint.html
  164. +2 −4 examples/webvr_vive_sculpt.html
  165. +163 −145 package-lock.json
  166. +7 −5 package.json
  167. +1 −1 rollup.config.js
  168. +22 −0 src/Three.Legacy.js
  169. +168 −153 src/Three.d.ts
  170. +1 −0 src/Three.js
  171. +1 −1 src/audio/PositionalAudio.js
  172. +12 −12 src/cameras/CubeCamera.js
  173. +6 −6 src/cameras/PerspectiveCamera.js
  174. +1 −1 src/constants.js
  175. +57 −7 src/core/BufferGeometry.js
  176. +1 −1 src/core/Object3D.d.ts
  177. +10 −10 src/extras/curves/Curves.d.ts
  178. +22 −43 src/geometries/Geometries.d.ts
  179. +9 −0 src/geometries/TubeGeometry.js
  180. +14 −0 src/helpers/PositionalAudioHelper.d.ts
  181. +108 −0 src/helpers/PositionalAudioHelper.js
  182. +30 −1 src/loaders/BufferGeometryLoader.js
  183. +2 −0 src/loaders/ImageBitmapLoader.js
  184. +1 −1 src/loaders/LoadingManager.d.ts
  185. +15 −0 src/loaders/ObjectLoader.js
  186. +6 −0 src/materials/Material.d.ts
  187. +1 −0 src/materials/Material.js
  188. +18 −18 src/materials/Materials.d.ts
  189. +8 −5 src/materials/ShaderMaterial.js
  190. +1 −1 src/objects/Line.d.ts
  191. +3 −0 src/objects/LineLoop.d.ts
  192. +3 −0 src/objects/LineSegments.d.ts
  193. +1 −1 src/polyfills.d.ts
  194. +0 −2 src/renderers/WebGLRenderTargetCube.d.ts
  195. +0 −3 src/renderers/WebGLRenderTargetCube.js
  196. +36 −16 src/renderers/WebGLRenderer.d.ts
  197. +98 −28 src/renderers/WebGLRenderer.js
  198. +6 −0 src/renderers/shaders/ShaderChunk/beginnormal_vertex.glsl.js
  199. +5 −0 src/renderers/shaders/ShaderChunk/default_fragment.glsl.js
  200. +5 −0 src/renderers/shaders/ShaderChunk/default_vertex.glsl.js
  201. +12 −0 src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl.js
  202. +1 −1 src/renderers/shaders/ShaderChunk/dithering_fragment.glsl.js
  203. +1 −1 src/renderers/shaders/ShaderChunk/encodings_fragment.glsl.js
  204. +14 −0 src/renderers/shaders/ShaderChunk/normal_fragment_begin.glsl.js
  205. +12 −1 src/renderers/shaders/ShaderChunk/normal_fragment_maps.glsl.js
  206. +6 −0 src/renderers/shaders/ShaderChunk/skinnormal_vertex.glsl.js
  207. +1 −1 src/renderers/shaders/ShaderChunk/tonemapping_fragment.glsl.js
  208. +7 −0 src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js
  209. +14 −0 src/renderers/shaders/ShaderLib/meshphysical_vert.glsl.js
  210. +7 −0 src/renderers/shaders/ShaderLib/normal_frag.glsl.js
  211. +14 −0 src/renderers/shaders/ShaderLib/normal_vert.glsl.js
  212. +10 −0 src/renderers/webgl/WebGLProgram.js
  213. +2 −1 src/renderers/webgl/WebGLPrograms.js
  214. +1 −1 src/renderers/webgl/WebGLRenderLists.js
  215. +4 −0 src/renderers/webgl/WebGLShadowMap.js
  216. +50 −53 src/renderers/webgl/WebGLTextures.js
  217. +6 −5 src/renderers/webvr/WebVRManager.js
  218. +1 −0 src/renderers/webvr/WebXRManager.js
  219. +18 −14 src/scenes/Fog.js
  220. +17 −13 src/scenes/FogExp2.js
  221. +2 −1 src/textures/CubeTexture.js
  222. +3 −1 src/textures/DataTexture3D.js
  223. +19 −2 test/unit/src/core/BufferGeometry.tests.js
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
##### Three.js version

- [ ] Dev
- [ ] r101
- [ ] r102
- [ ] ...

##### Browser
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
examples/*
!examples/js/
src/
test/
utils/
docs/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ three.js

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

The aim of the project is to create an easy to use, lightweight, 3D library. The library provides Canvas 2D, SVG, CSS3D and WebGL renderers.
The aim of the project is to create an easy to use, lightweight, 3D library with a default WebGL renderer. The library also provides Canvas 2D, SVG and CSS3D renderers in the examples.

[Examples](http://threejs.org/examples/) &mdash;
[Documentation](http://threejs.org/docs/) &mdash;
Loading