diff options
author | sotech117 <michael_foiani@brown.edu> | 2024-05-10 13:42:32 -0400 |
---|---|---|
committer | sotech117 <michael_foiani@brown.edu> | 2024-05-10 13:42:32 -0400 |
commit | 1b98aed8908e04b750012323a8bf0f182fb305a6 (patch) | |
tree | d9f98c619946f594893b6107d0972a5affdfe6fd | |
parent | 63d2e9cbf4508d5118c654e81ea4da33763dc73f (diff) |
demo daygit add .
-rwxr-xr-x | resources/shaders/shader.frag | 2 | ||||
-rw-r--r-- | src/ocean/ocean_alt.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/resources/shaders/shader.frag b/resources/shaders/shader.frag index f3187fb..25ed7d5 100755 --- a/resources/shaders/shader.frag +++ b/resources/shaders/shader.frag @@ -25,7 +25,7 @@ uniform sampler2D groundSampler; uniform samplerCube skySampler; uniform vec2 widthBounds; uniform vec2 lengthBounds; -uniform vec4 sunColor = vec4(64, 1, 0, 1.f); +uniform vec4 sunColor = vec4(1.5f, .7, .39f, 1.f); //uniform float test = 0; // Random methods from https://gist.github.com/patriciogonzalezvivo/670c22f3966e662d2f83 diff --git a/src/ocean/ocean_alt.cpp b/src/ocean/ocean_alt.cpp index 7825e37..c9cee3d 100644 --- a/src/ocean/ocean_alt.cpp +++ b/src/ocean/ocean_alt.cpp @@ -138,7 +138,7 @@ void ocean_alt::fft_prime(double t){ std::vector<Eigen::Vector2d> tmp7 = fast_fft(neg_ik_hat_h_z); for (int i = 0; i < N; i++) { - m_current_h[i] = tmp[i]; + m_current_h[i] = -tmp[i]; // m_slopes[i] = tmp2[i]; // m_displacements[i] = tmp3[i]; m_slopes_x[i] = tmp4[i]; |