mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Extract the color lookup in AudioColorScheme to a seperate method

Browse source 
Originally committed to SVN as r5882.
This commit is contained in:
Thomas Goyne 2011-11-18 22:57:26 +00:00
parent 262a74dc6f
commit 13a281e9dc
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
aegisub/src/audio_colorscheme.h
View file

@ -40,6 +40,8 @@
#include <wx/colour.h> #include <wx/colour.h>
#endif #endif
#include "utils.h"
/// @class AudioSpectrumColorMap /// @class AudioSpectrumColorMap
/// @brief Provides colour maps for audio display rendering /// @brief Provides colour maps for audio display rendering
@ -57,6 +59,13 @@ class AudioColorScheme {
/// Factor to multiply 0..1 values by to map them into the palette range /// Factor to multiply 0..1 values by to map them into the palette range
size_t factor; size_t factor;
/// @brief Get a floating point value's colour as a 24-bit RGB pixel
/// @param val The value to map from
unsigned char *get_color(float val) const
{
return palette + mid<size_t>(0, val * factor, factor) * 4;
}
public: public:
/// @brief Constructor /// @brief Constructor
/// @param prec Bit precision to create the colour map with /// @param prec Bit precision to create the colour map with
@ -87,12 +96,10 @@ public:
/// ///
/// Writes into the XRGB pixel (assumed 32 bit without alpha) passed. /// Writes into the XRGB pixel (assumed 32 bit without alpha) passed.
/// The pixel format is assumed to be the same as that in the palette. /// The pixel format is assumed to be the same as that in the palette.
void map(float val, unsigned char *pixel) void map(float val, unsigned char *pixel) const
{ {
if (val < 0.0) val = 0.0;
if (val > 1.0) val = 1.0;
// Find the colour in the palette // Find the colour in the palette
unsigned char *color = palette + ((int)(val*factor) * 4); unsigned char *color = get_color(val);
// Copy to the destination. // Copy to the destination.
// Has to be done one byte at a time since we're writing RGB and not RGBX or RGBA // Has to be done one byte at a time since we're writing RGB and not RGBX or RGBA
// data, and we otherwise write past the end of the pixel we're writing, possibly // data, and we otherwise write past the end of the pixel we're writing, possibly
@ -107,11 +114,9 @@ public:
/// @brief Get a floating point value's colour as a wxColour /// @brief Get a floating point value's colour as a wxColour
/// @param val The value to map from /// @param val The value to map from
/// @return The corresponding wxColour /// @return The corresponding wxColour
wxColour get(float val) wxColour get(float val) const
{ {
if (val < 0.0) val = 0.0; unsigned char *color = get_color(val);
if (val > 1.0) val = 1.0;
unsigned char *color = palette + ((int)(val*factor) * 4);
return wxColour(color[0], color[1], color[2]); return wxColour(color[0], color[1], color[2]);
} }
}; };