From: John Tsiombikas <nuclear@member.fsf.org>
Date: Sat, 16 Sep 2017 06:55:20 +0000 (+0300)
Subject: Merge branch 'master' of goat:git/laserbrain_demo
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=commitdiff_plain;h=05fbfb6f2570953f8e98d99e58c7c763a0279c21;hp=--cc

Merge branch 'master' of goat:git/laserbrain_demo
---

05fbfb6f2570953f8e98d99e58c7c763a0279c21
diff --cc src/app.cc
index 2927ce8,24658ee..17ab2fd
--- a/src/app.cc
+++ b/src/app.cc
@@@ -340,7 -348,6 +340,9 @@@ void app_display(
  			glLoadMatrixf(view_matrix[0]);
  
  			draw_scene();
- 			draw_vrhands();
++			if(have_handtracking) {
++				draw_vrhands();
++			}
  		}
  		goatvr_draw_done();
  
@@@ -386,6 -395,36 +390,38 @@@ static void draw_scene(
  		blobs->draw();
  	}
  
++	/*
+ 	if(have_handtracking) {
+ 		Mat4 head_xform = inverse(mouse_view_matrix);//goatvr_head_matrix();
+ 		Mat4 head_dir_xform = head_xform.upper3x3();
+ 
+ 		glUseProgram(0);
+ 		glPushAttrib(GL_ENABLE_BIT);
+ 		glDisable(GL_LIGHTING);
+ 		glBegin(GL_LINES);
+ 		for(int i=0; i<2; i++) {
+ 			if(hand[i].valid) {
+ 				glColor3f(i, 1 - i, i);
+ 			} else {
+ 				glColor3f(0.5, 0.5, 0.5);
+ 			}
+ 			Vec3 v = head_xform * hand[i].pos;
+ 			Vec3 dir = head_dir_xform * rotate(Vec3(0, 0, -1), hand[i].rot) * 20.0f;
+ 			Vec3 up = head_dir_xform * rotate(Vec3(0, 1, 0), hand[i].rot) * 10.0f;
+ 			Vec3 right = head_dir_xform * rotate(Vec3(1, 0, 0), hand[i].rot) * 10.0f;
+ 
+ 			glVertex3f(v.x, v.y, v.z);
+ 			glVertex3f(v.x + dir.x, v.y + dir.y, v.z + dir.z);
+ 			glVertex3f(v.x - right.x, v.y - right.y, v.z - right.z);
+ 			glVertex3f(v.x + right.x, v.y + right.y, v.z + right.z);
+ 			glVertex3f(v.x - up.x, v.y - up.y, v.z - up.z);
+ 			glVertex3f(v.x + up.x, v.y + up.y, v.z + up.z);
+ 		}
+ 		glEnd();
+ 		glPopAttrib();
+ 	}
++	*/
+ 
  	if(show_walk_mesh && mscn->walk_mesh) {
  		glPushAttrib(GL_ENABLE_BIT);
  		glEnable(GL_BLEND);
diff --cc src/avatar.h
index 0000000,0000000..6c3521e
new file mode 100644
--- /dev/null
+++ b/src/avatar.h
@@@ -1,0 -1,0 +1,24 @@@
++#ifndef AVATAR_H_
++#define AVATAR_H_
++
++#include <gmath/gmath.h>
++
++/* when head-tracking is available, head_tilt is ignored, and the
++ * body_rot (controlled by mouse/gamepad) is independent of head_rot.
++ *
++ * without head-tracking, head_rot is derived from body_rot and head_tilt
++ */
++class Avatar {
++public:
++	Vec3 pos;
++	float body_rot;
++	Quat head_rot;		// used when head-tracking
++	float head_tilt;	// used for mouselook
++
++	Avatar();
++	~Avatar();
++
++	void draw() const;
++};
++
++#endif	// AVATAR_H_