Update add setCustomMesh() for fur add setNoise()

kashimAstro · Nov 3, 2016 · 112da54 · 112da54
1 parent cc404d5
commit 112da54
Show file tree

Hide file tree

Showing 34 changed files with 161,390 additions and 14 deletions.
diff --git a/example-furryprimitive-assimp/src/ofApp.cpp b/example-furryprimitive-assimp/src/ofApp.cpp
@@ -34,18 +34,19 @@ void ofApp::setup(){
 }
 
 void ofApp::changePrimitive(int & v){
-	if(v == 0) scale.set(ofVec3f(1,1,1.22));
-	if(v == 1) scale.set(ofVec3f(1,1,10));
+	if(v == 0) scale.set(ofVec3f(1,1,1.22)); 
+	if(v == 1) { scale.set(ofVec3f(1,1,10)); pcounter = 0; }
 	if(v == 2) scale.set(ofVec3f(1,1,8));
 	if(v == 3) scale.set(ofVec3f(0.32,0.2,10));
 	if(v == 4) scale.set(ofVec3f(1,1,1));
+	if(v >  4) pcounter = 0;
 
-	furryprimitive.primitive(v);
+	furryprimitive.setPrimitive(v);
 }
 
 //--------------------------------------------------------------
 void ofApp::update(){
-	ofSetWindowTitle(ofToString(ofGetFrameRate()));
+	//ofSetWindowTitle(ofToString(ofGetFrameRate()));
 
 	furryprimitive.setTexture(texture[pcounter]);
 	furryprimitive.setRangeOrientation(rangeorien);
@@ -59,6 +60,7 @@ void ofApp::update(){
 	if(acounter>speedanim) acounter=0;
 	model.setPositionForAllAnimations(animationPosition);
 	mesh = model.getCurrentAnimatedMesh(0);
+	meshWire = furryprimitive.getMeshResized();
 	furryprimitive.update(mesh);
 }
 
@@ -68,6 +70,8 @@ void ofApp::draw(){
 
         ofEnableDepthTest();
         camera.begin();
+	ofSetColor(0);
+	meshWire.drawWireframe();
         if(wirefill)
                 furryprimitive.draw(OF_MESH_FILL);
         else

diff --git a/example-furryprimitive-assimp/src/ofApp.h b/example-furryprimitive-assimp/src/ofApp.h
@@ -24,7 +24,7 @@ class ofApp : public ofBaseApp{
 		void gotMessage(ofMessage msg);
 
 		FurryPrimitive furryprimitive;
-                ofVboMesh mesh;
+                ofVboMesh mesh,meshWire;
                 ofEasyCam camera;
                 ofxAssimpModelLoader model;
                 vector<ofImage> texture;

diff --git a/example-furryprimitive-customfur/Makefile b/example-furryprimitive-customfur/Makefile
@@ -0,0 +1,13 @@
+# Attempt to load a config.make file.
+# If none is found, project defaults in config.project.make will be used.
+ifneq ($(wildcard config.make),)
+	include config.make
+endif
+
+# make sure the the OF_ROOT location is defined
+ifndef OF_ROOT
+    OF_ROOT=$(realpath ../../..)
+endif
+
+# call the project makefile!
+include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
diff --git a/example-furryprimitive-customfur/addons.make b/example-furryprimitive-customfur/addons.make
@@ -0,0 +1,4 @@
+ofxAssimpModelLoader
+ofxFurry
+ofxGui
+ofxKinect
diff --git a/example-furryprimitive-customfur/bin/data/dummy/dummy_obj.mtl b/example-furryprimitive-customfur/bin/data/dummy/dummy_obj.mtl
@@ -0,0 +1,14 @@
+newmtl blinn3SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd dummy_wood.jpg
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl initialShadingGroup
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00