Project

General

Profile

« Previous | Next » 

Revision b3618cb5

Added by Leszek Koltunski almost 8 years ago

Beginnings of support for PostShader effects (SavePNG, SaveMP4)

View differences:

src/main/java/org/distorted/library/EffectNames.java
6 6
  {
7 7
  // EFFECT NAME /////// EFFECT TYPE ////////////// UNITY /////////////////////////
8 8
   
9
  ROTATE           ( Distorted.TYPE_MATR,   new float[] {0.0f}           ),
10
  QUATERNION       ( Distorted.TYPE_MATR,   new float[] {0.0f,0.0f,0.0f} ),      // quaternion is a unity iff its axis (x,y,z) is (0,0,0) 
11
  MOVE             ( Distorted.TYPE_MATR,   new float[] {0.0f,0.0f,0.0f} ),
12
  SCALE            ( Distorted.TYPE_MATR,   new float[] {1.0f,1.0f,1.0f} ),
13
  SHEAR            ( Distorted.TYPE_MATR,   new float[] {0.0f,0.0f,0.0f} ),
14
  // add new Matrix effects here...
9
  ROTATE           ( Distorted.TYPE_PRE ,   new float[] {0.0f}           ),
10
  QUATERNION       ( Distorted.TYPE_PRE ,   new float[] {0.0f,0.0f,0.0f} ),      // quaternion is a unity iff its axis (x,y,z) is (0,0,0)
11
  MOVE             ( Distorted.TYPE_PRE ,   new float[] {0.0f,0.0f,0.0f} ),
12
  SCALE            ( Distorted.TYPE_PRE ,   new float[] {1.0f,1.0f,1.0f} ),
13
  SHEAR            ( Distorted.TYPE_PRE ,   new float[] {0.0f,0.0f,0.0f} ),
14
  // add new PreShader effects here...
15 15
  
16 16
  DISTORT          ( Distorted.TYPE_VERT,   new float[] {0.0f,0.0f,0.0f} ),      // keep this the first VERT effect (reason: getType)
17 17
  DEFORM           ( Distorted.TYPE_VERT,   new float[] {0.0f,0.0f}      ),
......
32 32
  CONTRAST         ( Distorted.TYPE_FRAG,   new float[] {1.0f}           ),
33 33
  SMOOTH_CONTRAST  ( Distorted.TYPE_FRAG,   new float[] {1.0f}           ),
34 34
  HUE              ( Distorted.TYPE_FRAG,   new float[] {0.0f}           ),
35
  SMOOTH_HUE       ( Distorted.TYPE_FRAG,   new float[] {0.0f}           );
35
  SMOOTH_HUE       ( Distorted.TYPE_FRAG,   new float[] {0.0f}           ),
36 36
  // add new Fragment effects here...
37 37

  
38
  SAVE_PNG         ( Distorted.TYPE_POST,   null                         ),      // PostShader Effects don't have Unities.
39
  SAVE_MP4         ( Distorted.TYPE_POST,   null                         );      //
40
  // add new PostShader effects here...
41

  
38 42
///////////////////////////////////////////////////////////////////////////////////////////////////
39 43
  
40 44
  private static final int MAXDIM = 4;  // maximum supported dimension of an effect  
......
55 59
    
56 60
    for(EffectNames name: EffectNames.values())
57 61
      {
58
      dimensions[i] = name.unity.length;
62
      dimensions[i] = (name.unity==null ? 0 : name.unity.length);
59 63
      
60 64
      switch(dimensions[i])
61 65
        {
......
89 93
  
90 94
  static int getType(int ordinal)
91 95
    {
92
    if( ordinal<DISTORT.ordinal()     ) return Distorted.TYPE_MATR;
96
    if( ordinal<DISTORT.ordinal()     ) return Distorted.TYPE_PRE;
93 97
    if( ordinal<MACROBLOCK.ordinal()  ) return Distorted.TYPE_VERT;
94
   
95
    return Distorted.TYPE_FRAG;
98
    if( ordinal<SAVE_PNG.ordinal()    ) return Distorted.TYPE_FRAG;
99

  
100
    return Distorted.TYPE_POST;
96 101
    }
97 102

  
98 103
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff