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: aa6ed41b18c20e37412e3ec3d128075920e07607
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: 93e72ba7b24958ddb0652bd33171edd14ed2d693
Choose a head ref
27 contributors

Commits on Sep 25, 2018

  1. Allowing to subtract bevel instead of adding it.

    Felix Fontein committed Sep 25, 2018
    Copy the full SHA
    df448bb View commit details

  2. Adding bevelSubtract to documentation and Geometry Browser.

    Felix Fontein committed Sep 25, 2018
    Copy the full SHA
    8a7610d View commit details

Commits on Sep 26, 2018

  1. Change so that a negative bevelSize indicates subtraction.

    Felix Fontein committed Sep 26, 2018
    Copy the full SHA
    291c61e View commit details

Commits on Nov 2, 2018

  1. Remove local variable bevelSubtract.

    Felix Fontein committed Nov 2, 2018
    Copy the full SHA
    08174e3 View commit details

Commits on Nov 5, 2018

  1. Fix sign error.

    Felix Fontein committed Nov 5, 2018
    Copy the full SHA
    802ac6c View commit details

Commits on Nov 6, 2018

  1. Adjust logic as suggested by WestLangley.

    Felix Fontein committed Nov 6, 2018
    Copy the full SHA
    779784c View commit details

Commits on Nov 28, 2018

  1. Normalization is needed after quaternion multiply

    @panxinmiao
    panxinmiao authored Nov 28, 2018
    Copy the full SHA
    aaf597f View commit details

Commits on Dec 22, 2018

  1. Copy color to uniforms value

    @takahirox
    takahirox committed Dec 22, 2018
    Copy the full SHA
    2f35088 View commit details

Commits on Feb 21, 2019

  1. Merge pull request #2 from mrdoob/dev 

    Update fork
    @Temdog007
    Temdog007 authored Feb 21, 2019
    Copy the full SHA
    27403a0 View commit details

Commits on Feb 22, 2019

  1. Clarify Loop end condition in BufferGeometry.merge()

    @takahirox
    takahirox committed Feb 22, 2019
    Copy the full SHA
    9b4df26 View commit details

Commits on Mar 5, 2019

  1. Merge pull request #3 from mrdoob/dev 

    Update THREE JS fork
    @Temdog007
    Temdog007 authored Mar 5, 2019
    Copy the full SHA
    97f90bb View commit details

Commits on Mar 15, 2019

  1. Merge pull request #4 from mrdoob/dev 

    Update dev branch
    @Temdog007
    Temdog007 authored Mar 15, 2019
    Copy the full SHA
    8e50ec0 View commit details

Commits on Mar 18, 2019

  1. Merge pull request #5 from mrdoob/dev 

    Update
    @Temdog007
    Temdog007 authored Mar 18, 2019
    Copy the full SHA
    79f7721 View commit details

Commits on Mar 26, 2019

  1. Added geometry and material dispose to TransformControls.dispose(). 

    Fixes #15743
    @arodic
    arodic committed Mar 26, 2019
    Copy the full SHA
    0f39a18 View commit details

Commits on Mar 27, 2019

  1. Merge pull request #16065 from arodic/patch/TransformControls-memory-… 

    …leak

TransformControls: Added geometry and material dispose to dispose().
    @mrdoob
    mrdoob authored Mar 27, 2019
    Copy the full SHA
    975b91f View commit details

  2. TransformControls: Clean up.

    @mrdoob
    mrdoob committed Mar 27, 2019
    Copy the full SHA
    7a7d6e2 View commit details

Commits on Mar 28, 2019

  1. WebGLRenderLists.d.ts: WebGLRenderLists.push forgot groupOrder

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    27aafe7 View commit details

  2. tab -> space

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    6a965ba View commit details

  3. WebGLRenderLists.d.ts: fix type of WebGLRenderLists.transparent

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    e6ddcfb View commit details

  4. WebGLRenderLists.d.ts: add WebGLRenderLists.unshift definition

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    675bf47 View commit details

  5. WebGLRenderer.d.ts: getDrawingBufferSize now receives Vector2 and ret… 

    …urns Vector2
    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    db31187 View commit details

  6. WebGLRenderer: Fix type definition for RenderTarget related methods

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    0e55788 View commit details

  7. WebGLRenderer.d.ts: add a comment

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    3e84744 View commit details

  8. WebGLRenderer.d.ts: add docs comment to setRenderTarget method

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    26b8e5b View commit details

  9. Merge pull request #16085 from FMS-Cat/webglrenderer-d-ts 

    WebGLRenderer.d.ts: getDrawingBufferSize now receives Vector2 and returns Vector2
    @mrdoob
    mrdoob authored Mar 28, 2019
    Copy the full SHA
    84de454 View commit details

  10. WebGLRenderer: update docs

    FMS-Cat committed Mar 28, 2019
    Copy the full SHA
    67e2fe9 View commit details

  11. Fixed a bug with loading cube textures 

    Moved code accounting for moving past the data field for the size of the texture outside of the loop loading them.
    @John-DeCorato-HZ
    John-DeCorato-HZ authored Mar 28, 2019
    Copy the full SHA
    de66987 View commit details

  12. SVGLoader: Fix bug with transforms of next neighbours nodes

    @yomboprime
    yomboprime committed Mar 28, 2019
    Copy the full SHA
    bf8d8f6 View commit details

Commits on Mar 29, 2019

  1. add missing typescript declaration of Vector2.cross

    @yaoyao-cn
    yaoyao-cn committed Mar 29, 2019
    Copy the full SHA
    d582d1a View commit details

  2. WebGLRenderer.d.ts: Apply Mugen87-san's suggestion

    Yutaka Obuchi authored Mar 29, 2019
    Copy the full SHA
    5607592 View commit details

  3. Merge pull request #16092 from yaoyao-cn/tem 

    add missing typescript declaration of Vector2.cross
    @mrdoob
    mrdoob authored Mar 29, 2019
    Copy the full SHA
    0d18a75 View commit details

  4. WebGLRenderLists: geometry only accepts BufferGeometry

    FMS-Cat committed Mar 29, 2019
    Copy the full SHA
    f9ce226 View commit details

  5. Remove a wrong comment

    FMS-Cat committed Mar 29, 2019
    Copy the full SHA
    849ae47 View commit details

  6. WebGLRenderLists.d.ts: geometry and group are nullable

    FMS-Cat committed Mar 29, 2019
    Copy the full SHA
    464661d View commit details

  7. Example gpgpu_water: Fix tennis balls

    @yomboprime
    yomboprime committed Mar 29, 2019
    Copy the full SHA
    efe1c5b View commit details

  8. Improve code style

    @yomboprime
    yomboprime committed Mar 29, 2019
    Copy the full SHA
    760da59 View commit details

  9. Merge pull request #16098 from yomboprime/water_tennis 

    Example gpgpu_water: Fix tennis balls
    @mrdoob
    mrdoob authored Mar 29, 2019
    Copy the full SHA
    d874602 View commit details

  10. Update Ammo.js to current version

    @yomboprime
    yomboprime committed Mar 29, 2019
    Copy the full SHA
    089ae05 View commit details

  11. Merge pull request #16100 from yomboprime/update_ammo 

    Update Ammo.js to current version
    @mrdoob
    mrdoob authored Mar 29, 2019
    Copy the full SHA
    b2a8cd4 View commit details

  12. Merge pull request #16086 from FMS-Cat/webglrenderer-setrendertarget 

    WebGLRenderer: Update docs and type definitions related to RenderTarget
    @mrdoob
    mrdoob authored Mar 29, 2019
    Copy the full SHA
    d6f7ae7 View commit details

  13. Merge pull request #16083 from FMS-Cat/webglrenderlists-d-ts 

    Improve WebGLRenderLists.d.ts
    @mrdoob
    mrdoob authored Mar 29, 2019
    Copy the full SHA
    072cf7b View commit details

Commits on Mar 30, 2019

  1. WebXR: Remove deprecated origin trial token from examples.

    @Mugen87
    Mugen87 committed Mar 30, 2019
    Copy the full SHA
    c870286 View commit details

  2. Clean up webgl_animation_multiple example

    @takahirox
    takahirox committed Mar 30, 2019
    Copy the full SHA
    9cd1578 View commit details

  3. fix to LWOLoader.js : add suport LWO2 format

    @adrs2002
    adrs2002 committed Mar 30, 2019
    Copy the full SHA
    325c9f4 View commit details

Commits on Mar 31, 2019

  1. Remove outdated type definitions in uniforms

    @WestLangley
    WestLangley committed Mar 31, 2019
    Copy the full SHA
    8511533 View commit details

  2. Merge pull request #16111 from WestLangley/dev-uniforms 

    Remove outdated type definitions in uniforms
    @mrdoob
    mrdoob authored Mar 31, 2019
    Copy the full SHA
    3f04a5e View commit details

  3. Merge pull request #16107 from adrs2002/fix/lwoLoader_fix_lwo2 

    fix to LWOLoader.js : add suport LWO2 format
    @mrdoob
    mrdoob authored Mar 31, 2019
    Copy the full SHA
    3b7032b View commit details

  4. Merge pull request #16106 from takahirox/CleanupAnimationMultiple 

    Clean up webgl_animation_multiple example
    @mrdoob
    mrdoob authored Mar 31, 2019
    Copy the full SHA
    3a5653e View commit details

  5. Merge pull request #16104 from Mugen87/dev2 

    WebXR: Remove deprecated origin trial token.
    @mrdoob
    mrdoob authored Mar 31, 2019
    Copy the full SHA
    2a0d95d View commit details

  6. r104dev

    @mrdoob
    mrdoob committed Mar 31, 2019
    Copy the full SHA
    6ae5bfc View commit details
Showing with 8,449 additions and 2,880 deletions.
  1. +1 −1 .github/ISSUE_TEMPLATE.md
  2. +665 −110 build/three.js
  3. +861 −851 build/three.min.js
  4. +661 −111 build/three.module.js
  5. +1 −1 docs/api/en/core/Object3D.html
  6. +2 −0 docs/api/en/geometries/ExtrudeBufferGeometry.html
  7. +2 −0 docs/api/en/geometries/ExtrudeGeometry.html
  8. +2 −0 docs/api/en/geometries/TextBufferGeometry.html
  9. +2 −0 docs/api/en/geometries/TextGeometry.html
  10. +131 −0 docs/api/en/materials/MeshDistanceMaterial.html
  11. +150 −0 docs/api/en/materials/MeshMatcapMaterial.html
  12. +61 −1 docs/api/en/materials/MeshNormalMaterial.html
  13. +2 −2 docs/api/en/materials/MeshToonMaterial.html
  14. +1 −1 docs/api/en/objects/LOD.html
  15. +12 −3 docs/api/en/renderers/WebGLRenderer.html
  16. +8 −3 docs/api/en/textures/Texture.html
  17. +1 −1 docs/api/zh/core/Object3D.html
  18. +112 −0 docs/api/zh/materials/MeshDistanceMaterial.html
  19. +120 −0 docs/api/zh/materials/MeshMatcapMaterial.html
  20. +42 −1 docs/api/zh/materials/MeshNormalMaterial.html
  21. +2 −2 docs/api/zh/materials/MeshToonMaterial.html
  22. +1 −1 docs/api/zh/objects/LOD.html
  23. +9 −0 docs/api/zh/renderers/WebGLRenderer.html
  24. +4 −0 docs/api/zh/textures/Texture.html
  25. +78 −62 docs/examples/quickhull/QuickHull.html
  26. +1 −0 docs/index.html
  27. +4 −0 docs/list.js
  28. +8 −1 docs/manual/en/introduction/How-to-dispose-of-objects.html
  29. +65 −4 docs/manual/en/introduction/Import-via-modules.html
  30. +14 −4 docs/scenes/js/geometry.js
  31. +171 −49 docs/scenes/js/material.js
  32. +4 −2 editor/index.html
  33. +7 −1 editor/js/Editor.js
  34. +2 −2 editor/js/History.js
  35. +63 −0 editor/js/Menubar.Add.js
  36. +62 −0 editor/js/Menubar.Edit.js
  37. +1 −4 editor/js/Menubar.File.js
  38. +22 −19 editor/js/Script.js
  39. +54 −0 editor/js/Sidebar.Geometry.OctahedronGeometry.js
  40. +95 −0 editor/js/Sidebar.Geometry.RingGeometry.js
  41. +55 −0 editor/js/Sidebar.Geometry.TetrahedronGeometry.js
  42. +2 −0 editor/js/Sidebar.Geometry.js
  43. +161 −6 editor/js/Sidebar.Material.js
  44. +112 −6 editor/js/Sidebar.Object.js
  45. +3 −3 editor/js/Sidebar.Settings.js
  46. +48 −0 editor/js/Strings.js
  47. +12 −3 editor/js/Viewport.js
  48. +1 −1 editor/js/libs/codemirror/mode/glsl.js
  49. +38 −38 editor/js/libs/three.html.js
  50. +20 −3 editor/js/libs/ui.three.js
  51. +5 −3 examples/files.js
  52. +1 −0 examples/index.html
  53. +102 −0 examples/js/QuickHull.js
  54. +25 −22 examples/js/animation/MMDPhysics.js
  55. +11 −21 examples/js/controls/PointerLockControls.js
  56. +8 −0 examples/js/controls/TransformControls.js
  57. +47 −5 examples/js/effects/OutlineEffect.js
  58. +32 −10 examples/js/exporters/GLTFExporter.js
  59. +643 −20 examples/js/libs/ammo.js
  60. +121 −0 examples/js/lights/LightProbeGenerator.js
  61. +37 −32 examples/js/loaders/GLTFLoader.js
  62. +5 −3 examples/js/loaders/KTXLoader.js
  63. +201 −75 examples/js/loaders/LDrawLoader.js
  64. +167 −25 examples/js/loaders/LWOLoader.js
  65. +3 −0 examples/js/loaders/MMDLoader.js
  66. +18 −5 examples/js/loaders/SVGLoader.js
  67. +21 −5 examples/js/loaders/VRMLLoader.js
  68. +59 −355 examples/js/math/Lut.js
  69. +12 −3 examples/js/nodes/accessors/NormalNode.js
  70. +20 −4 examples/js/nodes/accessors/PositionNode.js
  71. +7 −4 examples/js/nodes/accessors/ResolutionNode.js
  72. +2 −1 examples/js/renderers/CSS2DRenderer.js
  73. +8 −8 examples/js/shaders/DepthLimitedBlurShader.js
  74. +5 −5 examples/js/shaders/LuminosityHighPassShader.js
  75. +17 −17 examples/js/shaders/SAOShader.js
  76. +56 −45 examples/jsm/controls/OrbitControls.d.ts
  77. +7 −0 examples/jsm/exporters/ColladaExporter.d.ts
  78. +9 −5 examples/jsm/exporters/ColladaExporter.js
  79. +3 −3 examples/jsm/exporters/GLTFExporter.d.ts
  80. +32 −10 examples/jsm/exporters/GLTFExporter.js
  81. +7 −0 examples/jsm/exporters/MMDExporter.d.ts
  82. +7 −0 examples/jsm/exporters/OBJExporter.d.ts
  83. +7 −0 examples/jsm/exporters/PLYExporter.d.ts
  84. +7 −0 examples/jsm/exporters/STLExporter.d.ts
  85. +7 −0 examples/jsm/exporters/TypedGeometryExporter.d.ts
  86. +37 −32 examples/jsm/loaders/GLTFLoader.js
  87. +357 −0 examples/jsm/loaders/STLLoader.js
  88. +1 −6 examples/jsm/pmrem/PMREMCubeUVPacker.d.ts
  89. +5 −0 examples/jsm/utils/MathUtils.d.ts
  90. +8 −0 examples/jsm/utils/ShadowMapViewer.d.ts
  91. +32 −0 examples/jsm/utils/SkeletonUtils.d.ts
  92. +58 −0 examples/jsm/utils/TypedArrayUtils.d.ts
  93. +3 −0 examples/jsm/utils/UVsDebug.d.ts
  94. +1 −2 examples/misc_controls_pointerlock.html
  95. +3 −3 examples/misc_controls_transform.html
  96. +2 −2 examples/models/json/pressure.json
  97. BIN examples/models/sea3d/morph.sea
  98. BIN examples/models/sea3d/morph.tjs.sea
  99. BIN examples/textures/alphaMap.jpg
  100. BIN examples/textures/equirectangular/pedestrian_overpass_2k.hdr
  101. BIN examples/textures/equirectangular/venice_sunset_2k.hdr
  102. BIN examples/textures/gradientMaps/fiveTone.jpg
  103. BIN examples/textures/gradientMaps/threeTone.jpg
  104. +4 −1 examples/webgl2_loader_gltf.html
  105. +405 −319 examples/webgl_animation_multiple.html
  106. +1 −0 examples/webgl_buffergeometry_morphtargets.html
  107. +0 −2 examples/webgl_custom_attributes_points.html
  108. +0 −1 examples/webgl_custom_attributes_points2.html
  109. +79 −185 examples/webgl_geometry_colors_lookuptable.html
  110. +4 −1 examples/webgl_gpgpu_water.html
  111. +199 −0 examples/webgl_lightprobe.html
  112. +16 −5 examples/webgl_loader_gltf.html
  113. +16 −4 examples/webgl_loader_gltf_extensions.html
  114. +10 −2 examples/webgl_loader_ldraw.html
  115. +1 −1 examples/webgl_loader_lwo.html
  116. +9 −2 examples/webgl_loader_mmd.html
  117. +8 −2 examples/webgl_loader_mmd_audio.html
  118. +8 −2 examples/webgl_loader_mmd_pose.html
  119. +40 −34 examples/webgl_loader_sea3d_physics.html
  120. +4 −3 examples/webgl_materials_envmaps_parallax.html
  121. +4 −4 examples/webgl_materials_lightmap.html
  122. +3 −0 examples/webgl_materials_matcap.html
  123. +5 −3 examples/webgl_materials_nodes.html
  124. +11 −3 examples/webgl_physics_cloth.html
  125. +12 −4 examples/webgl_physics_convex_break.html
  126. +11 −3 examples/webgl_physics_rope.html
  127. +11 −3 examples/webgl_physics_terrain.html
  128. +13 −4 examples/webgl_physics_volume.html
  129. +370 −0 examples/webgl_postprocessing_unreal_bloom_selective.html
  130. +4 −24 examples/webgl_trails.html
  131. +0 −2 examples/webvr_ballshooter.html
  132. +0 −2 examples/webvr_cubes.html
  133. +0 −2 examples/webvr_dragging.html
  134. +0 −2 examples/webvr_lorenzattractor.html
  135. +0 −2 examples/webvr_paint.html
  136. +0 −2 examples/webvr_panorama.html
  137. +0 −2 examples/webvr_rollercoaster.html
  138. +0 −2 examples/webvr_sandbox.html
  139. +0 −2 examples/webvr_sculpt.html
  140. +0 −2 examples/webvr_video.html
  141. +0 −2 examples/webvr_vive_paint.html
  142. +0 −2 examples/webvr_vive_sculpt.html
  143. BIN favicon.ico
  144. +6 −6 package.json
  145. +5 −0 src/Three.js
  146. +1 −0 src/animation/AnimationAction.d.ts
  147. +1 −1 src/animation/PropertyBinding.js
  148. +2 −2 src/cameras/CubeCamera.js
  149. +5 −0 src/constants.d.ts
  150. +1 −1 src/constants.js
  151. +0 −3 src/core/BufferGeometry.d.ts
  152. +4 −3 src/core/BufferGeometry.js
  153. +3 −1 src/core/Object3D.js
  154. +7 −4 src/geometries/ExtrudeGeometry.js
  155. +2 −1 src/geometries/TextGeometry.js
  156. +155 −0 src/helpers/LightProbeHelper.js
  157. +45 −0 src/lights/AmbientLightProbe.js
  158. +54 −0 src/lights/HemisphereLightProbe.js
  159. +1 −0 src/lights/Light.d.ts
  160. +47 −0 src/lights/LightProbe.js
  161. +1 −0 src/loaders/MaterialLoader.js
  162. +1 −0 src/materials/Material.js
  163. +3 −3 src/materials/Materials.d.ts
  164. +15 −7 src/materials/MeshDepthMaterial.d.ts
  165. +25 −0 src/materials/MeshDistanceMaterial.d.ts
  166. +46 −0 src/materials/MeshMatcapMaterial.d.ts
  167. +32 −10 src/materials/MeshNormalMaterial.d.ts
  168. +3 −1 src/materials/MeshPhongMaterial.d.ts
  169. +3 −0 src/materials/MeshStandardMaterial.d.ts
  170. +14 −0 src/materials/MeshToonMaterial.d.ts
  171. +1 −1 src/materials/ShaderMaterial.d.ts
  172. +21 −21 src/math/Matrix4.js
  173. +240 −0 src/math/SphericalHarmonics3.js
  174. +5 −0 src/math/Vector2.d.ts
  175. +5 −12 src/math/Vector2.js
  176. +6 −12 src/math/Vector3.js
  177. +1 −1 src/objects/LOD.d.ts
  178. +4 −0 src/objects/LOD.js
  179. +37 −5 src/renderers/WebGLRenderer.d.ts
  180. +20 −15 src/renderers/WebGLRenderer.js
  181. +2 −0 src/renderers/shaders/ShaderChunk/lights_fragment_begin.glsl.js
  182. +38 −0 src/renderers/shaders/ShaderChunk/lights_pars_begin.glsl.js
  183. +2 −0 src/renderers/shaders/UniformsLib.js
  184. +13 −0 src/renderers/webgl/WebGLLights.js
  185. +36 −31 src/renderers/webgl/WebGLProgram.js
  186. +14 −11 src/renderers/webgl/WebGLRenderLists.d.ts
  187. +1 −1 src/renderers/webgl/WebGLShader.d.ts
  188. +10 −6 src/renderers/webgl/WebGLShader.js
  189. +77 −54 src/renderers/webgl/WebGLState.d.ts
  190. +2 −2 src/renderers/webvr/WebVRManager.js
  191. +1 −1 src/textures/Texture.js
  192. +1 −0 utils/modularize.js
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
View file
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
- [ ] r103
- [ ] r104
- [ ] ...

##### Browser
Loading