Project

General

Profile

« Previous | Next » 

Revision 55c14a19

Added by Leszek Koltunski over 7 years ago

Minor reorganization.

View differences:

src/main/java/org/distorted/library/Distorted.java
77 77
   */
78 78
  public static final int CLONE_CHILDREN= 0x20;
79 79

  
80
  static DistortedProgram mMainProgram, mPostProgram;
80
  private static boolean mInitialized=false;
81 81

  
82 82
///////////////////////////////////////////////////////////////////////////////////////////////////
83 83
// private: hide this from Javadoc
......
91 91

  
92 92
  static boolean isInitialized()
93 93
    {
94
    return (mMainProgram!=null);
94
    return mInitialized;
95 95
    }
96 96

  
97 97
///////////////////////////////////////////////////////////////////////////////////////////////////
......
132 132
        mainFragmentHeader += ("#define "+name.name()+" "+name.ordinal()+"\n");
133 133
      }
134 134

  
135
    mMainProgram = new DistortedProgram(mainVertexStream,mainFragmentStream, mainVertexHeader, mainFragmentHeader);
136
    int mainProgramH = mMainProgram.getProgramHandle();
135
    DistortedProgram mainProgram = new DistortedProgram(mainVertexStream,mainFragmentStream, mainVertexHeader, mainFragmentHeader);
136
    int mainProgramH = mainProgram.getProgramHandle();
137 137

  
138 138
    GLES20.glDepthFunc(GLES20.GL_LEQUAL);
139 139
    GLES20.glEnable(GLES20.GL_BLEND);
......
158 158
        postFragmentHeader += ("#define "+name.name()+" "+name.ordinal()+"\n");
159 159
      }
160 160

  
161
    mPostProgram = new DistortedProgram(postVertexStream,postFragmentStream, "", postFragmentHeader);
162
    int postProgramH = mPostProgram.getProgramHandle();
161
    DistortedProgram postProgram = new DistortedProgram(postVertexStream,postFragmentStream, "", postFragmentHeader);
162
    int postProgramH = postProgram.getProgramHandle();
163 163

  
164 164
    EffectQueuePostprocess.getUniforms(postProgramH);
165 165

  
166
    DistortedEffects.setPrograms(mainProgram,postProgram);
166 167
    DistortedTree.reset();
167 168
    EffectMessageSender.startSending();
168 169
    }
......
181 182
    DistortedEffects.onDestroy();
182 183
    EffectMessageSender.stopSending();
183 184

  
184
    mMainProgram = null;
185
    mPostProgram = null;
185
    mInitialized = false;
186 186
    }
187 187
  }

Also available in: Unified diff