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: 45418089bd5633e856384a8c0beefced87143334
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: d677b47d6087cbb2c0b961981257cdd360a699e2
Choose a head ref

Commits on Jan 30, 2019

  1. fix conflicts

    pailhead committed Jan 30, 2019
    Copy the full SHA
    35a4950 View commit details
  2. fix names and default values

    pailhead committed Jan 30, 2019
    Copy the full SHA
    e45e20a View commit details
  3. nuke clone material

    nuke!
    pailhead committed Jan 30, 2019
    Copy the full SHA
    20f430a View commit details
  4. squash getters and setters

    pailhead committed Jan 30, 2019
    Copy the full SHA
    505c61a View commit details

Commits on Jan 31, 2019

  1. Copy the full SHA
    1007e56 View commit details

Commits on Feb 1, 2019

  1. Copy the full SHA
    2443963 View commit details

Commits on Oct 28, 2019

  1. reset to "added examples/webgl_camera_minimap.html & examples/js/misc…

    …/Minimap.js" and commit the added files only
    LeonYuanYao committed Oct 28, 2019
    Copy the full SHA
    8d32899 View commit details

Commits on Dec 9, 2019

  1. 2019.12.09

    LeonYuanYao committed Dec 9, 2019
    Copy the full SHA
    0809b0b View commit details
  2. Copy the full SHA
    f35f2fd View commit details
  3. PackedPhongMaterial

    LeonYuanYao committed Dec 9, 2019
    Copy the full SHA
    2ed3600 View commit details

Commits on Dec 11, 2019

  1. improve packing geometry

    LeonYuanYao committed Dec 11, 2019
    Copy the full SHA
    5b2e5ad View commit details

Commits on Dec 13, 2019

  1. 1213

    LeonYuanYao committed Dec 13, 2019
    Copy the full SHA
    e3ce148 View commit details

Commits on Dec 19, 2019

  1. geometry compression example

    LeonYuanYao committed Dec 19, 2019
    Copy the full SHA
    45e8b77 View commit details

Commits on Dec 20, 2019

  1. webgl geometry compression example

    LeonYuanYao committed Dec 20, 2019
    Copy the full SHA
    4f00d96 View commit details
  2. fixed some left minimap.js codes

    LeonYuanYao committed Dec 20, 2019
    Copy the full SHA
    34cc4ef View commit details
  3. Merge remote-tracking branch 'upstream/dev' into geometry-compression…

    …-example
    LeonYuanYao committed Dec 20, 2019
    Copy the full SHA
    fb89b55 View commit details

Commits on Dec 27, 2019

  1. Editor: Updated sw.js

    mrdoob committed Dec 27, 2019
    Copy the full SHA
    2b470e5 View commit details
  2. Copy the full SHA
    24df68a View commit details
  3. Refactor 'instancing / performance'

    Don McCurdy committed Dec 27, 2019
    Copy the full SHA
    6354f0e View commit details
  4. Clean up.

    Don McCurdy committed Dec 27, 2019
    Copy the full SHA
    2b275e7 View commit details

Commits on Dec 28, 2019

  1. Copy the full SHA
    063a14b View commit details
  2. Copy the full SHA
    025c347 View commit details
  3. Copy the full SHA
    14d2c6f View commit details
  4. Merge pull request #18257 from OndrejSpanel/dev

    Fix d.ts signatures for setCrossOrigin and transformUv
    Mugen87 authored Dec 28, 2019
    Copy the full SHA
    c063244 View commit details
  5. add type is*** to d.ts

    yomotsu committed Dec 28, 2019
    Copy the full SHA
    d49f86f View commit details
  6. Copy the full SHA
    2253c86 View commit details

Commits on Dec 29, 2019

  1. make is* readonly in d.ts

    yomotsu committed Dec 29, 2019
    Copy the full SHA
    a51e4aa View commit details
  2. Copy the full SHA
    e54252c View commit details
  3. Copy the full SHA
    8aeac46 View commit details
  4. Merge pull request #18261 from Mugen87/dev29

    Remove non-breaking space from code.
    Mugen87 authored Dec 29, 2019
    Copy the full SHA
    912575e View commit details
  5. Copy the full SHA
    db73e26 View commit details
  6. Update Node.d.ts

    Mugen87 authored Dec 29, 2019
    Copy the full SHA
    9565981 View commit details
  7. Merge pull request #18260 from FunFetched/dev

    BufferGeometryUtils.js: Non-breaking space replaced with normal space
    Mugen87 authored Dec 29, 2019
    Copy the full SHA
    6a5ae3e View commit details
  8. Examples: Clean up.

    Mugen87 committed Dec 29, 2019
    Copy the full SHA
    e1ea321 View commit details

Commits on Dec 30, 2019

  1. Copy the full SHA
    9ccff28 View commit details
  2. Copy the full SHA
    efd9928 View commit details
  3. Copy the full SHA
    4fb939f View commit details
  4. Merge pull request #18266 from terrierscript/patch-1

    Update TypedGeometryExporter.d.ts
    Mugen87 authored Dec 30, 2019
    Copy the full SHA
    be1c097 View commit details
  5. Merge pull request #18259 from yomotsu/feature/add-type-isXXX

    TS: Add missing types: is***
    Mugen87 authored Dec 30, 2019
    Copy the full SHA
    3ba0553 View commit details
  6. Merge pull request #18264 from WestLangley/dev_deprecate

    Deprecate Matrix*.applyToBufferAttribute() methods
    mrdoob authored Dec 30, 2019
    Copy the full SHA
    87e4279 View commit details
  7. Merge pull request #18256 from WestLangley/dev_instancing_modified

    Examples: added instancing_modified example
    mrdoob authored Dec 30, 2019
    Copy the full SHA
    99fd5fe View commit details
  8. Copy the full SHA
    76923fa View commit details
  9. Merge pull request #18254 from donmccurdy/examples-instancing-perform…

    …ance
    
    Examples: Refactor 'instancing / interactive' → 'instancing / performance'
    mrdoob authored Dec 30, 2019
    Copy the full SHA
    ffd0a8a View commit details
  10. Math: Rename to MathUtils.

    Mugen87 committed Dec 30, 2019
    Copy the full SHA
    e7ca300 View commit details
  11. Update files.js

    Mugen87 authored Dec 30, 2019
    1
    Copy the full SHA
    e2bcd72 View commit details
  12. Update builds.

    Mugen87 committed Dec 30, 2019
    Copy the full SHA
    d74f45d View commit details
  13. Copy the full SHA
    fcec322 View commit details
  14. Merge pull request #18271 from donmccurdy/examples-instancing-dynamic…

    …-usage
    
    Examples: Set DynamicDrawUsage on dynamic instancing examples
    mrdoob authored Dec 30, 2019
    Copy the full SHA
    f31584a View commit details
  15. Copy the full SHA
    3ed2308 View commit details

Commits on Dec 31, 2019

  1. Copy the full SHA
    37275fa View commit details
Showing 778 changed files with 16,740 additions and 18,233 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ Please also include a live example if possible. You can start from these templat
##### Three.js version

- [ ] Dev
- [ ] r112
- [ ] r113
- [ ] ...

##### Browser
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@ node_modules
npm-debug.log
.jshintrc
.vs/
test/unit/three.*.unit.js
test/unit/three.*.unit.js
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright © 2010-2019 three.js authors
Copyright © 2010-2020 three.js authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -23,16 +23,11 @@ The aim of the project is to create an easy to use, lightweight, 3D library with

### Usage ###

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

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

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

```javascript
import * as THREE from 'js/three.module.js';

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

Loading