Project

General

Profile

Download (16 KB) Statistics
| Branch: | Revision:

library / src / main / java / org / distorted / library / effectqueue / EffectQueue.java @ 30094332

1 d333eb6b Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
2
// Copyright 2016 Leszek Koltunski                                                               //
3
//                                                                                               //
4 46b572b5 Leszek Koltunski
// This file is part of Distorted.                                                               //
5 d333eb6b Leszek Koltunski
//                                                                                               //
6 46b572b5 Leszek Koltunski
// Distorted is free software: you can redistribute it and/or modify                             //
7 d333eb6b Leszek Koltunski
// it under the terms of the GNU General Public License as published by                          //
8
// the Free Software Foundation, either version 2 of the License, or                             //
9
// (at your option) any later version.                                                           //
10
//                                                                                               //
11 46b572b5 Leszek Koltunski
// Distorted is distributed in the hope that it will be useful,                                  //
12 d333eb6b Leszek Koltunski
// but WITHOUT ANY WARRANTY; without even the implied warranty of                                //
13
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                 //
14
// GNU General Public License for more details.                                                  //
15
//                                                                                               //
16
// You should have received a copy of the GNU General Public License                             //
17 46b572b5 Leszek Koltunski
// along with Distorted.  If not, see <http://www.gnu.org/licenses/>.                            //
18 d333eb6b Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
19
20 809dcae3 Leszek Koltunski
package org.distorted.library.effectqueue;
21 6a06a912 Leszek Koltunski
22 fe82a979 Leszek Koltunski
import org.distorted.library.effect.Effect;
23 da9b3f07 Leszek Koltunski
import org.distorted.library.effect.EffectName;
24
import org.distorted.library.effect.EffectType;
25 7602a827 Leszek Koltunski
import org.distorted.library.main.DistortedLibrary;
26
import org.distorted.library.main.InternalMaster;
27 9ec374e8 Leszek Koltunski
import org.distorted.library.main.InternalStackFrameList;
28 a4835695 Leszek Koltunski
29 26a4e5f6 leszek
import java.util.ArrayList;
30 3417ab4e leszek
import java.util.HashMap;
31 6a06a912 Leszek Koltunski
32
///////////////////////////////////////////////////////////////////////////////////////////////////
33 809dcae3 Leszek Koltunski
/**
34
 * Not part of public API, do not document
35
 *
36
 * @y.exclude
37
 */
38 7602a827 Leszek Koltunski
public abstract class EffectQueue implements InternalMaster.Slave
39 6a06a912 Leszek Koltunski
  {
40 36d65d88 Leszek Koltunski
  public static final int MAIN_VARIANTS = 4; // Number of Main program variants (ATM 4: MAIN, MAIN OIT, PREPROCESS, FULL)
41 809dcae3 Leszek Koltunski
42 1418a5eb Leszek Koltunski
  private static final int CREATE = 0;
43
  private static final int ATTACH = 1;
44
  private static final int DETACH = 2;
45
  private static final int DETALL = 3;
46 26a4e5f6 leszek
47 96e3b88a Leszek Koltunski
  long mTime;
48 8bfefd68 Leszek Koltunski
  int mNumEffects;              // 'ToBe' will be more than mNumEffects if doWork() hasn't
49
  private int mNumEffectsToBe;  // added them yet (or less if it hasn't removed some yet)
50 96e3b88a Leszek Koltunski
  private int mNumFloatUniforms, mNumIntUniforms;
51 13981586 Leszek Koltunski
  Effect[] mEffects;
52 71887484 Leszek Koltunski
53 96e3b88a Leszek Koltunski
  float[] mFloatUniforms;
54
  int[] mIntUniforms;
55
56 30094332 Leszek Koltunski
  private static long mNextID = 1;
57 3417ab4e leszek
  private static HashMap<ArrayList<Long>,Long> mMapID = new HashMap<>(); // maps lists of Effect IDs (longs) to a
58
                                                                         // single long - the queue ID.
59 26a4e5f6 leszek
  private long mID;
60 15aa7d94 Leszek Koltunski
  private int mIndex;
61 06dbccad Leszek Koltunski
  private boolean mCreated;
62 71887484 Leszek Koltunski
63 f046b159 Leszek Koltunski
  private static class Job
64 26a4e5f6 leszek
    {
65
    int type;
66 96e3b88a Leszek Koltunski
    int num1, num2;
67 26a4e5f6 leszek
    boolean notify;
68
    Effect effect;
69
70 96e3b88a Leszek Koltunski
    Job(int t, int m1, int m2, boolean n, Effect e)
71 26a4e5f6 leszek
      {
72
      type  = t;
73 96e3b88a Leszek Koltunski
      num1  = m1;
74
      num2  = m2;
75 26a4e5f6 leszek
      notify= n;
76
      effect= e;
77
      }
78
    }
79
80
  private ArrayList<Job> mJobs = new ArrayList<>();
81
82 6a06a912 Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
83
   
84 96e3b88a Leszek Koltunski
  EffectQueue(int numFloatUniforms, int numIntUniforms, int index)
85 6a06a912 Leszek Koltunski
    {
86 96e3b88a Leszek Koltunski
    mCreated          = false;
87
    mTime             = 0;
88
    mID               = 0;
89
    mNumEffects       = 0;
90
    mNumEffectsToBe   = 0;
91
    mIndex            = index;
92
    mNumFloatUniforms = numFloatUniforms;
93
    mNumIntUniforms   = numIntUniforms;
94
95
    mJobs.add(new Job(CREATE,numFloatUniforms,numIntUniforms, false,null)); // create the stuff that depends on max number
96
    InternalMaster.newSlave(this);                                          // of uniforms later, on first render.
97 6a06a912 Leszek Koltunski
    }
98
99 f046b159 Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
100 0876b482 Leszek Koltunski
// this is not thread safe! The 'source' might change while we're copying it.
101 f046b159 Leszek Koltunski
102
  EffectQueue(EffectQueue source)
103
    {
104
    if( !source.mCreated )
105
      {
106 96e3b88a Leszek Koltunski
      mCreated          = false;
107
      mTime             = 0;
108
      mID               = 0;
109
      mNumEffects       = 0;
110
      mNumEffectsToBe   = 0;
111
      mIndex            = source.mIndex;
112
      mNumFloatUniforms = source.mNumFloatUniforms;
113
      mNumIntUniforms   = source.mNumIntUniforms;
114 f046b159 Leszek Koltunski
115
      int numJobs = source.mJobs.size();
116
117
      for(int i=0; i<numJobs; i++)
118
        {
119
        Job job = source.mJobs.get(i);
120
        mJobs.add(job);
121
        }
122
123
      InternalMaster.newSlave(this);
124
      }
125
    else
126
      {
127 96e3b88a Leszek Koltunski
      mCreated          = true;
128
      mTime             = source.mTime;
129
      mID               = source.mID;
130
      mNumEffects       = source.mNumEffects;
131
      mNumEffectsToBe   = source.mNumEffectsToBe;
132
      mIndex            = source.mIndex;
133
      mNumFloatUniforms = source.mNumFloatUniforms;
134
      mNumIntUniforms   = source.mNumIntUniforms;
135 f046b159 Leszek Koltunski
136 30094332 Leszek Koltunski
      int max = InternalStackFrameList.getMax(mIndex);
137 f046b159 Leszek Koltunski
138 96e3b88a Leszek Koltunski
      if( max>0 )
139 f046b159 Leszek Koltunski
        {
140 96e3b88a Leszek Koltunski
        mEffects       = new Effect[max];
141
        mFloatUniforms = new float[max*source.mNumFloatUniforms];
142
        mIntUniforms   = new int[max*source.mNumIntUniforms];
143
144
        if( mNumEffects>=0 )
145
          {
146
          System.arraycopy(source.mEffects, 0, mEffects, 0, mNumEffects);
147
          }
148
149
        if( mNumIntUniforms*mNumEffects>=0 )
150
          {
151
          System.arraycopy(source.mIntUniforms, 0, mIntUniforms, 0, mNumIntUniforms*mNumEffects);
152
          }
153 f046b159 Leszek Koltunski
        }
154
      }
155
    }
156
157 a0397f32 Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
158
159 20dbec0e Leszek Koltunski
  public static void allocateQueues(EffectQueue[] queues, EffectQueue[] from, int flags)
160 a0397f32 Leszek Koltunski
    {
161 20dbec0e Leszek Koltunski
    queues[0] = (flags & DistortedLibrary.CLONE_MATRIX     ) != 0 ? from[0] : new EffectQueueMatrix();
162
    queues[1] = (flags & DistortedLibrary.CLONE_VERTEX     ) != 0 ? from[1] : new EffectQueueVertex();
163
    queues[2] = (flags & DistortedLibrary.CLONE_FRAGMENT   ) != 0 ? from[2] : new EffectQueueFragment();
164
    queues[3] = (flags & DistortedLibrary.CLONE_POSTPROCESS) != 0 ? from[3] : new EffectQueuePostprocess();
165 a0397f32 Leszek Koltunski
    }
166
167
///////////////////////////////////////////////////////////////////////////////////////////////////
168
169 644c21f2 Leszek Koltunski
  public static void compute(EffectQueue[] queues, long currTime)
170 a0397f32 Leszek Koltunski
    {
171
    ((EffectQueueMatrix     )queues[0]).compute(currTime);
172 644c21f2 Leszek Koltunski
    ((EffectQueueVertex     )queues[1]).compute(currTime);
173
    ((EffectQueueFragment   )queues[2]).compute(currTime);
174 a0397f32 Leszek Koltunski
    ((EffectQueuePostprocess)queues[3]).compute(currTime);
175
    }
176
177
///////////////////////////////////////////////////////////////////////////////////////////////////
178
179 23b733db Leszek Koltunski
  public static void send(EffectQueue[] queues, float distance, float mipmap,
180 62c869ad Leszek Koltunski
                          float[] projection, float inflate, int variant )
181 a0397f32 Leszek Koltunski
    {
182 62c869ad Leszek Koltunski
    ((EffectQueueMatrix  )queues[0]).send(distance, mipmap, projection, variant);
183 a0397f32 Leszek Koltunski
    ((EffectQueueVertex  )queues[1]).send(inflate, variant);
184
    ((EffectQueueFragment)queues[2]).send(variant);
185
    }
186
187
///////////////////////////////////////////////////////////////////////////////////////////////////
188 f046b159 Leszek Koltunski
// variant: 0 --> MAIN  1 --> OIT  2 --> prePOST  3 --> FULL
189 a0397f32 Leszek Koltunski
190 809dcae3 Leszek Koltunski
  public static void getUniforms(int programH, int variant)
191 a0397f32 Leszek Koltunski
    {
192 809dcae3 Leszek Koltunski
    EffectQueueFragment.uniforms(programH,variant);
193
    EffectQueueVertex  .uniforms(programH,variant);
194
    EffectQueueMatrix  .uniforms(programH,variant);
195 a0397f32 Leszek Koltunski
    }
196
197 26a4e5f6 leszek
///////////////////////////////////////////////////////////////////////////////////////////////////
198 9455da17 Leszek Koltunski
// Every effect queue has an ID, which should be the same iff two queues hold the same effects.
199
// (this is a speedup: then both queues can be applied once, which seriously speeds up stuff -
200
// especially important in case of postprocessing)
201 26a4e5f6 leszek
202 d5b709df Leszek Koltunski
  private void regenerateID()
203 26a4e5f6 leszek
    {
204 3417ab4e leszek
    if( mNumEffects>0 )
205
      {
206
      ArrayList<Long> list = new ArrayList<>();
207
      for (int i = 0; i < mNumEffects; i++) list.add(mEffects[i].getID());
208
      Long id = mMapID.get(list);
209
210
      if( id!=null )
211
        {
212
        mID = id;
213
        }
214
      else
215
        {
216
        mMapID.put(list,mNextID);
217
        mID = mNextID++;
218
        }
219
      }
220
    else
221
      {
222
      mID = 0;
223
      }
224 c43abe6c Leszek Koltunski
    }
225
226 6a06a912 Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
227
228 809dcae3 Leszek Koltunski
  public long getID()
229 26a4e5f6 leszek
    {
230
    return mID;
231
    }
232
233
///////////////////////////////////////////////////////////////////////////////////////////////////
234 71887484 Leszek Koltunski
235 809dcae3 Leszek Koltunski
  public static boolean setMax(int index, int m)
236 71887484 Leszek Koltunski
    {
237 30094332 Leszek Koltunski
    return InternalStackFrameList.setMax(index, Math.max(m,0));
238 71887484 Leszek Koltunski
    }
239
240
///////////////////////////////////////////////////////////////////////////////////////////////////
241
242 809dcae3 Leszek Koltunski
  public static int getMax(int index)
243 71887484 Leszek Koltunski
    {
244 30094332 Leszek Koltunski
    return InternalStackFrameList.getMax(index);
245 71887484 Leszek Koltunski
    }
246
247 6a06a912 Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
248
249 809dcae3 Leszek Koltunski
  public static void onDestroy()
250 6a06a912 Leszek Koltunski
    {
251 3417ab4e leszek
    mNextID = 1;
252
    mMapID.clear();
253 6a06a912 Leszek Koltunski
    }
254
255
///////////////////////////////////////////////////////////////////////////////////////////////////
256 24804c15 Leszek Koltunski
// this assumes 0<=effect
257 6a06a912 Leszek Koltunski
258 9becf30e Leszek Koltunski
  private void removeNow(int pos)
259 6bb59aad Leszek Koltunski
    {
260 9becf30e Leszek Koltunski
    if( mNumEffects>pos )
261 26a4e5f6 leszek
      {
262 24804c15 Leszek Koltunski
      mNumEffects--;
263 9becf30e Leszek Koltunski
      System.arraycopy(mEffects, pos+1, mEffects, pos, mNumEffects-pos);
264
      System.arraycopy(mIntUniforms, mNumIntUniforms*(pos+1), mIntUniforms, mNumIntUniforms*pos, mNumIntUniforms*(mNumEffects-pos) );
265 24804c15 Leszek Koltunski
      mEffects[mNumEffects] = null;
266 26a4e5f6 leszek
      }
267
    }
268 6bb59aad Leszek Koltunski
269 9becf30e Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
270
271
  private void addNow(int pos, Effect effect)
272
    {
273
    mEffects[pos]                     = effect;
274
    mIntUniforms[mNumIntUniforms*pos] = effect.getName().ordinal();
275
276
    if( mIndex==EffectType.VERTEX.ordinal() )
277
      {
278
      effect.writeAssociations(mIntUniforms, mNumIntUniforms*pos+1, mNumIntUniforms*pos+3);
279
      }
280
    }
281
282 26a4e5f6 leszek
///////////////////////////////////////////////////////////////////////////////////////////////////
283
284 809dcae3 Leszek Koltunski
  public synchronized int removeByName(EffectName name)
285 26a4e5f6 leszek
    {
286 6b0b4f60 leszek
    int ret = 0;
287
288 6bb59aad Leszek Koltunski
    for(int i=0; i<mNumEffects; i++)
289
      {
290
      if( mEffects[i].getName() == name )
291
        {
292 96e3b88a Leszek Koltunski
        mJobs.add(new Job(DETACH,0,0,true,mEffects[i]));
293 6b0b4f60 leszek
        ret++;
294 6bb59aad Leszek Koltunski
        }
295
      }
296
297 6b0b4f60 leszek
    if( ret>0 )
298
      {
299 7602a827 Leszek Koltunski
      InternalMaster.newSlave(this);
300 6b0b4f60 leszek
      mNumEffectsToBe-=ret;
301
      }
302
303
    return ret;
304 6bb59aad Leszek Koltunski
    }
305
306 2ef5dd9e leszek
///////////////////////////////////////////////////////////////////////////////////////////////////
307
308 809dcae3 Leszek Koltunski
  public synchronized int removeById(long id)
309 2ef5dd9e leszek
    {
310
    for(int i=0; i<mNumEffects; i++)
311
      {
312
      if( mEffects[i].getID() == id )
313
        {
314 96e3b88a Leszek Koltunski
        mJobs.add(new Job(DETACH,0,0,true,mEffects[i]));
315 7602a827 Leszek Koltunski
        InternalMaster.newSlave(this);
316 26a4e5f6 leszek
        mNumEffectsToBe--;
317
        return 1;
318 2ef5dd9e leszek
        }
319
      }
320
321 26a4e5f6 leszek
    return 0;
322 2ef5dd9e leszek
    }
323
324 6bb59aad Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
325
326 809dcae3 Leszek Koltunski
  public synchronized int removeEffect(Effect effect)
327 6a06a912 Leszek Koltunski
    {
328
    for(int i=0; i<mNumEffects; i++)
329
      {
330 15aa7d94 Leszek Koltunski
      if( mEffects[i]==effect )
331 6a06a912 Leszek Koltunski
        {
332 96e3b88a Leszek Koltunski
        mJobs.add(new Job(DETACH,0,0,true,mEffects[i]));
333 7602a827 Leszek Koltunski
        InternalMaster.newSlave(this);
334 26a4e5f6 leszek
        mNumEffectsToBe--;
335
        return 1;
336 6a06a912 Leszek Koltunski
        }
337
      }
338
   
339 26a4e5f6 leszek
    return 0;
340 6a06a912 Leszek Koltunski
    }
341
342
///////////////////////////////////////////////////////////////////////////////////////////////////
343 0df17fad Leszek Koltunski
// we do want to notify Listeners if they called 'abortAll' themselves but don't want to notify
344
// them if it is the library itself which is releasing resources.
345
346 ceed2df6 Leszek Koltunski
  public synchronized int removeAll(boolean notify)
347 6a06a912 Leszek Koltunski
    {
348 96e3b88a Leszek Koltunski
    mJobs.add(new Job(DETALL,0,0,notify,null));
349 7602a827 Leszek Koltunski
    InternalMaster.newSlave(this);
350 26a4e5f6 leszek
    mNumEffectsToBe = 0;
351
    return mNumEffects;
352
    }
353 d07f2950 Leszek Koltunski
354 26a4e5f6 leszek
///////////////////////////////////////////////////////////////////////////////////////////////////
355
  
356 809dcae3 Leszek Koltunski
  public boolean add(Effect effect)
357 26a4e5f6 leszek
    {
358 30094332 Leszek Koltunski
    if( InternalStackFrameList.getMax(mIndex)>mNumEffectsToBe || !mCreated )
359 6a06a912 Leszek Koltunski
      {
360 96e3b88a Leszek Koltunski
      mJobs.add(new Job(ATTACH,-1,0,false,effect));
361 34e43b0a Leszek Koltunski
      InternalMaster.newSlave(this);
362
      mNumEffectsToBe++;
363
      return true;
364
      }
365
366
    return false;
367
    }
368
369
///////////////////////////////////////////////////////////////////////////////////////////////////
370
371
  public boolean add(Effect effect, int position)
372
    {
373 30094332 Leszek Koltunski
    if( InternalStackFrameList.getMax(mIndex)>mNumEffectsToBe || !mCreated )
374 34e43b0a Leszek Koltunski
      {
375 96e3b88a Leszek Koltunski
      mJobs.add(new Job(ATTACH,position,0,false,effect));
376 7602a827 Leszek Koltunski
      InternalMaster.newSlave(this);
377 26a4e5f6 leszek
      mNumEffectsToBe++;
378
      return true;
379 d07f2950 Leszek Koltunski
      }
380
381 26a4e5f6 leszek
    return false;
382 6a06a912 Leszek Koltunski
    }
383
384 106ae28d Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
385
386
  public int getNumEffects()
387
    {
388
    return mNumEffects;
389
    }
390
391 1fad573e Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
392
393
  public int getNumEffectsToBe()
394
    {
395
    return mNumEffectsToBe;
396
    }
397
398 9dacabea Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
399
400
  public Effect getEffect(int position)
401
    {
402
    if( position>=0 && position< mNumEffects )
403
      {
404
      return mEffects[position];
405
      }
406
    else
407
      {
408
      android.util.Log.e("queue", "getEffect: out of range "+position);
409
      return null;
410
      }
411
    }
412
413 6a06a912 Leszek Koltunski
///////////////////////////////////////////////////////////////////////////////////////////////////
414 809dcae3 Leszek Koltunski
415 26a4e5f6 leszek
  public void doWork()
416 6a06a912 Leszek Koltunski
    {
417 11845a9e Leszek Koltunski
    boolean changed = false;
418 26a4e5f6 leszek
    int num = mJobs.size();
419
    Job job;
420 15aa7d94 Leszek Koltunski
421 26a4e5f6 leszek
    for(int i=0; i<num; i++)
422 6a06a912 Leszek Koltunski
      {
423 26a4e5f6 leszek
      job = mJobs.remove(0);
424 15aa7d94 Leszek Koltunski
425 26a4e5f6 leszek
      switch(job.type)
426
        {
427 30094332 Leszek Koltunski
        case CREATE: int max = InternalStackFrameList.getMax(mIndex);
428 1418a5eb Leszek Koltunski
                     if( max>0 )
429
                       {
430 96e3b88a Leszek Koltunski
                       mEffects       = new Effect[max];
431
                       mFloatUniforms = new float[max*job.num1];
432
                       mIntUniforms   = new int[max*job.num2];
433 1418a5eb Leszek Koltunski
                       }
434 06dbccad Leszek Koltunski
                     mCreated = true;
435
436 1418a5eb Leszek Koltunski
                     break;
437 30094332 Leszek Koltunski
        case ATTACH: if( InternalStackFrameList.getMax(mIndex)>mNumEffects ) // it is possible that we have first
438
                       {                                                     // added effects and then lowered mMax
439 96e3b88a Leszek Koltunski
                       int position = job.num1;
440 34e43b0a Leszek Koltunski
441 9becf30e Leszek Koltunski
                       if( position<0 )
442 34e43b0a Leszek Koltunski
                         {
443 9becf30e Leszek Koltunski
                         addNow(mNumEffects,job.effect);
444 106ae28d Leszek Koltunski
                         mNumEffects++;
445
                         changed = true;
446 34e43b0a Leszek Koltunski
                         }
447 9becf30e Leszek Koltunski
                       else if( position<=mNumEffects )
448 34e43b0a Leszek Koltunski
                         {
449 24804c15 Leszek Koltunski
                         System.arraycopy(mEffects    , position, mEffects    , position+1, mNumEffects-position);
450
                         System.arraycopy(mIntUniforms, mNumIntUniforms*position, mIntUniforms, mNumIntUniforms*(position+1), mNumIntUniforms*(mNumEffects-position) );
451 9becf30e Leszek Koltunski
                         addNow(position,job.effect);
452 106ae28d Leszek Koltunski
                         mNumEffects++;
453
                         changed = true;
454
                         }
455 1418a5eb Leszek Koltunski
                       }
456
                     else
457
                       {
458
                       android.util.Log.e("queue", "failed to add effect "+job.effect.getName());
459
                       }
460 26a4e5f6 leszek
                     break;
461 1418a5eb Leszek Koltunski
        case DETACH: for(int j=0; j<mNumEffects; j++)
462 6b0b4f60 leszek
                       {
463
                       if (mEffects[j] == job.effect)
464
                         {
465 9becf30e Leszek Koltunski
                         removeNow(j);
466 11845a9e Leszek Koltunski
                         changed = true;
467 6b0b4f60 leszek
                         break;
468
                         }
469
                       }
470 26a4e5f6 leszek
                     break;
471
        case DETALL: for(int j=0; j<mNumEffects; j++ )
472
                       {
473 11845a9e Leszek Koltunski
                       changed = true;
474 26a4e5f6 leszek
                       mEffects[j] = null;
475
                       }
476
477
                     mNumEffects= 0;
478
                     break;
479
        }
480 6a06a912 Leszek Koltunski
      }
481 d425545a Leszek Koltunski
482 d5b709df Leszek Koltunski
    if( changed && mIndex==EffectType.POSTPROCESS.ordinal() ) regenerateID();
483 6a06a912 Leszek Koltunski
    }
484
  }