Blimp

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -150,7 +150,7 @@ public class Blimp extends JApplet

     labelStatus.setText( "new movie..." );

     curFile = null;

     curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    curMovie.insertInfo( 0, "creator", "Blimp (version 1.1 date 2005-04-16)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.2 date 2005-12-19)" );

     curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     curMovieChanged = false;

@@ -944,7 +944,7 @@ public class Blimp extends JApplet

   {

     JOptionPane.showMessageDialog( dialogParent,

                                    "BlinkenLightsInteractiveMovieProgram\n" +

-                                   "version 1.1 date 2005-04-16\n" +

+                                   "version 1.2 date 2005-12-19\n" +

                                    "Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>\n" +

                                    "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" +

                                    "a blinkenarea.org project\n" +

@@ -1637,7 +1637,7 @@ public class Blimp extends JApplet

     //initialize current movie, frame

     curDir = new File( "." );

     curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    curMovie.insertInfo( 0, "creator", "Blimp (version 1.1 date 2005-04-16)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.2 date 2005-12-19)" );

     curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     curFrame = null;

@@ -2220,7 +2220,7 @@ public class Blimp extends JApplet

     //running as command line tool

     System.out.println( "BlinkenLightsInteractiveMovieProgram\n" +

-                        "version 1.1 date 2005-04-16\n" +

+                        "version 1.2 date 2005-12-19\n" +

                         "Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>\n" +

                         "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" +

                         "a blinkenarea.org project\n" +

@@ -2232,7 +2232,7 @@ public class Blimp extends JApplet

     //get initial movie

     movie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    movie.insertInfo( 0, "creator", "Blimp (version 1.1 date 2005-04-16)" );

+    movie.insertInfo( 0, "creator", "Blimp (version 1.2 date 2005-12-19)" );

     movie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     //process parameters

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -16,7 +16,7 @@ public class BlinkenFrame

   private int channels;

   private int maxval;

   private int duration;

-  private byte[][][] data;

+  private byte[][] data;

   BlinkenFrame( int height, int width, int channels, int maxval, int duration )

   {

@@ -36,31 +36,31 @@ public class BlinkenFrame

     this.channels = channels;

     this.maxval = maxval;

     this.duration = duration;

-    data = new byte[height][width][channels];

+    data = new byte[height][width * channels];

   }

   BlinkenFrame( BlinkenFrame frame )

   {

-    int y, x, c;

+    int y, x, c, i;

     height = frame.height;

     width = frame.width;

     channels = frame.channels;

     maxval = frame.maxval;

     duration = frame.duration;

-    data = new byte[height][width][channels];

+    data = new byte[height][width * channels];

     for( y = 0; y < height; y++ )

-      for( x = 0; x < width; x++ )

-        for( c = 0; c < channels; c++ )

-          data[y][x][c] = frame.data[y][x][c];

+      for( x = 0, i = 0; x < width; x++ )

+        for( c = 0; c < channels; c++, i++ )

+          data[y][i] = frame.data[y][i];

   }

   public void clear( )

   {

-    int x, y, c;

+    int x, y, c, i;

     for( y = 0; y < height; y++ )

-      for( x = 0; x < width; x++ )

-        for( c = 0; c < channels; c++ )

-          data[y][x][c] = 0;

+      for( x = 0, i = 0; x < width; x++ )

+        for( c = 0; c < channels; c++, i++ )

+          data[y][i] = 0;

   }

   public int getHeight( )

@@ -101,7 +101,7 @@ public class BlinkenFrame

         x < 0 || x >= width ||

 	c < 0 || c >= channels )

       return 0;

-    return data[y][x][c];

+    return data[y][x * channels + c];

   }

   public void setPixel( int y, int x, int c, byte val )

@@ -112,7 +112,7 @@ public class BlinkenFrame

       return;

     if( val > maxval )

       val = (byte)maxval;

-    data[y][x][c] = val;

+    data[y][x * channels + c] = val;

   }

   public Color getColor( int y, int x )

@@ -122,15 +122,16 @@ public class BlinkenFrame

         channels < 1 )

       return new Color( 0, 0, 0 );

     if( channels == 1 )

-      return new Color( (((int)data[y][x][0] & 0xFF) * 255 + maxval / 2) / maxval,

-                        (((int)data[y][x][0] & 0xFF) * 255 + maxval / 2) / maxval,

-                        (((int)data[y][x][0] & 0xFF) * 255 + maxval / 2) / maxval );

+      return new Color( (((int)data[y][x * 1 + 0] & 0xFF) * 255 + maxval / 2) / maxval,

+                        (((int)data[y][x * 1 + 0] & 0xFF) * 255 + maxval / 2) / maxval,

+                        (((int)data[y][x * 1 + 0] & 0xFF) * 255 + maxval / 2) / maxval );

     if( channels == 2 )

-      return new Color( (((int)data[y][x][0] & 0xFF) * 255 + maxval / 2) / maxval,

-                        (((int)data[y][x][1] & 0xFF) * 255 + maxval / 2) / maxval, 0 );

-    return new Color( (((int)data[y][x][0] & 0xFF) * 255 + maxval / 2) / maxval,

-                      (((int)data[y][x][1] & 0xFF) * 255 + maxval / 2) / maxval,

-                      (((int)data[y][x][2] & 0xFF) * 255 + maxval / 2) / maxval );

+      return new Color( (((int)data[y][x * 2 + 0] & 0xFF) * 255 + maxval / 2) / maxval,

+                        (((int)data[y][x * 2 + 1] & 0xFF) * 255 + maxval / 2) / maxval, 0 );

+    int i = x * channels;

+    return new Color( (((int)data[y][i + 0] & 0xFF) * 255 + maxval / 2) / maxval,

+                      (((int)data[y][i + 1] & 0xFF) * 255 + maxval / 2) / maxval,

+                      (((int)data[y][i + 2] & 0xFF) * 255 + maxval / 2) / maxval );

   }

   public void setColor( int y, int x, Color color )

@@ -139,30 +140,31 @@ public class BlinkenFrame

     if( y < 0 || y >= height ||

         x < 0 || x >= width )

       return;

+    int i = x * channels;

     alpha = color.getAlpha( );

     alpha_ = 255 - alpha;

     if( channels >= 1 )

-      data[y][x][0] = (byte)(( ((color.getRed( ) * maxval + 127) / 255) * alpha

-                             + ((int)data[y][x][0] & 0xFF) * alpha_

+      data[y][i + 0] = (byte)(( ((color.getRed( ) * maxval + 127) / 255) * alpha

+                              + ((int)data[y][i + 0] & 0xFF) * alpha_

                               ) / 255);

     if( channels >= 2 )

-      data[y][x][1] = (byte)(( ((color.getGreen( ) * maxval + 127) / 255) * alpha

-                             + ((int)data[y][x][1] & 0xFF) * alpha_

+      data[y][i + 1] = (byte)(( ((color.getGreen( ) * maxval + 127) / 255) * alpha

+                              + ((int)data[y][i + 1] & 0xFF) * alpha_

                               ) / 255);

     if( channels >= 3 )

-      data[y][x][2] = (byte)(( ((color.getBlue( ) * maxval + 127) / 255) * alpha

-                             + ((int)data[y][x][2] & 0xFF) * alpha_

+      data[y][i + 2] = (byte)(( ((color.getBlue( ) * maxval + 127) / 255) * alpha

+                              + ((int)data[y][i + 2] & 0xFF) * alpha_

                               ) / 255);

     for( c = 3; c < channels; c++ )

-      data[y][x][c] = (byte)(( 0

-                             + ((int)data[y][x][c] & 0xFF) * alpha_

+      data[y][i + c] = (byte)(( 0

+                              + ((int)data[y][i + c] & 0xFF) * alpha_

                               ) / 255);

   }

   public void resize( int height, int width, int channels, int maxval )

   {

-    byte[][][] data;

-    int y, x, c;

+    byte[][] data;

+    int y, x, c, i;

     int emptyY, emptyX, skipY, skipX, rangeY, rangeX, val, div;

     if( height < 1 ) height = 1;

@@ -181,11 +183,11 @@ public class BlinkenFrame

       return;

     //allocate new data array

-    data = new byte[height][width][channels];

+    data = new byte[height][width * channels];

     for( y = 0; y < height; y++ )

-      for( x = 0; x < width; x++ )

-        for( c = 0; c < channels; c++ )

-          data[y][x][c] = 0;

+      for( x = 0, i = 0; x < width; x++ )

+        for( c = 0; c < channels; c++, i++ )

+          data[y][i] = 0;

     //get number of pixels to skip / to leave empty in X and Y direction

     if( height > this.height )

@@ -218,22 +220,24 @@ public class BlinkenFrame

     {

       for( x = 0; x < rangeX; x++ )

       {

+        int srcI = (skipX + x) * this.channels;

+        int destI = (emptyX + x) * channels;

         if( channels >= this.channels ) //add channels: copy last channel into new channels

 	{

           for( c = 0; c < this.channels; c++ )

-            data[emptyY + y][emptyX + x][c] = (byte)((((int)this.data[skipY + y][skipX + x][c] & 0xFF) * maxval + this.maxval / 2) / this.maxval);

+            data[emptyY + y][destI + c] = (byte)((((int)this.data[skipY + y][srcI + c] & 0xFF) * maxval + this.maxval / 2) / this.maxval);

 	  for( ; c < channels; c++ )

-	    data[emptyY + y][emptyX + x][c] = data[emptyY + y][emptyX + x][this.channels - 1];

+	    data[emptyY + y][destI + c] = data[emptyY + y][destI + this.channels - 1];

 	}

 	else //remove channels: merge leftover channels with last kept channel

 	{

           val = 0;

           for( c = 0; c < channels - 1; c++ )

-            data[emptyY + y][emptyX + x][c] = (byte)((((int)this.data[skipY + y][skipX + x][c] & 0xFF) * maxval + this.maxval / 2) / this.maxval);

+            data[emptyY + y][destI + c] = (byte)((((int)this.data[skipY + y][srcI + c] & 0xFF) * maxval + this.maxval / 2) / this.maxval);

           for( c = channels - 1; c < this.channels; c++ )

-            val += (int)this.data[skipY + y][skipX + x][c] & 0xFF;

+            val += (int)this.data[skipY + y][srcI + c] & 0xFF;

           div = this.maxval * (this.channels - channels + 1);

-          data[emptyY + y][emptyX + x][channels - 1] = (byte)((val * maxval + div / 2) / div);

+          data[emptyY + y][destI + channels - 1] = (byte)((val * maxval + div / 2) / div);

 	}

       }

     }

@@ -247,9 +251,9 @@ public class BlinkenFrame

   public void scale( int height, int width )

   {

-    byte[][][] data;

+    byte[][] data;

     double scaleHor, scaleVer, ox, oy, ox1, oy1, val;

-    int c, nx, ny, x, y, oxi, oyi, ox1i, oy1i;

+    int c, nx, nx_c, ny, x, x_c, y, oxi, oxi_c, oyi, ox1i, ox1i_c, oy1i;

     if( height < 1 ) height = 1;

     if( height > 1024 ) height = 1024;

@@ -264,39 +268,41 @@ public class BlinkenFrame

     scaleVer = (double)height / (double)this.height;

     //allocate new data array

-    data = new byte[height][width][channels];

+    data = new byte[height][width * channels];

     //scale every channel

     for( c = 0; c < channels; c++ )

     {

       for( ny = 0; ny < height; ny++ )

       {

-        for( nx = 0; nx < width; nx++ )

+        for( nx = 0, nx_c = c; nx < width; nx++, nx_c += channels )

         {

           oy = (double)ny / scaleVer; //sub-pixel exact range in old picture

           ox = (double)nx / scaleHor;

           oy1 = (double)(ny + 1) / scaleVer - 0.000001;

           ox1 = (double)(nx + 1) / scaleHor - 0.000001;

           if( oy < 0 || ox < 0 || oy1 >= this.height || ox1 >= this.width) //out of old picture

-            data[ny][nx][c] = 0;

+            data[ny][nx_c] = 0;

           else

           {

             oyi = (int)oy;

             oxi = (int)ox;

+            oxi_c = oxi * channels + c;

             oy1i = (int)oy1;

             ox1i = (int)ox1;

+            ox1i_c = ox1i * channels + c;

             if( oyi == oy1i )

             {

               if( oxi == ox1i) //one source pixel

               {

-                val = (double)((int)this.data[oyi][oxi][c] & 0xFF);

+                val = (double)((int)this.data[oyi][oxi_c] & 0xFF);

               }

               else //one line of source pixels

               {

-                val = (double)((int)this.data[oyi][oxi][c] & 0xFF) * (1 - ox + oxi)

-                    + (double)((int)this.data[oyi][ox1i][c] & 0xFF) * (ox1 - ox1i);

-                for( x = oxi + 1; x < ox1i; x++ )

-                  val += (double)((int)this.data[oyi][x][c] & 0xFF);

+                val = (double)((int)this.data[oyi][oxi_c] & 0xFF) * (1 - ox + oxi)

+                    + (double)((int)this.data[oyi][ox1i_c] & 0xFF) * (ox1 - ox1i);

+                for( x_c = oxi_c + channels; x_c < ox1i_c; x_c += channels )

+                  val += (double)((int)this.data[oyi][x_c] & 0xFF);

                 val /= ox1 - ox;

               }

             }

@@ -304,35 +310,35 @@ public class BlinkenFrame

             {

               if( oxi == ox1i )

               {

-                val = (double)((int)this.data[oyi][oxi][c] & 0xFF) * (1 - oy + oyi)

-                    + (double)((int)this.data[oy1i][oxi][c] & 0xFF) * (oy1 - oy1i);

+                val = (double)((int)this.data[oyi][oxi_c] & 0xFF) * (1 - oy + oyi)

+                    + (double)((int)this.data[oy1i][oxi_c] & 0xFF) * (oy1 - oy1i);

                 for( y = oyi + 1; y < oy1i; y++ )

-                  val += (double)((int)this.data[y][oxi][c] & 0xFF);

+                  val += (double)((int)this.data[y][oxi_c] & 0xFF);

                 val /= oy1 - oy;

               }

               else //rectangle of source pixels

               {

-                val = (double)((int)this.data[oyi][oxi][c] & 0xFF) * (1 - oy + oyi) * (1 - ox + oxi)

-                    + (double)((int)this.data[oyi][ox1i][c] & 0xFF) * (1 - oy + oyi) * (ox1 - ox1i)

-                    + (double)((int)this.data[oy1i][oxi][c] & 0xFF) * (oy1 - oy1i) * (1 - ox + oxi)

-                    + (double)((int)this.data[oy1i][ox1i][c] & 0xFF) * (oy1 - oy1i) * (ox1 - ox1i);

+                val = (double)((int)this.data[oyi][oxi_c] & 0xFF) * (1 - oy + oyi) * (1 - ox + oxi)

+                    + (double)((int)this.data[oyi][ox1i_c] & 0xFF) * (1 - oy + oyi) * (ox1 - ox1i)

+                    + (double)((int)this.data[oy1i][oxi_c] & 0xFF) * (oy1 - oy1i) * (1 - ox + oxi)

+                    + (double)((int)this.data[oy1i][ox1i_c] & 0xFF) * (oy1 - oy1i) * (ox1 - ox1i);

                 for( y = oyi + 1; y < oy1i; y++ )

                 {

-                  val += (double)((int)this.data[y][oxi][c] & 0xFF) * (1 - ox + oxi)

-                       + (double)((int)this.data[y][ox1i][c] & 0xFF) * (ox1 - ox1i);

+                  val += (double)((int)this.data[y][oxi_c] & 0xFF) * (1 - ox + oxi)

+                       + (double)((int)this.data[y][ox1i_c] & 0xFF) * (ox1 - ox1i);

                 }

-                for( x = oxi + 1; x < ox1i; x++ )

+                for( x_c = oxi_c + channels; x_c < ox1i_c; x_c += channels )

                 {

-                  val += (double)((int)this.data[oyi][x][c] & 0xFF) * (1 - oy + oyi)

-                       + (double)((int)this.data[oy1i][x][c] & 0xFF) * (oy1 - oy1i);

+                  val += (double)((int)this.data[oyi][x_c] & 0xFF) * (1 - oy + oyi)

+                       + (double)((int)this.data[oy1i][x_c] & 0xFF) * (oy1 - oy1i);

                 }

                 for( y = oyi + 1; y < oy1i; y++ )

-                  for( x = oxi + 1; x < ox1i; x++ )

-                    val += (double)((int)this.data[y][x][c] & 0xFF);

+                  for( x_c = oxi_c + channels; x_c < ox1i_c; x_c += channels )

+                    val += (double)((int)this.data[y][x_c] & 0xFF);

                 val /= (oy1 - oy) * (ox1 - ox);

               }

             }

-            data[ny][nx][c] = (byte)(int)(val + 0.5);

+            data[ny][nx_c] = (byte)(int)(val + 0.5);

           }

         } //for( nx ...

       } //for( ny ...

@@ -346,14 +352,14 @@ public class BlinkenFrame

   public String toString( )

   {

     String str = "";

-    int h, w, c, val;

+    int h, w, c, i, val;

     for( h = 0; h < height; h++ )

     {

-      for( w = 0; w < width; w++ )

+      for( w = 0, i = 0; w < width; w++ )

       {

         val = 0;

-        for( val = 0, c = 0; c < channels; c++ )

-          val += ((int)data[h][w][c] & 0xFF);

+        for( val = 0, c = 0; c < channels; c++, i++ )

+          val += ((int)data[h][i] & 0xFF);

         val = val * 7 / maxval / channels;

         str = str + " -+*%#&@".substring( val, val + 1); 

       }

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.1 date 2005-04-16

+ * version 1.2 date 2005-12-19

  * Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -4,6 +4,13 @@ Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 a blinkenarea.org project

 powered by eventphone.de

+version 1.2 data 2005-12-19

+---------------------------

+ - changed internal format of pixel data

+   - old format: data[y][x][c]

+   - new format: data[y][x * channels + c]

+   - faster and uses less memory

+

 version 1.1 date 2005-04-16

 ---------------------------

  - frame scroll bar now has block increment of 1

@@ -1,5 +1,5 @@

 # BlinkenLightsInteractiveMovieProgram

-# version 1.1 date 2005-04-16

+# version 1.2 date 2005-12-19

 # Copyright (C) 2004-2005: Stefan Schuermans <1stein@schuermans.info>

 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 # a blinkenarea.org project