Revision 0f10a0b6
Added by Leszek Koltunski about 4 years ago
src/main/java/org/distorted/library/effect/VertexEffectDistort.java | ||
---|---|---|
125 | 125 |
{ |
126 | 126 |
addEffect(EffectName.DISTORT, |
127 | 127 |
|
128 |
"vec3 center = vUniforms[effect+1].yzw; \n" |
|
129 |
+ "vec3 ps = center-v; \n" |
|
128 |
"vec3 ps = vUniforms[effect+1].yzw - v; \n" |
|
130 | 129 |
+ "vec3 force = vUniforms[effect].xyz; \n" |
131 | 130 |
+ "vec4 region= vUniforms[effect+2]; \n" |
132 |
+ "float d = degree(region,center,ps); \n"
|
|
131 |
+ "float d = degree(region,ps); \n"
|
|
133 | 132 |
|
134 | 133 |
+ "if( d>0.0 ) \n" |
135 | 134 |
+ " { \n" |
Also available in: Unified diff
A lot of changes.
1) main vertex shader: remove support for degree_object. This functionality will hopefully come back when we introduce other than circular regions.
2) MeshBase: remove the need to set a Bounding box (this is the point of the whole thing - we wanted to get rid of this so that the advances in MeshJoined will be easier)
3) Set ground for removing the MeshBase.setStretch / getStretch (another thing needed to advance MeshJoined )
4) since we removed the Bounding box, we need to change the DEFORN effect to have 1 additional parameter, the 'radius' which takes over the function of the bounding box in the vertex shader.
5) since the'res no bounding box, simplify the postprocessing Halo (remove EffectQueueMatrix.magnify() )
6) adjust applications.
After this we will hopefully be ready to introduce MeshBase.preApply(VertexEffect), i.e. bending several simple Meshes with any VertexEffect - including the freshly-introduced PseudoMatrix-Vertex effects like VertexEffectScale - and then combining them into one MeshJoined.