Skip to content

Commit

Permalink
Merge pull request #188 from maxg0/master
Browse files Browse the repository at this point in the history
Renamed deprecated functions
  • Loading branch information
chandlerprall committed Jul 31, 2014
2 parents bf1ee7a + 6d9e5bc commit d7070a7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions physi.js
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ window.Physijs = (function() {

case 'slider':
marker = new THREE.Mesh(
new THREE.CubeGeometry( 10, 1, 1 ),
new THREE.BoxGeometry( 10, 1, 1 ),
new THREE.MeshNormalMaterial
);
marker.position.copy( constraint.positiona );
Expand Down Expand Up @@ -794,7 +794,7 @@ window.Physijs = (function() {
object.children[i].updateMatrix();
object.children[i].updateMatrixWorld();

_temp_vector3_1.getPositionFromMatrix( object.children[i].matrixWorld );
_temp_vector3_1.setFromMatrixPosition( object.children[i].matrixWorld );
_quaternion_1.setFromRotationMatrix( object.children[i].matrixWorld );

object.children[i]._physijs.position_offset = {
Expand Down

0 comments on commit d7070a7

Please sign in to comment.