summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2024-05-04 16:58:11 -0400
committersotech117 <michael_foiani@brown.edu>2024-05-04 16:58:11 -0400
commit045eb047c556898606005e548c16f102ac02e995 (patch)
treee7f1bdbaf4a531aa1b810436c3551536f1ab2063 /src
parent6120499fd6d66fa010ab0bfcf3089eeeddb3b45c (diff)
use normals from faces
Diffstat (limited to 'src')
-rw-r--r--src/ocean/ocean_alt.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ocean/ocean_alt.cpp b/src/ocean/ocean_alt.cpp
index d34ad55..025e89b 100644
--- a/src/ocean/ocean_alt.cpp
+++ b/src/ocean/ocean_alt.cpp
@@ -269,13 +269,13 @@ std::vector<Eigen::Vector3f> ocean_alt::get_vertices()
float ys = 1.f + s[1]*s[1];
float zs = 1.f + s[2]*s[2];
- Eigen::Vector3f diff = y - s;
- Eigen::Vector3f norm = Eigen::Vector3f(diff[0]/ sqrt(xs), diff[1]/ sqrt(ys), diff[2]/sqrt(zs));
+// Eigen::Vector3f diff = y - s;
+// Eigen::Vector3f norm = Eigen::Vector3f(diff[0]/ sqrt(xs), diff[1]/ sqrt(ys), diff[2]/sqrt(zs));
- // NEW
- // Eigen::Vector3f norm = Eigen::Vector3f(-slope[0], 1.0, -slope[1]);
- // norm.normalize();
- // NEW
+ // NEW
+ Eigen::Vector3f norm = Eigen::Vector3f(-slope[0], 1.0, -slope[1]);
+ norm.normalize();
+ //NEW
@@ -318,8 +318,8 @@ std::vector<Eigen::Vector3i> ocean_alt::get_faces()
int i3 = i + num_rows;
int i4 = i + num_rows + 1;
- faces.emplace_back(i2, i1, i3);
- faces.emplace_back(i2, i3, i4);
+// faces.emplace_back(i2, i1, i3);
+// faces.emplace_back(i2, i3, i4);
faces.emplace_back(i1, i2, i3);
faces.emplace_back(i3, i2, i4);
}