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: ipfs/ipfs-webui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f696d90172e1
Choose a base ref
...
head repository: ipfs/ipfs-webui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32648228c58e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 2, 2015

  1. updates three.js syntax

    @caioalonso
    caioalonso committed Oct 2, 2015
    Copy the full SHA
    f00287b View commit details

Commits on Oct 10, 2015

  1. Merge pull request #85 from CaioAlonso/issue84 

    Updates three.js syntax, fixes #84
    @daviddias
    daviddias committed Oct 10, 2015
    Copy the full SHA
    3264822 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 js/include/globe.js
4 changes: 2 additions & 2 deletions js/include/globe.js
View file
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ module.exports = function (container, opts) {
mesh.scale.set(1.1, 1.1, 1.1)
scene.add(mesh)

geometry = new THREE.CubeGeometry(0.75, 0.75, 1)
geometry = new THREE.BoxGeometry(0.75, 0.75, 1)
geometry.applyMatrix(new THREE.Matrix4().makeTranslation(0, 0, -0.5))

point = new THREE.Mesh(geometry)
@@ -288,7 +288,7 @@ module.exports = function (container, opts) {

}

THREE.GeometryUtils.merge(subgeo, point)
subgeo.merge(point.geometry, point.matrix)
}

function onMouseDown (event) {