Permalink
Browse files

merge fix

  • Loading branch information...
1 parent e9ecb31 commit 2952c1ada8c2c4bd9601b97d29e6b71af47527b1 @elliotwoods committed Jun 27, 2012
Showing with 472 additions and 18 deletions.
  1. +1 −7 .gitignore
  2. +6 −11 src/ofxGrabCam.cpp
  3. +356 −0 src/ofxGrabCam.cpp.orig
  4. +6 −0 src/ofxGrabCam.h
  5. +103 −0 src/ofxGrabCam.h.orig
View
@@ -10,10 +10,4 @@ obj/
bin/
build/
!data/
-
-*.vcxproj.user
-*.suo
-*.sdf
-ipch/
-Debug/
-Release/
+xcuserdata/
View
@@ -9,16 +9,13 @@
#include "ofxGrabCam.h"
//--------------------------
-ofxGrabCam::ofxGrabCam(bool useMouseListeners) {
- this->mouseDown = false;
- this->altDown = false;
- this->handDown = false;
- this->resetDown = false;
- this->pickCursorFlag = false;
- this->drawCursor = false;
- this->drawCursorSize = 0.1f;
- this->fixUpwards = true;
+ofxGrabCam::ofxGrabCam(bool useMouseListeners) : initialised(true), mouseDown(false), handDown(false), altDown(false), pickCursorFlag(false), drawCursor(false), drawCursorSize(0.1), fixUpwards(true) {
+ this->initialised = false;
+ this->mouseActions = true;
+ this->trackballRadius = 0.5f;
+ this->resetDown = 0;
+
ofCamera::setNearClip(0.1);
addListeners();
reset();
@@ -86,8 +83,6 @@ void ofxGrabCam::end() {
//--------------------------
void ofxGrabCam::reset() {
ofCamera::resetTransform();
- ofCamera::setPosition(2.0f, 1.0f, 2.0f);
- ofCamera::lookAt( ofVec3f(0.0f, 0.0f, 0.0f) );
}
//--------------------------
Oops, something went wrong.

0 comments on commit 2952c1a

Please sign in to comment.