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: eaa4f9dc511d3091443069db0f9c74093e29f943
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: aa6ed41b18c20e37412e3ec3d128075920e07607
Choose a head ref

Commits on Jul 14, 2018

  1. Copy the full SHA
    0b1c3a0 View commit details

Commits on Jul 25, 2018

  1. Copy the full SHA
    304cd6e View commit details

Commits on Jul 31, 2018

  1. Fix closing </em>

    robertlong committed Jul 31, 2018
    Copy the full SHA
    0cce1fe View commit details

Commits on Jan 15, 2019

  1. Copy the full SHA
    d175dab View commit details

Commits on Jan 17, 2019

  1. Add newline at end of file

    gkjohnson committed Jan 17, 2019
    Copy the full SHA
    c57b480 View commit details

Commits on Jan 31, 2019

  1. fix needsUpdate

    sunag committed Jan 31, 2019
    Copy the full SHA
    07236bb View commit details

Commits on Feb 1, 2019

  1. Copy the full SHA
    79a56e6 View commit details

Commits on Feb 20, 2019

  1. AnimationUtils: Add clone() helper for skinned meshes.

    AnimationUtils: Clean up lint errors.
    
    AnimationUtils: Ensure .clone() does not depend on node names.
    
    GLTFLoader: Revert automatic node naming.
    Don McCurdy authored and donmccurdy committed Feb 20, 2019
    Copy the full SHA
    b5a16a5 View commit details
  2. Copy the full SHA
    427863f View commit details
  3. Copy the full SHA
    3104911 View commit details

Commits on Mar 2, 2019

  1. Copy the full SHA
    415b337 View commit details
  2. Copy the full SHA
    1f6e937 View commit details
  3. Copy the full SHA
    bedee74 View commit details
  4. Copy the full SHA
    c191fc7 View commit details
  5. Copy the full SHA
    bdbea51 View commit details
  6. r103dev (bis)

    mrdoob committed Mar 2, 2019
    Copy the full SHA
    ad9da5d View commit details
  7. Merge pull request #15881 from Mugen87/dev26

    GLTFLoader: Fix runtime error when accessing the cache.
    mrdoob authored Mar 2, 2019
    Copy the full SHA
    b0492b7 View commit details
  8. Copy the full SHA
    564fa60 View commit details
  9. Copy the full SHA
    809e8ef View commit details
  10. Merge pull request #15888 from donmccurdy/cleanup-rome-model-examples

    Examples: Use linear workflow for examples with ROME models.
    mrdoob authored Mar 2, 2019
    Copy the full SHA
    91b895f View commit details
  11. Merge pull request #15889 from donmccurdy/cleanup-gltfloader-remove-m…

    …ultipass
    
    GLTFLoader: Remove multipass and primitive merging logic
    mrdoob authored Mar 2, 2019
    Copy the full SHA
    b9f2f2e View commit details
  12. Copy the full SHA
    702fdf7 View commit details
  13. Merge pull request #15886 from Itee/buffergeometryutil-fix

    BufferGeometryUtil: Replace for-of loop by a for loop
    mrdoob authored Mar 2, 2019
    Copy the full SHA
    c71cdb3 View commit details
  14. Copy the full SHA
    fffe49d View commit details
  15. GLTFLoader: Clean up.

    donmccurdy committed Mar 2, 2019
    Copy the full SHA
    28b6b21 View commit details

Commits on Mar 3, 2019

  1. Copy the full SHA
    6a03a33 View commit details
  2. Copy the full SHA
    aca4142 View commit details
  3. Copy the full SHA
    ec1d5a7 View commit details
  4. Copy the full SHA
    8fdbc31 View commit details
  5. Copy the full SHA
    e6ab398 View commit details

Commits on Mar 4, 2019

  1. Merge pull request #15895 from Mugen87/dev26

    Dev: Update google-closure-compiler
    mrdoob authored Mar 4, 2019
    Copy the full SHA
    a9e6a12 View commit details
  2. Copy the full SHA
    0c407a8 View commit details
  3. Copy the full SHA
    fc612d0 View commit details
  4. Copy the full SHA
    57d8351 View commit details
  5. Copy the full SHA
    2604380 View commit details
  6. Add DataTexture2DArray

    takahirox committed Mar 4, 2019
    Copy the full SHA
    2752ab4 View commit details
  7. Copy the full SHA
    5ab8129 View commit details
  8. Clean up DataTexture3D

    takahirox committed Mar 4, 2019
    Copy the full SHA
    f89e8db View commit details
  9. Copy the full SHA
    b2e7559 View commit details
  10. Format code

    merwaaan committed Mar 4, 2019
    Copy the full SHA
    3c5a5eb View commit details
  11. Merge pull request #15902 from takahirox/CleanUp3DTexture

    Minor DataTexture3D Clean up
    mrdoob authored Mar 4, 2019
    Copy the full SHA
    4e1c1a0 View commit details

Commits on Mar 5, 2019

  1. Merge pull request #15900 from Mugen87/dev27

    WebGLTextures: Make resizeImage() more robust.
    mrdoob authored Mar 5, 2019
    Copy the full SHA
    a2e1493 View commit details
  2. Updated builds.

    mrdoob committed Mar 5, 2019
    Copy the full SHA
    d98e990 View commit details
  3. Merge pull request #15884 from Itee/strucnode-fix

    StrucNode: Add missing this keyword
    mrdoob authored Mar 5, 2019
    Copy the full SHA
    c867016 View commit details
  4. Merge pull request #15893 from donmccurdy/bug-gltfloader-interp-warning

    GLTFLoader: Fix warning on cubicspline interpolation.
    mrdoob authored Mar 5, 2019
    Copy the full SHA
    0223ca6 View commit details
  5. Merge pull request #15878 from sneha-belkhale/dev

    GLTFLoader: Custom geometry attributes
    mrdoob authored Mar 5, 2019
    Copy the full SHA
    8fc598a View commit details
  6. Copy the full SHA
    9957632 View commit details
  7. Merge pull request #15891 from donmccurdy/cleanup-gltfloader-multidep…

    …endencies
    
    GLTFLoader: Clean up, remove getMultiDependencies()
    mrdoob authored Mar 5, 2019
    Copy the full SHA
    6cf473f View commit details
  8. Merge pull request #15894 from mvilledieu/WebGLBackground--Hide-backg…

    …round-on-additive-XR-devices
    
    WebGLBackground: Hide scene background when XR Session environmentBlendMode is additive
    mrdoob authored Mar 5, 2019
    Copy the full SHA
    9b72e6c View commit details
  9. Merge pull request #15674 from sunag/dev-fixes

    NodeMaterial fix needsUpdate
    mrdoob authored Mar 5, 2019
    Copy the full SHA
    1ec8793 View commit details
Showing with 24,671 additions and 10,612 deletions.
  1. +15 −0 .editorconfig
  2. +1 −1 .github/ISSUE_TEMPLATE.md
  3. +3,306 −3,167 build/three.js
  4. +723 −719 build/three.min.js
  5. +3,306 −3,168 build/three.module.js
  6. +2 −0 docs/api/en/core/Object3D.html
  7. +4 −5 docs/api/en/loaders/AnimationLoader.html
  8. +10 −0 docs/api/en/loaders/ImageBitmapLoader.html
  9. +1 −1 docs/api/en/loaders/ImageLoader.html
  10. +24 −0 docs/api/en/loaders/Loader.html
  11. +1 −1 docs/api/en/materials/Material.html
  12. +1 −1 docs/api/en/math/Matrix3.html
  13. +1 −1 docs/api/en/math/Matrix4.html
  14. +7 −0 docs/api/en/math/Quaternion.html
  15. +1 −1 docs/api/en/objects/Mesh.html
  16. +0 −27 docs/api/en/renderers/WebGLRenderer.html
  17. +7 −0 docs/api/en/textures/Texture.html
  18. +4 −7 docs/api/zh/loaders/AnimationLoader.html
  19. +10 −0 docs/api/zh/loaders/ImageBitmapLoader.html
  20. +20 −0 docs/api/zh/loaders/Loader.html
  21. +1 −1 docs/api/zh/materials/Material.html
  22. +3 −3 docs/api/zh/math/Matrix3.html
  23. +5 −5 docs/api/zh/math/Matrix4.html
  24. +8 −1 docs/api/zh/math/Quaternion.html
  25. +1 −1 docs/api/zh/objects/Mesh.html
  26. +0 −23 docs/api/zh/renderers/WebGLRenderer.html
  27. +8 −0 docs/api/zh/textures/Texture.html
  28. +1 −0 docs/examples/exporters/GLTFExporter.html
  29. +145 −0 docs/examples/loaders/DRACOLoader.html
  30. +3 −0 docs/examples/loaders/GLTFLoader.html
  31. +1 −1 docs/examples/loaders/OBJLoader2.html
  32. +2 −1 docs/examples/loaders/SVGLoader.html
  33. +2 −3 docs/examples/objects/Lensflare.html
  34. +60 −0 docs/examples/utils/SkeletonUtils.html
  35. +3 −1 docs/list.js
  36. +48 −0 editor/css/dark.css
  37. +48 −0 editor/css/light.css
  38. BIN editor/images/icon.png
  39. BIN editor/images/icon.xcf
  40. +24 −16 editor/index.html
  41. +47 −6 editor/js/Editor.js
  42. +1 −1 editor/js/Loader.js
  43. +1 −1 editor/js/Menubar.Add.js
  44. +1 −1 editor/js/Sidebar.Settings.js
  45. +48 −0 editor/js/Viewport.Camera.js
  46. +30 −11 editor/js/Viewport.js
  47. +51 −58 editor/js/libs/ui.js
  48. +0 −55 editor/main.js
  49. +13 −0 editor/manifest.json
  50. +197 −0 editor/sw.js
  51. +50 −39 examples/files.js
  52. +4 −2 examples/js/MD2Character.js
  53. +4 −2 examples/js/MD2CharacterComplex.js
  54. +73 −0 examples/js/MarchingCubes.js
  55. +14 −14 examples/js/controls/EditorControls.js
  56. +13 −7 examples/js/controls/TransformControls.js
  57. +206 −0 examples/js/exporters/DracoExporter.js
  58. +62 −29 examples/js/exporters/GLTFExporter.js
  59. +33 −0 examples/js/libs/draco/draco_encoder.js
  60. +2 −2 examples/js/loaders/GCodeLoader.js
  61. +183 −403 examples/js/loaders/GLTFLoader.js
  62. +2,310 −0 examples/js/loaders/LWOLoader.js
  63. +883 −27 examples/js/loaders/SVGLoader.js
  64. +1 −4 examples/js/loaders/ctm/CTMLoader.js
  65. +1 −2 examples/js/loaders/sea3d/SEA3D.js
  66. +1 −1 examples/js/nodes/core/StructNode.js
  67. +26 −0 examples/js/nodes/materials/NodeMaterial.js
  68. +1 −1 examples/js/objects/Fire.js
  69. +32 −34 examples/js/objects/LightningStorm.js
  70. +1 −2 examples/js/objects/Sky.js
  71. +1 −0 examples/js/offscreen/scene.js
  72. +11 −16 examples/js/postprocessing/AdaptiveToneMappingPass.js
  73. +20 −23 examples/js/postprocessing/AfterimagePass.js
  74. +6 −11 examples/js/postprocessing/BloomPass.js
  75. +3 −10 examples/js/postprocessing/BokehPass.js
  76. +3 −10 examples/js/postprocessing/DotScreenPass.js
  77. +62 −1 examples/js/postprocessing/EffectComposer.js
  78. +3 −10 examples/js/postprocessing/FilmPass.js
  79. +3 −9 examples/js/postprocessing/GlitchPass.js
  80. +3 −8 examples/js/postprocessing/HalftonePass.js
  81. +15 −20 examples/js/postprocessing/OutlinePass.js
  82. +3 −6 examples/js/postprocessing/SAOPass.js
  83. +8 −13 examples/js/postprocessing/SMAAPass.js
  84. +2 −6 examples/js/postprocessing/SSAARenderPass.js
  85. +3 −10 examples/js/postprocessing/SSAOPass.js
  86. +2 −9 examples/js/postprocessing/SavePass.js
  87. +4 −10 examples/js/postprocessing/ShaderPass.js
  88. +3 −3 examples/js/postprocessing/TAARenderPass.js
  89. +3 −8 examples/js/postprocessing/TexturePass.js
  90. +13 −18 examples/js/postprocessing/UnrealBloomPass.js
  91. +2 −1 examples/js/renderers/CSS2DRenderer.js
  92. +3 −3 examples/js/renderers/Projector.js
  93. +4 −37 examples/js/renderers/WebGLDeferredRenderer.js
  94. +2 −1 examples/js/utils/BufferGeometryUtils.js
  95. +52 −0 examples/js/utils/SkeletonUtils.js
  96. 0 examples/js/{ → utils}/TypedArrayUtils.js
  97. +2 −2 examples/js/utils/UVsDebug.js
  98. +71 −0 examples/jsm/controls/MapControls.d.ts
  99. +8 −8 examples/jsm/controls/MapControls.js
  100. +70 −0 examples/jsm/controls/OrbitControls.d.ts
  101. +31 −12 examples/jsm/controls/OrbitControls.js
  102. +47 −0 examples/jsm/controls/TrackballControls.d.ts
  103. +1 −1 examples/jsm/controls/TrackballControls.js
  104. +635 −0 examples/jsm/exporters/ColladaExporter.js
  105. +7 −0 examples/jsm/exporters/GLTFExporter.d.ts
  106. +2,258 −0 examples/jsm/exporters/GLTFExporter.js
  107. +218 −0 examples/jsm/exporters/MMDExporter.js
  108. +274 −0 examples/jsm/exporters/OBJExporter.js
  109. +557 −0 examples/jsm/exporters/PLYExporter.js
  110. +174 −0 examples/jsm/exporters/STLExporter.js
  111. +59 −0 examples/jsm/exporters/TypedGeometryExporter.js
  112. +27 −0 examples/jsm/loaders/GLTFLoader.d.ts
  113. +224 −446 examples/jsm/loaders/GLTFLoader.js
  114. +104 −0 examples/jsm/loaders/MTLLoader.d.ts
  115. +602 −0 examples/jsm/loaders/MTLLoader.js
  116. +19 −0 examples/jsm/loaders/OBJLoader.d.ts
  117. +14 −0 examples/jsm/pmrem/PMREMCubeUVPacker.d.ts
  118. +253 −0 examples/jsm/pmrem/PMREMCubeUVPacker.js
  119. +16 −0 examples/jsm/pmrem/PMREMGenerator.d.ts
  120. +310 −0 examples/jsm/pmrem/PMREMGenerator.js
  121. +7 −0 examples/jsm/utils/BufferGeometryUtils.d.ts
  122. +657 −0 examples/jsm/utils/BufferGeometryUtils.js
  123. +13 −0 examples/jsm/utils/GeometryUtils.d.ts
  124. +307 −0 examples/jsm/utils/GeometryUtils.js
  125. +67 −0 examples/jsm/utils/MathUtils.js
  126. +7 −0 examples/jsm/utils/SceneUtils.d.ts
  127. +46 −0 examples/jsm/utils/SceneUtils.js
  128. +208 −0 examples/jsm/utils/ShadowMapViewer.js
  129. +600 −0 examples/jsm/utils/SkeletonUtils.js
  130. +604 −0 examples/jsm/utils/TypedArrayUtils.js
  131. +195 −0 examples/jsm/utils/UVsDebug.js
  132. +0 −2 examples/misc_controls_fly.html
  133. +195 −0 examples/misc_exporter_draco.html
  134. +0 −2 examples/misc_lookat.html
  135. +5 −0 examples/models/gltf/Tree/README.md
  136. BIN examples/models/gltf/Tree/tree.glb
  137. BIN examples/models/lwo/Images/BumpMap_Rock.jpg
  138. BIN examples/models/lwo/Images/Env_map_sphere_1.jpg
  139. BIN examples/models/lwo/Images/normal_2.jpg
  140. BIN examples/models/lwo/StandardMaterials.lwo
  141. +428 −0 examples/models/svg/lineJoinsAndCaps.svg
  142. +155 −0 examples/models/svg/threejs.svg
  143. BIN examples/textures/lightShaft.png
  144. +156 −0 examples/webgl2_loader_gltf.html
  145. +212 −0 examples/webgl2_materials_texture2darray.html
  146. +188 −190 examples/webgl2_materials_texture3d.html
  147. +0 −212 examples/webgl2_materials_texture3d_volume.html
  148. +0 −1 examples/webgl2_multisampled_renderbuffers.html
  149. +24 −46 examples/webgl2_sandbox.html
  150. +322 −0 examples/webgl_animation_multiple.html
  151. +14 −13 examples/webgl_clipping_intersection.html
  152. +168 −0 examples/webgl_geometry_text_stroke.html
  153. +6 −6 examples/webgl_gpgpu_birds.html
  154. +1 −13 examples/webgl_lightningstrike.html
  155. +2 −4 examples/webgl_lights_rectarealight.html
  156. +253 −0 examples/webgl_lightshafts.html
  157. +138 −0 examples/webgl_loader_lwo.html
  158. +0 −1 examples/webgl_loader_sea3d.html
  159. +0 −1 examples/webgl_loader_sea3d_bvh.html
  160. +0 −1 examples/webgl_loader_sea3d_bvh_retarget.html
  161. +0 −1 examples/webgl_loader_sea3d_hierarchy.html
  162. +0 −1 examples/webgl_loader_sea3d_keyframe.html
  163. +0 −1 examples/webgl_loader_sea3d_morph.html
  164. +0 −1 examples/webgl_loader_sea3d_physics.html
  165. +0 −1 examples/webgl_loader_sea3d_skinning.html
  166. +0 −1 examples/webgl_loader_sea3d_sound.html
  167. +78 −39 examples/webgl_loader_svg.html
  168. +0 −2 examples/webgl_materials_bumpmap_skin.html
  169. +492 −0 examples/webgl_materials_envmaps_parallax.html
  170. +0 −2 examples/webgl_materials_normalmap.html
  171. +0 −2 examples/webgl_materials_shaders_fresnel.html
  172. +4 −4 examples/webgl_materials_skin.html
  173. +0 −2 examples/webgl_materials_video.html
  174. +28 −4 examples/webgl_morphtargets.html
  175. +4 −0 examples/webgl_morphtargets_horse.html
  176. +1 −1 examples/webgl_nearestneighbour.html
  177. +2 −3 examples/webgl_panorama_equirectangular.html
  178. +0 −2 examples/webgl_points_dynamic.html
  179. +0 −1 examples/webgl_postprocessing.html
  180. +0 −7 examples/webgl_postprocessing_advanced.html
  181. +0 −1 examples/webgl_postprocessing_afterimage.html
  182. +0 −1 examples/webgl_postprocessing_backgrounds.html
  183. +0 −4 examples/webgl_postprocessing_dof.html
  184. +0 −2 examples/webgl_postprocessing_fxaa.html
  185. +0 −1 examples/webgl_postprocessing_glitch.html
  186. +0 −1 examples/webgl_postprocessing_masking.html
  187. +0 −1 examples/webgl_postprocessing_nodes_pass.html
  188. +0 −1 examples/webgl_postprocessing_outline.html
  189. +0 −1 examples/webgl_postprocessing_pixel.html
  190. +0 −1 examples/webgl_postprocessing_rgb_halftone.html
  191. +0 −1 examples/webgl_postprocessing_sao.html
  192. +0 −1 examples/webgl_postprocessing_smaa.html
  193. +0 −1 examples/webgl_postprocessing_sobel.html
  194. +0 −1 examples/webgl_postprocessing_ssaa.html
  195. +0 −2 examples/webgl_postprocessing_ssaa_unbiased.html
  196. +0 −1 examples/webgl_postprocessing_ssao.html
  197. +0 −1 examples/webgl_postprocessing_taa.html
  198. +0 −1 examples/webgl_postprocessing_unreal_bloom.html
  199. +0 −2 examples/webgl_shader_lava.html
  200. +13 −13 examples/webgl_shaders_ocean.html
  201. +0 −2 examples/webgl_shaders_tonemapping.html
  202. +3 −1 examples/webgl_shadowmap.html
  203. +0 −1 examples/webgl_tonemapping.html
  204. +21 −952 package-lock.json
  205. +3 −5 package.json
  206. +1 −0 rollup.config.js
  207. +20 −6 src/Three.Legacy.js
  208. +2 −0 src/Three.d.ts
  209. +1 −0 src/Three.js
  210. +1 −1 src/animation/AnimationAction.d.ts
  211. +0 −1 src/animation/AnimationUtils.js
  212. +53 −39 src/audio/Audio.d.ts
  213. +15 −21 src/audio/PositionalAudio.d.ts
  214. +1 −1 src/constants.js
  215. +80 −17 src/core/BufferGeometry.js
  216. +2 −1 src/core/InstancedBufferAttribute.d.ts
  217. +3 −0 src/core/Object3D.d.ts
  218. +6 −2 src/geometries/SphereGeometry.js
  219. +2 −2 src/helpers/CameraHelper.js
  220. +22 −2 src/helpers/GridHelper.js
  221. +2 −1 src/loaders/AnimationLoader.d.ts
  222. +2 −2 src/loaders/AnimationLoader.js
  223. +10 −1 src/loaders/ImageBitmapLoader.js
  224. +1 −1 src/loaders/ObjectLoader.d.ts
  225. +9 −0 src/materials/Material.d.ts
  226. +2 −3 src/math/Box3.js
  227. +4 −4 src/math/Matrix3.d.ts
  228. +2 −2 src/math/Matrix4.d.ts
  229. +3 −0 src/math/Quaternion.d.ts
  230. +23 −27 src/math/Quaternion.js
  231. +3 −10 src/math/Vector3.js
  232. +1 −12 src/objects/Line.js
  233. +41 −38 src/objects/Mesh.js
  234. +6 −4 src/objects/Sprite.d.ts
  235. +0 −4 src/renderers/WebGLRenderer.d.ts
  236. +17 −134 src/renderers/WebGLRenderer.js
  237. +12 −0 src/renderers/webgl/WebGLBackground.js
  238. +8 −1 src/renderers/webgl/WebGLProgram.d.ts
  239. +2 −2 src/renderers/webgl/WebGLProgram.js
  240. +4 −1 src/renderers/webgl/WebGLPrograms.d.ts
  241. +2 −2 src/renderers/webgl/WebGLPrograms.js
  242. +1 −0 src/renderers/webgl/WebGLRenderLists.d.ts
  243. +5 −3 src/renderers/webgl/WebGLRenderLists.js
  244. +122 −6 src/renderers/webgl/WebGLTextures.js
  245. +4 −7 src/renderers/webgl/WebGLUniforms.d.ts
  246. +55 −49 src/renderers/webgl/WebGLUniforms.js
  247. +2 −0 src/renderers/webvr/WebVRManager.js
  248. +1 −1 src/renderers/webvr/WebXRManager.js
  249. +12 −0 src/textures/DataTexture2DArray.d.ts
  250. +28 −0 src/textures/DataTexture2DArray.js
  251. +2 −2 src/textures/DataTexture3D.d.ts
  252. +6 −2 utils/converters/fbx2three.js
  253. +69 −17 utils/modularize.js
  254. 0 {examples/js/utils/ldraw → utils}/packLDrawModel.js
  255. +63 −48 utils/servers/simplehttpserver.js
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# http://editorconfig.org

root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.{js,ts,html}]
charset = utf-8
indent_style = tab
indent_size = 2

[*.{js,ts}]
trim_trailing_whitespace = true
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
- [ ] r102
- [ ] r103
- [ ] ...

##### Browser
Loading