mirror
/
osci-render
kopia lustrzana https://github.com/jameshball/osci-render
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Never traverse transparent pixels

pull/243/head
James H Ball 2024-06-02 17:15:04 +01:00 zatwierdzone przez James H Ball
rodzic e77cddb494
commit a047beae37
2 zmienionych plików z 16 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
Source/img/ImageParser.cpp
Wyświetl plik

@ -35,7 +35,8 @@ ImageParser::ImageParser(OscirenderAudioProcessor& p, juce::String extension, ju
uint8_t *pixels = tempBuffer.data(); uint8_t *pixels = tempBuffer.data();
for (int j = 0; j < tempBuffer.size(); j += 3) { for (int j = 0; j < tempBuffer.size(); j += 3) {
uint8_t avg = (pixels[j] + pixels[j + 1] + pixels[j + 2]) / 3; uint8_t avg = (pixels[j] + pixels[j + 1] + pixels[j + 2]) / 3;
frames[i][j / 3] = avg; // value of 0 is reserved for transparent pixels
frames[i][j / 3] = juce::jmax(1, (int) avg);
} }
i++; i++;
@ -59,7 +60,9 @@ ImageParser::ImageParser(OscirenderAudioProcessor& p, juce::String extension, ju
juce::Colour pixel = image.getPixelAt(x, y); juce::Colour pixel = image.getPixelAt(x, y);
int index = y * width + x; int index = y * width + x;
// RGB should be equal since we have desaturated // RGB should be equal since we have desaturated
frames[0][index] = pixel.getRed(); int value = pixel.getRed();
// value of 0 is reserved for transparent pixels
frames[0][index] = pixel.isTransparent() ? 0 : juce::jmax(1, value);
} }
} }
} }
@ -87,16 +90,20 @@ void ImageParser::resetPosition() {
currentY = height > 0 ? rng.nextInt(height) : 0; currentY = height > 0 ? rng.nextInt(height) : 0;
} }
float ImageParser::getPixelValue(int x, int y) { float ImageParser::getPixelValue(int x, int y, bool invert) {
int index = (height - y - 1) * width + x; int index = (height - y - 1) * width + x;
float pixel = frames[frameIndex][index] / (float) std::numeric_limits<uint8_t>::max(); float pixel = frames[frameIndex][index] / (float) std::numeric_limits<uint8_t>::max();
// never traverse transparent pixels
if (invert && pixel > 0) {
pixel = 1 - pixel;
}
return pixel; return pixel;
} }
void ImageParser::findWhite(double thresholdPow) { void ImageParser::findWhite(double thresholdPow, bool invert) {
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
resetPosition(); resetPosition();
if (isOverThreshold(getPixelValue(currentX, currentY), thresholdPow)) { if (isOverThreshold(getPixelValue(currentX, currentY, invert), thresholdPow)) {
break; break;
} }
} }
@ -121,10 +128,7 @@ void ImageParser::findNearestNeighbour(int searchRadius, float thresholdPow, int
if (x < 0 || x >= width || y < 0 || y >= height) break; if (x < 0 || x >= width || y < 0 || y >= height) break;
float pixel = getPixelValue(x, y); float pixel = getPixelValue(x, y, invert);
if (invert) {
pixel = 1 - pixel;
}
int index = (height - y - 1) * width + x; int index = (height - y - 1) * width + x;
if (isOverThreshold(pixel, thresholdPow) && !visited[index]) { if (isOverThreshold(pixel, thresholdPow) && !visited[index]) {
@ -139,7 +143,7 @@ void ImageParser::findNearestNeighbour(int searchRadius, float thresholdPow, int
} }
} }
findWhite(thresholdPow); findWhite(thresholdPow, invert);
} }
Point ImageParser::getSample() { Point ImageParser::getSample() {

4
Source/img/ImageParser.h
Wyświetl plik

@ -17,8 +17,8 @@ public:
private: private:
void findNearestNeighbour(int searchRadius, float thresholdPow, int stride, bool invert); void findNearestNeighbour(int searchRadius, float thresholdPow, int stride, bool invert);
void resetPosition(); void resetPosition();
float getPixelValue(int x, int y); float getPixelValue(int x, int y, bool invert);
void findWhite(double thresholdPow); void findWhite(double thresholdPow, bool invert);
bool isOverThreshold(double pixel, double thresholdValue); bool isOverThreshold(double pixel, double thresholdValue);
int jumpFrequency(); int jumpFrequency();