diff --git a/bin/data/new_tree.bin b/bin/data/new_tree.bin index 80f2c40..14f511e 100644 Binary files a/bin/data/new_tree.bin and b/bin/data/new_tree.bin differ diff --git a/bin/data/shaders/map_depth.frag b/bin/data/shaders/map_depth.frag index c4c5eb9..a64265d 100644 --- a/bin/data/shaders/map_depth.frag +++ b/bin/data/shaders/map_depth.frag @@ -12,5 +12,5 @@ void main() float remappedDepth = mix(0.0, 1.0, depth); // Maps 0-1 to 0.5-1 //float adjustedDepth = pow(depth, 0.5); - outputColor = vec4(1.0 - depth, 1.0 - depth, 1.0 - depth, remappedDepth); + outputColor = vec4(1.0 - depth, 1.0 - depth, 1.0 - depth, 1.0); } diff --git a/bin/image-to-mesh b/bin/image-to-mesh index 5497374..6e256a8 100755 Binary files a/bin/image-to-mesh and b/bin/image-to-mesh differ diff --git a/src/Bullet.cpp b/src/Bullet.cpp index 933fa73..c3c1511 100644 --- a/src/Bullet.cpp +++ b/src/Bullet.cpp @@ -14,8 +14,8 @@ void Bullet::setup(vector& _nodes){ camera.setScale(0.05); camera.setNearClip(-10000); camera.setFarClip(10000); - // camera.disableMouseInput(); - // camera.removeAllInteractions(); + camera.disableMouseInput(); + camera.removeAllInteractions(); world.setup(); world.setCamera(&camera); diff --git a/src/ofApp.cpp b/src/ofApp.cpp index d829ba3..629944c 100644 --- a/src/ofApp.cpp +++ b/src/ofApp.cpp @@ -4,12 +4,12 @@ void ofApp::setup(){ /* allocated fbo's */ - map_fbo.allocate(ofGetWindowWidth(), map_h, GL_RGB); + map_fbo.allocate(ofGetWindowWidth() / 3, map_h, GL_RGB); map_fbo_alpha.allocate(map_fbo.getWidth(), map_h, GL_RGBA); map_fbo_post.allocate(map_fbo.getWidth(), map_h, GL_RGBA); - portrait_fbo.allocate(ofGetWindowWidth(), map_h, GL_RGBA); - portrait_pre_fbo.allocate(portrait_fbo.getWidth(), map_h, GL_RGB); - portrait_pre_fbo_alpha.allocate(portrait_fbo.getWidth(), map_h, GL_RGBA); + portrait_fbo.allocate((ofGetWindowWidth() / 3) * 2, map_h, GL_RGBA); // this shoould be full with + portrait_pre_fbo.allocate((ofGetWindowWidth() / 3) * 1, map_h, GL_RGB); // this should be full, and same below + portrait_pre_fbo_alpha.allocate((ofGetWindowWidth() / 3) * 1, map_h, GL_RGBA); comp_fbo.allocate(ofGetWindowWidth(), map_h, GL_RGBA); model_outptut_fbo.allocate(map_fbo.getWidth(), map_h, GL_RGB); @@ -72,16 +72,17 @@ void ofApp::setup(){ depth_portrait.setup(&model_image_portrait, &model_portrait_out_fbo, &depth_onnx_portrait); /* camera settings for portrait */ - glm::quat rot(0.93, 0.33, -0.14, 0.0565); + glm::quat rot(0.9155, 0.3170, 0.02, -0.035); - portrait_camera.enableOrtho(); - portrait_camera.setNearClip(-10000); - portrait_camera.setFarClip(10000); - portrait_camera.setPosition(-183.191, -341.348, 776.852); + /* settings */ + // portrait_camera.enableOrtho(); + // portrait_camera.setNearClip(-10000); + // portrait_camera.setFarClip(10000); + portrait_camera.setPosition(116.388, -441.054, 967.724); portrait_camera.setOrientation(rot); portrait_camera.setScale(0.5); - portrait_camera.removeAllInteractions(); - portrait_camera.disableMouseInput(); + // portrait_camera.removeAllInteractions(); + // portrait_camera.disableMouseInput(); createNodes("data/json/embeddings.json"); @@ -143,7 +144,7 @@ void ofApp::update(){ //mapper.update(); bullet.update(server->is_active, server->getChosenNode()); - //std::cout << portrait_camera.getPosition() << " : " < kd_tree; std::vector kd_result; + /* settings */ float g_size = 5; - float plane_size = 110; + float plane_size = 55; /* pi mapper */ ofxPiMapper mapper;