1 |
08f92d82
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
2 |
|
|
// Copyright 2016 Leszek Koltunski //
|
3 |
|
|
// //
|
4 |
|
|
// This file is part of Distorted. //
|
5 |
|
|
// //
|
6 |
|
|
// Distorted is free software: you can redistribute it and/or modify //
|
7 |
|
|
// 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 |
|
|
// Distorted is distributed in the hope that it will be useful, //
|
12 |
|
|
// 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 |
|
|
// along with Distorted. If not, see <http://www.gnu.org/licenses/>. //
|
18 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
19 |
|
|
|
20 |
76a81b6a
|
Leszek Koltunski
|
package org.distorted.examples.effects3d;
|
21 |
08f92d82
|
Leszek Koltunski
|
|
22 |
|
|
import android.graphics.Bitmap;
|
23 |
|
|
import android.graphics.BitmapFactory;
|
24 |
|
|
import android.opengl.GLSurfaceView;
|
25 |
|
|
|
26 |
|
|
import org.distorted.examples.R;
|
27 |
06366d12
|
Leszek Koltunski
|
import org.distorted.library.effect.MatrixEffectMove;
|
28 |
|
|
import org.distorted.library.effect.MatrixEffectQuaternion;
|
29 |
|
|
import org.distorted.library.effect.MatrixEffectScale;
|
30 |
01782e85
|
Leszek Koltunski
|
import org.distorted.library.main.Distorted;
|
31 |
|
|
import org.distorted.library.main.DistortedEffects;
|
32 |
|
|
import org.distorted.library.main.DistortedNode;
|
33 |
|
|
import org.distorted.library.main.DistortedScreen;
|
34 |
|
|
import org.distorted.library.main.DistortedTexture;
|
35 |
57d7fdba
|
Leszek Koltunski
|
import org.distorted.library.mesh.MeshBase;
|
36 |
107e4b72
|
Leszek Koltunski
|
import org.distorted.library.mesh.MeshFlat;
|
37 |
08f92d82
|
Leszek Koltunski
|
import org.distorted.library.type.Static3D;
|
38 |
|
|
import org.distorted.library.type.Static4D;
|
39 |
|
|
|
40 |
|
|
import java.io.IOException;
|
41 |
|
|
import java.io.InputStream;
|
42 |
|
|
|
43 |
|
|
import javax.microedition.khronos.egl.EGLConfig;
|
44 |
|
|
import javax.microedition.khronos.opengles.GL10;
|
45 |
|
|
|
46 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
47 |
|
|
|
48 |
76a81b6a
|
Leszek Koltunski
|
class Effects3DRenderer implements GLSurfaceView.Renderer
|
49 |
08f92d82
|
Leszek Koltunski
|
{
|
50 |
f86c9fb5
|
Leszek Koltunski
|
private static final float FOV = 30.0f;
|
51 |
af662543
|
leszek
|
private static final float NEAR = 0.1f;
|
52 |
|
|
|
53 |
08f92d82
|
Leszek Koltunski
|
private GLSurfaceView mView;
|
54 |
f6d884d5
|
Leszek Koltunski
|
private DistortedTexture mObjectTexture, mBackgroundTexture, mCenterTexture, mRegionTexture;
|
55 |
d218d64e
|
leszek
|
private DistortedScreen mScreen;
|
56 |
fe59d375
|
Leszek Koltunski
|
private DistortedNode mCenterNode, mRegionNode;
|
57 |
06366d12
|
Leszek Koltunski
|
private int mObjWidth, mObjHeight;
|
58 |
|
|
private Static3D mCenterPoint, mRegionPoint, mRegionScalePoint;
|
59 |
fec27f16
|
Leszek Koltunski
|
private Static3D mRotateCen, mMoveObject, mScaleObject, mMoveCenter, mScaleCenter, mMoveRegion, mMoveBackground, mScaleBackground;
|
60 |
|
|
private boolean mShowingCenter=false;
|
61 |
|
|
private boolean mShowingRegion=false;
|
62 |
6f779cd4
|
Leszek Koltunski
|
private float mFactorObj, mFactorReg;
|
63 |
65f622c1
|
Leszek Koltunski
|
private int mWidth;
|
64 |
950511ed
|
Leszek Koltunski
|
|
65 |
833685d0
|
Leszek Koltunski
|
Static4D mQuat1, mQuat2;
|
66 |
d2337a3a
|
Leszek Koltunski
|
int mScreenMin;
|
67 |
833685d0
|
Leszek Koltunski
|
|
68 |
08f92d82
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
69 |
|
|
|
70 |
4f8ca8ff
|
Leszek Koltunski
|
Effects3DRenderer(GLSurfaceView v)
|
71 |
08f92d82
|
Leszek Koltunski
|
{
|
72 |
|
|
mView = v;
|
73 |
d40cfeb2
|
Leszek Koltunski
|
|
74 |
348dbeea
|
Leszek Koltunski
|
Effects3DActivity2 act = (Effects3DActivity2)v.getContext();
|
75 |
e8b6aa95
|
Leszek Koltunski
|
|
76 |
06366d12
|
Leszek Koltunski
|
mRotateCen = new Static3D(0,0,0);
|
77 |
|
|
mMoveObject = new Static3D(0,0,0);
|
78 |
fec27f16
|
Leszek Koltunski
|
mScaleObject = new Static3D(1,1,1);
|
79 |
06366d12
|
Leszek Koltunski
|
mMoveCenter = new Static3D(0,0,0);
|
80 |
|
|
mScaleCenter = new Static3D(1,1,1);
|
81 |
|
|
mMoveRegion = new Static3D(0,0,0);
|
82 |
|
|
mMoveBackground = new Static3D(0,0,0);
|
83 |
|
|
mScaleBackground= new Static3D(1,1,1);
|
84 |
|
|
|
85 |
f6d884d5
|
Leszek Koltunski
|
mObjectTexture = act.getTexture();
|
86 |
7451c98a
|
Leszek Koltunski
|
mBackgroundTexture = new DistortedTexture(100,100);
|
87 |
|
|
mCenterTexture = new DistortedTexture(100,100);
|
88 |
|
|
mRegionTexture = new DistortedTexture(100,100);
|
89 |
06366d12
|
Leszek Koltunski
|
|
90 |
|
|
DistortedEffects objectEffects = act.getEffects();
|
91 |
|
|
DistortedEffects backgroundEffects = new DistortedEffects();
|
92 |
|
|
DistortedEffects centerEffects = new DistortedEffects();
|
93 |
|
|
DistortedEffects regionEffects = new DistortedEffects();
|
94 |
f6d884d5
|
Leszek Koltunski
|
|
95 |
57d7fdba
|
Leszek Koltunski
|
MeshBase mesh = act.getMesh();
|
96 |
aac5c562
|
leszek
|
MeshFlat quad = new MeshFlat(1,1);
|
97 |
|
|
|
98 |
f6d884d5
|
Leszek Koltunski
|
mObjWidth = mObjectTexture.getWidth();
|
99 |
|
|
mObjHeight= mObjectTexture.getHeight();
|
100 |
d40cfeb2
|
Leszek Koltunski
|
|
101 |
833685d0
|
Leszek Koltunski
|
mQuat1 = new Static4D(0,0,0,1); // unity
|
102 |
|
|
mQuat2 = new Static4D(0,0,0,1); // quaternions
|
103 |
|
|
|
104 |
24991bc2
|
Leszek Koltunski
|
mCenterPoint= new Static3D(0,0,0);
|
105 |
|
|
mRegionPoint= new Static3D(0,0,0);
|
106 |
6f779cd4
|
Leszek Koltunski
|
mRegionScalePoint = new Static3D(0,0,0);
|
107 |
392e16fd
|
Leszek Koltunski
|
|
108 |
06366d12
|
Leszek Koltunski
|
mCenterNode = new DistortedNode(mCenterTexture, centerEffects, quad);
|
109 |
|
|
mRegionNode = new DistortedNode(mRegionTexture, regionEffects, quad);
|
110 |
fe59d375
|
Leszek Koltunski
|
|
111 |
e4330c89
|
Leszek Koltunski
|
mScreen = new DistortedScreen();
|
112 |
af662543
|
leszek
|
mScreen.setProjection(FOV, NEAR);
|
113 |
06366d12
|
Leszek Koltunski
|
mScreen.attach(mBackgroundTexture, backgroundEffects, quad );
|
114 |
65f622c1
|
Leszek Koltunski
|
mScreen.attach(mObjectTexture , objectEffects , mesh );
|
115 |
06366d12
|
Leszek Koltunski
|
|
116 |
|
|
int regionSize = mRegionTexture.getWidth();
|
117 |
|
|
mRotateCen = new Static3D(0 ,0, 0);
|
118 |
|
|
|
119 |
|
|
MatrixEffectQuaternion quat1cen = new MatrixEffectQuaternion(mQuat1, mRotateCen);
|
120 |
|
|
MatrixEffectQuaternion quat2cen = new MatrixEffectQuaternion(mQuat2, mRotateCen);
|
121 |
|
|
MatrixEffectMove centerMove = new MatrixEffectMove(mCenterPoint);
|
122 |
|
|
|
123 |
|
|
centerEffects.apply(quat1cen);
|
124 |
|
|
centerEffects.apply(quat2cen);
|
125 |
|
|
centerEffects.apply( new MatrixEffectMove(mMoveCenter) );
|
126 |
|
|
centerEffects.apply( centerMove );
|
127 |
|
|
centerEffects.apply( new MatrixEffectScale(mScaleCenter) );
|
128 |
|
|
|
129 |
|
|
regionEffects.apply(quat1cen);
|
130 |
|
|
regionEffects.apply(quat2cen);
|
131 |
|
|
regionEffects.apply( new MatrixEffectMove(mMoveRegion) );
|
132 |
|
|
regionEffects.apply( centerMove );
|
133 |
|
|
regionEffects.apply( new MatrixEffectMove(mRegionPoint) );
|
134 |
|
|
regionEffects.apply( new MatrixEffectScale(mRegionScalePoint) );
|
135 |
|
|
regionEffects.apply( new MatrixEffectMove(new Static3D( -regionSize/2 , -regionSize/2 , 0)) );
|
136 |
|
|
|
137 |
65f622c1
|
Leszek Koltunski
|
resetMatrixEffects();
|
138 |
|
|
|
139 |
06366d12
|
Leszek Koltunski
|
// quite tricky: move the background exactly to the FAR plane! (see DistortedOutputSurface.setProjection() )
|
140 |
|
|
backgroundEffects.apply(new MatrixEffectMove(mMoveBackground) );
|
141 |
|
|
backgroundEffects.apply(new MatrixEffectScale(mScaleBackground) );
|
142 |
f338550a
|
leszek
|
}
|
143 |
|
|
|
144 |
65f622c1
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
145 |
|
|
|
146 |
|
|
void resetMatrixEffects()
|
147 |
|
|
{
|
148 |
|
|
Effects3DActivity2 act = (Effects3DActivity2)mView.getContext();
|
149 |
|
|
|
150 |
|
|
DistortedEffects objectEffects= act.getEffects();
|
151 |
57d7fdba
|
Leszek Koltunski
|
MeshBase mesh = act.getMesh();
|
152 |
65f622c1
|
Leszek Koltunski
|
|
153 |
|
|
int objDepth = mObjectTexture.getDepth(mesh);
|
154 |
|
|
|
155 |
|
|
Static3D rotateObj = new Static3D( (float)mObjWidth/2, (float)mObjHeight/2, -(float)objDepth/2 );
|
156 |
|
|
|
157 |
|
|
MatrixEffectQuaternion quat1obj = new MatrixEffectQuaternion(mQuat1, rotateObj);
|
158 |
|
|
MatrixEffectQuaternion quat2obj = new MatrixEffectQuaternion(mQuat2, rotateObj);
|
159 |
|
|
|
160 |
|
|
objectEffects.apply( new MatrixEffectMove(mMoveObject));
|
161 |
|
|
objectEffects.apply( new MatrixEffectScale(mScaleObject) );
|
162 |
|
|
objectEffects.apply(quat1obj);
|
163 |
|
|
objectEffects.apply(quat2obj);
|
164 |
|
|
|
165 |
|
|
mQuat1.set(0,0,0,1);
|
166 |
|
|
mQuat2.set(0,0,0,1);
|
167 |
|
|
}
|
168 |
|
|
|
169 |
f338550a
|
leszek
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
170 |
|
|
|
171 |
0ab55f0c
|
Leszek Koltunski
|
void showRegionAndCenter(boolean showRegion, boolean showCenter)
|
172 |
f338550a
|
leszek
|
{
|
173 |
0ab55f0c
|
Leszek Koltunski
|
if( mShowingCenter!=showCenter )
|
174 |
98c04ab8
|
leszek
|
{
|
175 |
0ab55f0c
|
Leszek Koltunski
|
if( showCenter ) mScreen.attach(mCenterNode);
|
176 |
|
|
else mScreen.detach(mCenterNode);
|
177 |
|
|
|
178 |
|
|
mShowingCenter = showCenter;
|
179 |
|
|
}
|
180 |
|
|
|
181 |
|
|
if( mShowingRegion!=showRegion )
|
182 |
|
|
{
|
183 |
|
|
if( showRegion ) mScreen.attach(mRegionNode);
|
184 |
|
|
else mScreen.detach(mRegionNode);
|
185 |
|
|
|
186 |
|
|
mShowingRegion = showRegion;
|
187 |
98c04ab8
|
leszek
|
}
|
188 |
950511ed
|
Leszek Koltunski
|
}
|
189 |
|
|
|
190 |
65f622c1
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
191 |
|
|
|
192 |
|
|
public int getWidth()
|
193 |
|
|
{
|
194 |
|
|
return mWidth;
|
195 |
|
|
}
|
196 |
|
|
|
197 |
950511ed
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
198 |
|
|
|
199 |
334c13fa
|
Leszek Koltunski
|
void setCenter(float x, float y, float z)
|
200 |
950511ed
|
Leszek Koltunski
|
{
|
201 |
334c13fa
|
Leszek Koltunski
|
mCenterPoint.set(mFactorObj*x,mFactorObj*y,mFactorObj*z);
|
202 |
08f92d82
|
Leszek Koltunski
|
}
|
203 |
|
|
|
204 |
6f779cd4
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
205 |
|
|
|
206 |
4f8ca8ff
|
Leszek Koltunski
|
void setRegion(float x, float y, float r)
|
207 |
6f779cd4
|
Leszek Koltunski
|
{
|
208 |
f6d884d5
|
Leszek Koltunski
|
mFactorReg = 2*mFactorObj*r/mRegionTexture.getWidth();
|
209 |
fec27f16
|
Leszek Koltunski
|
mRegionPoint.set(mFactorObj*x,-mFactorObj*y,0);
|
210 |
9ae05f6c
|
Leszek Koltunski
|
mRegionScalePoint.set(mFactorReg,mFactorReg,mFactorReg);
|
211 |
6f779cd4
|
Leszek Koltunski
|
}
|
212 |
|
|
|
213 |
bddd4b2d
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
214 |
|
|
|
215 |
|
|
void useOIT(boolean use)
|
216 |
|
|
{
|
217 |
|
|
mScreen.setOrderIndependentTransparency(use);
|
218 |
|
|
}
|
219 |
|
|
|
220 |
08f92d82
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
221 |
56cbe1cf
|
Leszek Koltunski
|
|
222 |
|
|
public void onDrawFrame(GL10 glUnused)
|
223 |
08f92d82
|
Leszek Koltunski
|
{
|
224 |
fe59d375
|
Leszek Koltunski
|
mScreen.render(System.currentTimeMillis());
|
225 |
08f92d82
|
Leszek Koltunski
|
}
|
226 |
|
|
|
227 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
228 |
56cbe1cf
|
Leszek Koltunski
|
|
229 |
|
|
public void onSurfaceChanged(GL10 glUnused, int width, int height)
|
230 |
08f92d82
|
Leszek Koltunski
|
{
|
231 |
65f622c1
|
Leszek Koltunski
|
mWidth = width;
|
232 |
833685d0
|
Leszek Koltunski
|
mScreenMin = width<height ? width:height;
|
233 |
752c6b57
|
Leszek Koltunski
|
|
234 |
950511ed
|
Leszek Koltunski
|
float factorCen;
|
235 |
f6d884d5
|
Leszek Koltunski
|
int centerSize = mCenterTexture.getWidth();
|
236 |
|
|
int regionSize = mRegionTexture.getWidth();
|
237 |
6f779cd4
|
Leszek Koltunski
|
|
238 |
261fe5bd
|
Leszek Koltunski
|
if( width*mObjHeight > height*mObjWidth ) // screen is more 'horizontal' than the Object
|
239 |
d40cfeb2
|
Leszek Koltunski
|
{
|
240 |
f86c9fb5
|
Leszek Koltunski
|
mFactorObj = (0.70f*height)/mObjHeight;
|
241 |
950511ed
|
Leszek Koltunski
|
factorCen = (0.08f*height)/centerSize;
|
242 |
261fe5bd
|
Leszek Koltunski
|
}
|
243 |
d40cfeb2
|
Leszek Koltunski
|
else
|
244 |
|
|
{
|
245 |
f86c9fb5
|
Leszek Koltunski
|
mFactorObj = (0.70f*width)/mObjWidth;
|
246 |
950511ed
|
Leszek Koltunski
|
factorCen = (0.08f*width)/centerSize;
|
247 |
d40cfeb2
|
Leszek Koltunski
|
}
|
248 |
|
|
|
249 |
348dbeea
|
Leszek Koltunski
|
Effects3DActivity2 act = (Effects3DActivity2)mView.getContext();
|
250 |
fec27f16
|
Leszek Koltunski
|
mCenterPoint.set(mFactorObj*act.getCenterX(),+mFactorObj*act.getCenterY(),0);
|
251 |
|
|
mRegionPoint.set(mFactorObj*act.getRegionX(),-mFactorObj*act.getRegionY(),0);
|
252 |
17600407
|
Leszek Koltunski
|
mFactorReg = 2*mFactorObj*act.getRegionR()/regionSize;
|
253 |
9ae05f6c
|
Leszek Koltunski
|
mRegionScalePoint.set(mFactorReg,mFactorReg,mFactorReg);
|
254 |
06366d12
|
Leszek Koltunski
|
mMoveObject.set( (width-mFactorObj*mObjWidth)/2 , (height-mFactorObj*mObjHeight)/2 , 0 );
|
255 |
|
|
mRotateCen.set(width/2,height/2, 0);
|
256 |
fec27f16
|
Leszek Koltunski
|
mScaleObject.set(mFactorObj,mFactorObj,mFactorObj);
|
257 |
06366d12
|
Leszek Koltunski
|
mMoveCenter.set( (width -factorCen*centerSize-mFactorObj*mObjWidth )/2 ,
|
258 |
|
|
(height-factorCen*centerSize-mFactorObj*mObjHeight)/2 , 15 );
|
259 |
|
|
mScaleCenter.set(factorCen,factorCen,factorCen);
|
260 |
|
|
mMoveRegion.set( (width -mFactorObj*mObjWidth )/2 ,(height-mFactorObj*mObjHeight)/2 , 12 );
|
261 |
fce25d04
|
leszek
|
|
262 |
|
|
int backgroundSize = mBackgroundTexture.getWidth();
|
263 |
|
|
float factorBackX = ((float)width)/backgroundSize;
|
264 |
|
|
float factorBackY = ((float)height)/backgroundSize;
|
265 |
|
|
|
266 |
|
|
// quite tricky: move the background exactly to the FAR plane! (see DistortedOutputSurface.setProjection() )
|
267 |
06366d12
|
Leszek Koltunski
|
mMoveBackground.set( -width/2, -height/2, -0.9f*height*(1.0f-NEAR)/(2.0f*(float)Math.tan(FOV*Math.PI/360)) );
|
268 |
|
|
mScaleBackground.set( 2*factorBackX, 2*factorBackY, 1.0f );
|
269 |
fce25d04
|
leszek
|
|
270 |
392e16fd
|
Leszek Koltunski
|
mScreen.resize(width, height);
|
271 |
08f92d82
|
Leszek Koltunski
|
}
|
272 |
|
|
|
273 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
274 |
56cbe1cf
|
Leszek Koltunski
|
|
275 |
|
|
public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
|
276 |
08f92d82
|
Leszek Koltunski
|
{
|
277 |
348dbeea
|
Leszek Koltunski
|
Effects3DActivity2 act = (Effects3DActivity2)mView.getContext();
|
278 |
bcc8e016
|
Leszek Koltunski
|
|
279 |
f6d884d5
|
Leszek Koltunski
|
InputStream isB = act.getResources().openRawResource(R.raw.water);
|
280 |
|
|
InputStream isC = act.getResources().openRawResource(R.raw.center);
|
281 |
|
|
InputStream isR = act.getResources().openRawResource(R.raw.region);
|
282 |
71d8ad03
|
Leszek Koltunski
|
|
283 |
f6d884d5
|
Leszek Koltunski
|
Bitmap bitmapB,bitmapC,bitmapR;
|
284 |
08f92d82
|
Leszek Koltunski
|
|
285 |
|
|
try
|
286 |
|
|
{
|
287 |
f6d884d5
|
Leszek Koltunski
|
bitmapB = BitmapFactory.decodeStream(isB);
|
288 |
|
|
bitmapC = BitmapFactory.decodeStream(isC);
|
289 |
|
|
bitmapR = BitmapFactory.decodeStream(isR);
|
290 |
71d8ad03
|
Leszek Koltunski
|
}
|
291 |
08f92d82
|
Leszek Koltunski
|
finally
|
292 |
|
|
{
|
293 |
|
|
try
|
294 |
|
|
{
|
295 |
f6d884d5
|
Leszek Koltunski
|
isB.close();
|
296 |
|
|
isC.close();
|
297 |
|
|
isR.close();
|
298 |
9167cfd4
|
Leszek Koltunski
|
}
|
299 |
08f92d82
|
Leszek Koltunski
|
catch(IOException e) { }
|
300 |
|
|
}
|
301 |
|
|
|
302 |
f6d884d5
|
Leszek Koltunski
|
mObjectTexture.setTexture( act.getBitmap() );
|
303 |
|
|
mBackgroundTexture.setTexture(bitmapB);
|
304 |
|
|
mCenterTexture.setTexture(bitmapC);
|
305 |
|
|
mRegionTexture.setTexture(bitmapR);
|
306 |
950511ed
|
Leszek Koltunski
|
|
307 |
d9c55dbe
|
Leszek Koltunski
|
Effects3DEffect.enableAllEffects();
|
308 |
cdcbdbe3
|
Leszek Koltunski
|
|
309 |
08f92d82
|
Leszek Koltunski
|
try
|
310 |
|
|
{
|
311 |
76f9798b
|
Leszek Koltunski
|
Distorted.onCreate(mView.getContext());
|
312 |
08f92d82
|
Leszek Koltunski
|
}
|
313 |
|
|
catch(Exception ex)
|
314 |
|
|
{
|
315 |
76a81b6a
|
Leszek Koltunski
|
android.util.Log.e("Effects3D", ex.getMessage() );
|
316 |
08f92d82
|
Leszek Koltunski
|
}
|
317 |
|
|
}
|
318 |
56cbe1cf
|
Leszek Koltunski
|
}
|