summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2024-05-09 19:36:42 -0400
committersotech117 <michael_foiani@brown.edu>2024-05-09 19:36:42 -0400
commit14684344d553dee4b3cc252709716bff927e85b8 (patch)
treef21306907f47f72dd9fa1bc9f57e0b5b07e76176 /src
parent8d8b4357299718d7c26aed0cf5221e15156e8b86 (diff)
change viewport
Diffstat (limited to 'src')
-rw-r--r--src/arap.cpp16
-rw-r--r--src/ocean/ocean_alt.cpp2
-rw-r--r--src/ocean/ocean_alt.h2
3 files changed, 16 insertions, 4 deletions
diff --git a/src/arap.cpp b/src/arap.cpp
index 729de07..08f2e15 100644
--- a/src/arap.cpp
+++ b/src/arap.cpp
@@ -49,8 +49,20 @@ void ARAP::init
coeffMin = all_vertices.colwise().minCoeff();
coeffMax = all_vertices.colwise().maxCoeff();
- minCorner = coeffMin;
- maxCorner = coeffMax;
+// minCorner = coeffMin;
+// maxCorner = coeffMax;
+
+ std::cout << "minCorner: " << minCorner << std::endl;
+ std::cout << "maxCorner: " << maxCorner << std::endl;
+
+ minCorner = Vector3f(0.0f, 0.0f, 0.0f);
+ maxCorner = Vector3f(1.0f, 0.0f, 1.0f);
+
+ std::cout << "minCorner: " << minCorner << std::endl;
+ std::cout << "maxCorner: " << maxCorner << std::endl;
+//
+// minCorner = Vector3f(-1.0f, -1.0f, -1.0f);
+// maxCorner = Vector3f(1.0f, 1.0f, 1.0f);
// m_shape.initGroundPlane("cornell_box_full_lighting.png")
diff --git a/src/ocean/ocean_alt.cpp b/src/ocean/ocean_alt.cpp
index 6355abd..6636e62 100644
--- a/src/ocean/ocean_alt.cpp
+++ b/src/ocean/ocean_alt.cpp
@@ -312,7 +312,7 @@ void ocean_alt::update_ocean()
// NEW
Eigen::Vector3f norm = Eigen::Vector3f(-m_slopes_x[i][0], 1.0, -m_slopes_z[i][0]);
- norm = -norm.normalized(); // FIXME: why do I have to be inverted?
+ norm = norm.normalized(); // FIXME: why do I have to be inverted?
//if (i==6) std::cout << amplitude[0] << std::endl;
diff --git a/src/ocean/ocean_alt.h b/src/ocean/ocean_alt.h
index fa42d75..bf37b11 100644
--- a/src/ocean/ocean_alt.h
+++ b/src/ocean/ocean_alt.h
@@ -58,7 +58,7 @@ private:
const int num_cols = 256;
const int num_tiles_x = 1;
- const int num_tiles_z = 1;
+ const int num_tiles_z = 2;
const double vertex_displacement = Lx / 2;