Skip to content

Commit

Permalink
Fixed aframe 0.4.0 compatibility issue from threejs
Browse files Browse the repository at this point in the history
  • Loading branch information
@fernandojsg
fernandojsg committed Jan 11, 2017
1 parent 4faa6de commit 0763705
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion bookmarklet
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
javascript:(function(){var script=document.createElement('script'); script.src='https://aframe.io/releases/0.3.0/aframe-inspector.min.js';document.head.appendChild(script);})()
javascript:(function(){var script=document.createElement('script'); script.src='http://localhost:3333/dist/aframe-inspector.js';document.head.appendChild(script);})()
16 changes: 8 additions & 8 deletions dist/aframe-inspector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
});
AFRAME.INSPECTOR = INSPECTOR;

console.log('A-Frame Inspector Version:', ("0.4.1"), '(' + ("11-01-2017") + ' Commit: ' + ("76e2e6180bf9eae9d89dca8f6f63304b89fe5c91\n").substr(0, 7) + ')');
console.log('A-Frame Inspector Version:', ("0.4.2"), '(' + ("11-01-2017") + ' Commit: ' + ("4faa6debe5a08cddf2279a7890f953449afe5d2c\n").substr(0, 7) + ')');
})();

/***/ },
Expand Down Expand Up @@ -26321,13 +26321,13 @@
arrowGeometry.merge(mesh.geometry, mesh.matrix);

var lineXGeometry = new THREE.BufferGeometry();
lineXGeometry.addAttribute('position', new THREE.Float32BufferAttribute([0, 0, 0, 1, 0, 0], 3));
lineXGeometry.addAttribute('position', new THREE.Float32Attribute([0, 0, 0, 1, 0, 0], 3));

var lineYGeometry = new THREE.BufferGeometry();
lineYGeometry.addAttribute('position', new THREE.Float32BufferAttribute([0, 0, 0, 0, 1, 0], 3));
lineYGeometry.addAttribute('position', new THREE.Float32Attribute([0, 0, 0, 0, 1, 0], 3));

var lineZGeometry = new THREE.BufferGeometry();
lineZGeometry.addAttribute('position', new THREE.Float32BufferAttribute([0, 0, 0, 0, 0, 1], 3));
lineZGeometry.addAttribute('position', new THREE.Float32Attribute([0, 0, 0, 0, 0, 1], 3));

this.handleGizmos = {

Expand Down Expand Up @@ -26422,7 +26422,7 @@
if (facing === 'z') vertices.push(Math.sin(i / 32 * Math.PI) * radius, Math.cos(i / 32 * Math.PI) * radius, 0);
}

geometry.addAttribute('position', new THREE.Float32BufferAttribute(vertices, 3));
geometry.addAttribute('position', new THREE.Float32Attribute(vertices, 3));
return geometry;
};

Expand Down Expand Up @@ -26539,13 +26539,13 @@
arrowGeometry.merge(mesh.geometry, mesh.matrix);

var lineXGeometry = new THREE.BufferGeometry();
lineXGeometry.addAttribute('position', new THREE.Float32BufferAttribute([0, 0, 0, 1, 0, 0], 3));
lineXGeometry.addAttribute('position', new THREE.Float32Attribute([0, 0, 0, 1, 0, 0], 3));

var lineYGeometry = new THREE.BufferGeometry();
lineYGeometry.addAttribute('position', new THREE.Float32BufferAttribute([0, 0, 0, 0, 1, 0], 3));
lineYGeometry.addAttribute('position', new THREE.Float32Attribute([0, 0, 0, 0, 1, 0], 3));

var lineZGeometry = new THREE.BufferGeometry();
lineZGeometry.addAttribute('position', new THREE.Float32BufferAttribute([0, 0, 0, 0, 0, 1], 3));
lineZGeometry.addAttribute('position', new THREE.Float32Attribute([0, 0, 0, 0, 0, 1], 3));

this.handleGizmos = {

Expand Down
12 changes: 6 additions & 6 deletions dist/aframe-inspector.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aframe-inspector",
"version": "0.4.1",
"version": "0.4.2",
"description": "A visual inspector tool for A-Frame.",
"main": "dist/aframe-inspector.min.js",
"scripts": {
Expand Down
14 changes: 7 additions & 7 deletions src/lib/vendor/threejs/TransformControls.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@
arrowGeometry.merge( mesh.geometry, mesh.matrix );

var lineXGeometry = new THREE.BufferGeometry();
lineXGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 1, 0, 0 ], 3 ) );
lineXGeometry.addAttribute( 'position', new THREE.Float32Attribute( [ 0, 0, 0, 1, 0, 0 ], 3 ) );

var lineYGeometry = new THREE.BufferGeometry();
lineYGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 0, 1, 0 ], 3 ) );
lineYGeometry.addAttribute( 'position', new THREE.Float32Attribute( [ 0, 0, 0, 0, 1, 0 ], 3 ) );

var lineZGeometry = new THREE.BufferGeometry();
lineZGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 0, 0, 1 ], 3 ) );
lineZGeometry.addAttribute( 'position', new THREE.Float32Attribute( [ 0, 0, 0, 0, 0, 1 ], 3 ) );

this.handleGizmos = {

Expand Down Expand Up @@ -371,7 +371,7 @@

}

geometry.addAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
geometry.addAttribute( 'position', new THREE.Float32Attribute( vertices, 3 ) );
return geometry;

};
Expand Down Expand Up @@ -515,13 +515,13 @@
arrowGeometry.merge( mesh.geometry, mesh.matrix );

var lineXGeometry = new THREE.BufferGeometry();
lineXGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 1, 0, 0 ], 3 ) );
lineXGeometry.addAttribute( 'position', new THREE.Float32Attribute( [ 0, 0, 0, 1, 0, 0 ], 3 ) );

var lineYGeometry = new THREE.BufferGeometry();
lineYGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 0, 1, 0 ], 3 ) );
lineYGeometry.addAttribute( 'position', new THREE.Float32Attribute( [ 0, 0, 0, 0, 1, 0 ], 3 ) );

var lineZGeometry = new THREE.BufferGeometry();
lineZGeometry.addAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 0, 0, 1 ], 3 ) );
lineZGeometry.addAttribute( 'position', new THREE.Float32Attribute( [ 0, 0, 0, 0, 0, 1 ], 3 ) );

this.handleGizmos = {

Expand Down

0 comments on commit 0763705

Please sign in to comment.