Skip to content

Improved LeapMotion Controls #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scottbyrns wants to merge 8 commits into
base: gh-pages
Choose a base branch
from
Open

Improved LeapMotion Controls #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21603db
holoide commit
scottbyrns Dec 26, 2014
589c853
holoide commit
scottbyrns Dec 26, 2014
d47c273
holoide commit
scottbyrns Dec 26, 2014
e74b443
holoide commit
scottbyrns Dec 26, 2014
336acc4
holoide commit
scottbyrns Dec 26, 2014
ca40b36
holoide commit
scottbyrns Dec 26, 2014
2374cb1
holoide commit
scottbyrns Dec 26, 2014
60baa0a
holoide commit
scottbyrns Dec 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script src="//js.leapmotion.com/leap-0.4.1.js"></script>
<script src="js/three.min.js"></script>
<script>
var _renderMode = 'TuningPanelOn';
var _renderMode = 'SingleView';
var _nShaderMode = "basic";
var _messageFlag = 'MessageToIDE';
var _colorMode = "color"; //"monochrome"
Expand Down
51 changes: 38 additions & 13 deletions js/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var windowWidth = window.innerWidth,
var camera, renderer, scene, leap;
window.sphere = {};
var group;
var leapControl = false;
var clock = new THREE.Clock();

var bInitTimeObject = false;
Expand Down Expand Up @@ -52,21 +53,21 @@ function Init() {
leap = new THREE.LeapMotion();


leap.handleFrame = function ( frame ) {
// leap.handleFrame = function ( frame ) {

if ( frame.hasHandsVisible() ) {
if (frame.isCursorMode()) {
// if ( frame.hasHandsVisible() ) {
// if (frame.isCursorMode()) {

// frame.getDominantHand().fingers[0].tip.position.y -= 50;
sphere.position.set(frame.getDominantHand().fingers[0].tip.position.x, frame.getDominantHand().fingers[0].tip.position.y - 17.5, frame.getDominantHand().fingers[0].tip.position.z);
}
else {
frame.getDominantHand().palm.position.y -= 50;
sphere.position = frame.getDominantHand().palm.position;//.multiplyScalar( camera.position.z/500 );
}
}
// renderer.render(scene, camera);
};
// // frame.getDominantHand().fingers[0].tip.position.y -= 50;
// sphere.position.set(frame.getDominantHand().fingers[0].tip.position.x, frame.getDominantHand().fingers[0].tip.position.y - 17.5, frame.getDominantHand().fingers[0].tip.position.z);
// }
// else {
// frame.getDominantHand().palm.position.y -= 50;
// sphere.position = frame.getDominantHand().palm.position;//.multiplyScalar( camera.position.z/500 );
// }
// }
// // renderer.render(scene, camera);
// };

//setup camera
camera = new LeiaCamera({
Expand Down Expand Up @@ -106,10 +107,18 @@ function animate() {
var delta = 0.5 * clock.getDelta();

uniforms.time.value += 0.2 * delta;

if(leapControl) {
leapControl=false;
}
else {

sphere.rotation.y += Math.sin(1/uniforms.time.value) * delta * delta;
sphere.rotation.z += Math.cos(1/uniforms.time.value) * delta;
sphere.rotation.x += Math.tan(1/uniforms.time.value) * delta;

}

renderer.setClearColor(new THREE.Color().setRGB(1.0, 1.0, 1.0));

renderer.Leia_render({
Expand Down Expand Up @@ -141,6 +150,22 @@ function addObjectsToScene() {
//Add your objects here
UpateTimeObject();
LEIA_setBackgroundPlane('resource/brickwall_900x600_small.jpg');
leap.handleFrame = function ( frame ) {
leapControl = true;
if ( frame.hasHandsVisible() ) {
// Update scene here.
var palmPosition = frame.getDominantHand().palm.position;
var hand = frame.getDominantHand();
sphere.position.set(palmPosition.x/100, -palmPosition.z/100, (palmPosition.y/100) + 10);

// sphere.rotation.z = hand.roll;
// sphere.rotation.y = hand.pitch;
sphere.rotation.y = palmPosition.x/100;
sphere.rotation.x = palmPosition.z/100;
sphere.rotation.z = palmPosition.y/100;
}
};

}

function addLights() {
Expand Down