interfisch
/
ws2812-achterbahn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

led brightness gamma curve added

This commit is contained in:
interfisch 2018-05-19 20:37:06 +02:00
parent b9cce276c7
commit 9033cd8b1a
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
achterbahn.ino
View File

@ -104,7 +104,7 @@ heightraw[599]=141;
//previewHeightmap(2000); //previewHeightmap(2000);
//spawnWagon(); //spawnWagon();
//spawnWagon(); spawnWagon();
} }

23
wagon.cpp
View File

@ -8,6 +8,23 @@
//#define EDGE_BOUNCE //#define EDGE_BOUNCE
//#define EDGE_WRAP //#define EDGE_WRAP
uint8_t GammaE[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5,
6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 11, 11,
11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18,
19, 19, 20, 21, 21, 22, 22, 23, 23, 24, 25, 25, 26, 27, 27, 28,
29, 29, 30, 31, 31, 32, 33, 34, 34, 35, 36, 37, 37, 38, 39, 40,
40, 41, 42, 43, 44, 45, 46, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
71, 72, 73, 74, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 88, 89,
90, 91, 93, 94, 95, 96, 98, 99,100,102,103,104,106,107,109,110,
111,113,114,116,117,119,120,121,123,124,126,128,129,131,132,134,
135,137,138,140,142,143,145,146,148,150,151,153,155,157,158,160,
162,163,165,167,169,170,172,174,176,178,179,181,183,185,187,189,
191,193,194,196,198,200,202,204,206,208,210,212,214,216,218,220,
222,224,227,229,231,233,235,237,239,241,244,246,248,250,252,255};
Wagon::Wagon(int id,int numpixels, Adafruit_NeoPixel *strip,uint8_t *height,float pos, float trainlength,float startvel,float startacc, float wagonmass, uint32_t wagoncolor) Wagon::Wagon(int id,int numpixels, Adafruit_NeoPixel *strip,uint8_t *height,float pos, float trainlength,float startvel,float startacc, float wagonmass, uint32_t wagoncolor)
{ {
_id = id; _id = id;
@ -221,10 +238,16 @@ void Wagon::updateGraphics()
uint8_t _g = (uint8_t)(c >> 8)*healtpositive; uint8_t _g = (uint8_t)(c >> 8)*healtpositive;
uint8_t _b = (uint8_t)c*healtpositive; uint8_t _b = (uint8_t)c*healtpositive;
_r*=featherbrightness; _r*=featherbrightness;
_g*=featherbrightness; _g*=featherbrightness;
_b*=featherbrightness; _b*=featherbrightness;
_r=GammaE[_r];
_g=GammaE[_g];
_b=GammaE[_b];
uint32_t _pxcolor=_strip->getPixelColor(i); //get current color of that pixel uint32_t _pxcolor=_strip->getPixelColor(i); //get current color of that pixel
uint8_t _pxr = _pxcolor >> 16; uint8_t _pxr = _pxcolor >> 16;
uint8_t _pxg = _pxcolor >> 8; uint8_t _pxg = _pxcolor >> 8;