aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grois <andi@grois.info>2018-03-23 23:21:43 +0100
committerAndreas Grois <andi@grois.info>2018-03-23 23:21:43 +0100
commit53a8f22f9d46caf533edf5081477ab36c57c7c89 (patch)
tree4815482a1dfb1185b466ad67aaaea984e55e5372
parent183f60d1305e4de6729882f18311090b33d5374b (diff)
Fix issues caused by symmetry usage (remove symmetry for now). Re-add once it's working...
-rw-r--r--BuddhaTest/Shaders/BuddhaCompute.glsl2
-rw-r--r--BuddhaTest/Shaders/BuddhaFragment.glsl5
-rw-r--r--BuddhaTest/src/Helpers.cpp6
3 files changed, 4 insertions, 9 deletions
diff --git a/BuddhaTest/Shaders/BuddhaCompute.glsl b/BuddhaTest/Shaders/BuddhaCompute.glsl
index 8b342cc..6933c7d 100644
--- a/BuddhaTest/Shaders/BuddhaCompute.glsl
+++ b/BuddhaTest/Shaders/BuddhaCompute.glsl
@@ -271,7 +271,7 @@ vec2 getCurrentOrbitOffset(const uint orbitNumber, const uint totalWorkers, cons
seed = (seed ^ (intHash(orbitNumber+totalWorkers)));
float y = hash1(seed,seed);
vec2 random = vec2(x,y);
- return vec2(random.x * 4-2,random.y*2);
+ return vec2(random.x * 4-2,random.y*4-2);
}
void main() {
diff --git a/BuddhaTest/Shaders/BuddhaFragment.glsl b/BuddhaTest/Shaders/BuddhaFragment.glsl
index ac8114b..59990e1 100644
--- a/BuddhaTest/Shaders/BuddhaFragment.glsl
+++ b/BuddhaTest/Shaders/BuddhaFragment.glsl
@@ -23,10 +23,7 @@ uvec3 getColorAt(vec2 fragCoord)
uint xIndex = uint(max(0.0,(fragCoord.x+1.0)*0.5*width));
uint yIndex = uint(max(0.0,abs(fragCoord.y+1.0)*0.5*height));
uint firstIndex = 3*(xIndex + yIndex * width);
- uvec3 c1=uvec3(counts_SSBO[firstIndex],counts_SSBO[firstIndex+1],counts_SSBO[firstIndex+2]);
- firstIndex = 3*(xIndex +(height-1 - yIndex) * width);
- uvec3 c2=uvec3(counts_SSBO[firstIndex],counts_SSBO[firstIndex+1],counts_SSBO[firstIndex+2]);
- return c1+c2;
+ return uvec3(counts_SSBO[firstIndex],counts_SSBO[firstIndex+1],counts_SSBO[firstIndex+2]);
}
void main(){
diff --git a/BuddhaTest/src/Helpers.cpp b/BuddhaTest/src/Helpers.cpp
index bd667fb..51c1056 100644
--- a/BuddhaTest/src/Helpers.cpp
+++ b/BuddhaTest/src/Helpers.cpp
@@ -181,12 +181,11 @@ namespace Helpers
{
maxValue = std::max(maxValue,data[i]);
}
- for(unsigned int row = 0; row < bufferHeight/2; ++row)
+ for(unsigned int row = 0; row < bufferHeight; ++row)
{
- unsigned int otherRow = bufferHeight - 1-row;
for(unsigned int col=0;col < width*3; ++col)
{
- double c = 0.5*(data[col + row*width*3] + data[col + otherRow*width*3]);
+ double c = data[col + row*width*3];
if(fabs(gamma - 1.0) > 0.0001 || fabs(colorScale - 1.0) > 0.0001)
{
pngData[col + row*width*3] = static_cast<png_byte>(255.0 * pow(std::min(1.0,colorScale*c/static_cast<double>(maxValue)),gamma));
@@ -195,7 +194,6 @@ namespace Helpers
{
pngData[col + row*width*3] = (255*c + (maxValue/2))/maxValue;
}
- pngData[col+otherRow*width*3] = pngData[col + row*width*3];
}
}