Permalink
Browse files

Merge branch 'master' of github.com:vanderlin/Tools

Conflicts:
	Utils/Utils.h
  • Loading branch information...
2 parents 0217c50 + 87efb9e commit a4a4ed7182941e034bcbaf625475a1aebdd67758 Todd Vanderlin committed Mar 23, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 Utils/Utils.h
View
3 Utils/Utils.h
@@ -80,9 +80,10 @@ static float isPointInScreen(const ofVec2f &pt, float padding=0) {
ofRectangle screen(-padding, -padding, ofGetWidth()+(padding*2), ofGetHeight()+(padding*2));
return screen.inside(pt);
}
+/*
static float isPointInScreen(float x, float y, float padding=0) {
return isPointInScreen(x, y);
-}
+}*/
static ofVec2f ofRandomPointInRect(float x, float y, float w, float h, float padding=0) {
float rx = ofRandom(x+padding, x+(w-padding*2));

0 comments on commit a4a4ed7

Please sign in to comment.