Added support for separate animation durations; updated mario assets

Added support to the config file for independent timing configurations; updated mario bitmaps to look much better

Author: djrecipe

Config.cpp

@@ -98,7 +98,20 @@ Config::Config(const string& filename) {
       throw invalid_argument(error.str());
     }
 	// Parse image info
-	_animation_duration = root["animation_duration"];
+	int image_set_duration = root["image_set_duration"];
+	_image_set_duration = ((float)image_set_duration)/1000.0;
+	libconfig::Setting& animation_durations_config = root["animation_durations"];
+	this->_animation_durations.clear();
+	for (int i=0; i<animation_durations_config.getLength(); ++i)
+	{
+		libconfig::Setting& row = animation_durations_config[i];
+		for(int j=0; j<row.getLength(); ++j)
+		{
+			int duration = row[j]["value"];
+			this->_animation_durations.push_back(((float)duration)/1000.0);
+		}
+		
+	}
 	libconfig::Setting& images_config = root["images"];
     for (int i = 0; i < images_config.getLength(); ++i)
 	{
@@ -139,7 +152,7 @@ Config::Config(const string& filename) {
     throw invalid_argument(error.str());
   }
   catch (const libconfig::ConfigException& ex) {
-    throw runtime_error("Error loading configuration!");
+    throw runtime_error("Error while loading configuration");
   }
 }
 

Config.h

@@ -14,8 +14,8 @@ class Config {
   ~Config();
 
   // Attribute accessors:
-  float getAnimationDuration() const {
-	return _animation_duration;
+  float getAnimationDuration(int set_index) const {
+	return _animation_durations[set_index];
   }
 
   int getDisplayWidth() const {
@@ -49,6 +49,9 @@ class Config {
   int getImageSetCount() const {
 	return _image_sets.size();
   }
+  int getImageSetDuration() const {
+	  return _image_set_duration;
+  } 
   int getParallelCount() const {
     return _parallel_count;
   }
@@ -77,7 +80,8 @@ class Config {
       _crop_y;
   int _led_cutoff,
 	  _led_max_brightness;
-  float _animation_duration;
+  int _image_set_duration;
+  std::vector<float> _animation_durations;
   std::vector<GridTransformer::Panel> _panels;
   std::vector<std::vector<std::string>*> _image_sets;
 };

Spectrometer.cpp

@@ -64,7 +64,7 @@ void Spectrometer::GetBins(short* buffer, int* bins)
 
 unsigned int Spectrometer::GetBitmapSetIndex(float seconds)
 {
-	float full_cycle = 30.0;
+	float full_cycle = this->config->getImageSetDuration();
 	float divisor = this->logos.size();
 	float interval = full_cycle/divisor;
 	int value = (int)seconds%(int)full_cycle;
@@ -74,7 +74,7 @@ unsigned int Spectrometer::GetBitmapSetIndex(float seconds)
 
 unsigned int Spectrometer::GetBitmapIndex(float seconds, int set_index)
 {
-	int weight = (int)(100.0*this->animationDuration);
+	int weight = (int)(100.0*this->config->getAnimationDuration(set_index));
 	int value = (int)(seconds*100.0)%weight;
 	int image_count = this->config->getImageCount(set_index); 
 	int loop_image_count = 1;
@@ -224,9 +224,6 @@ void Spectrometer::InitializeLEDMatrix(char* config_path)
     this->panelHeight = height;
     fprintf(stderr, "\tSize: %d x %d\n", this->panelWidth, this->panelHeight);
 
-	// bitmap stuff
-	this->animationDuration = this->config->getAnimationDuration();
-	
     // Initialize GPIO
     if (!this->io.Init())
     {

Spectrometer.h

@@ -79,7 +79,6 @@ class Spectrometer
     int panelWidth = 0;
     int panelHeight = 0;
 	float seconds = 0.0;
-	float animationDuration = 1.0;
     int mailbox;
     struct GPU_FFT *fft;
 

mario-walking-1.bmp

@@ -79,10 +79,11 @@ led_max_brightness = 225;
 //crop_origin = (0, 0)
 
 // define image parameters
-image_set_duration = 60.0;
-animation_duration = 1.0;
+image_set_duration = 60000;
+animation_durations = (
+	( { value = 200; } )
+)
 images = (
-   ( { value = "burn-logo.bmp"; }, { value = "burn-logo-2.bmp"; }, { value = "burn-logo-3.bmp"; }, { value = "burn-logo-4.bmp"; } , { value = "burn-logo-5.bmp"; } ),
    ( { value = "mario-walking-1.bmp"; }, { value = "mario-walking-2.bmp"; } )
 
 )