Skip to content

Commit

Permalink
Fixes #2279 by attaching size/position to the trace elements.
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexisDrogoul
AlexisDrogoul committed Feb 21, 2022
1 parent 9f59fce commit 8147c34
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 104 deletions.
2 changes: 1 addition & 1 deletion ummisco.gama.opengl/src/ummisco/gama/opengl/scene/ModelScene.java
View file
Expand Up @@ -334,7 +334,7 @@ public void invalidateLayers() {
* Layer offset changed.
*/
public void layerOffsetChanged() {
layers.forEach((name, layer) -> { if (layer.canSplit()) { layer.computeOffset(); } });
layers.forEach((name, layer) -> { if (layer.canSplit()) { layer.recomputeOffset(); } });

}

Expand Down
10 changes: 5 additions & 5 deletions ummisco.gama.opengl/src/ummisco/gama/opengl/scene/layers/AxesLayerObject.java
View file
@@ -1,12 +1,12 @@
/*******************************************************************************************************
*
* AxesLayerObject.java, in ummisco.gama.opengl, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
* AxesLayerObject.java, in ummisco.gama.opengl, is part of the source code of the GAMA modeling and simulation platform
* (v.1.8.2).
*
* (c) 2007-2022 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
*
********************************************************************************************************/
package ummisco.gama.opengl.scene.layers;

Expand Down Expand Up @@ -83,7 +83,7 @@ public class AxesLayerObject extends StaticLayerObject.World {
public AxesLayerObject(final IOpenGLRenderer renderer) {
super(renderer);
// Addition to fix #2227
scale.setLocation(DEFAULT_SCALE);
currentList.scale.setLocation(DEFAULT_SCALE);
final double max = renderer.getMaxEnvDim();
arrow = (GamaShape) buildCone3D(max / 20, max / 8, ORIGIN);
dirs = new GamaPoint[] { new GamaPoint(max / 2, 0, 0), new GamaPoint(0, max / 2, 0),
Expand All @@ -94,7 +94,7 @@ public AxesLayerObject(final IOpenGLRenderer renderer) {
@Override
public void setScale(final GamaPoint s) {
if (s == null) {
scale = DEFAULT_SCALE;
currentList.scale.setLocation(DEFAULT_SCALE);
} else {
super.setScale(s);
}
Expand Down
167 changes: 109 additions & 58 deletions ummisco.gama.opengl/src/ummisco/gama/opengl/scene/layers/LayerObject.java
View file
@@ -1,18 +1,17 @@
/*******************************************************************************************************
*
* LayerObject.java, in ummisco.gama.opengl, is part of the source code of the
* GAMA modeling and simulation platform (v.1.8.2).
* LayerObject.java, in ummisco.gama.opengl, is part of the source code of the GAMA modeling and simulation platform
* (v.1.8.2).
*
* (c) 2007-2022 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
*
* Visit https://github.com/gama-platform/gama for license information and contacts.
*
*
********************************************************************************************************/
package ummisco.gama.opengl.scene.layers;

import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;

import org.locationtech.jts.geom.Geometry;

Expand Down Expand Up @@ -57,11 +56,64 @@ public class LayerObject {
/** The Constant NULL_SCALE. */
final static GamaPoint NULL_SCALE = new GamaPoint(1, 1, 1);

/** The offset. */
volatile GamaPoint offset = new GamaPoint(NULL_OFFSET);
/**
* The Class Trace.
*/
class Trace extends ArrayList<AbstractObject<?, ?>> {
/** The offset. */
final GamaPoint offset = new GamaPoint(NULL_OFFSET);
/** The scale. */
final GamaPoint scale = new GamaPoint(NULL_SCALE);

/**
* Instantiates a new trace.
*/
Trace() {
computeOffset();
computeScale();
}

/**
* Compute scale.
*
* @return the gama point
*/
public void computeScale() {
LayerObject.this.computeScale(this);
}

/** The scale. */
volatile GamaPoint scale = new GamaPoint(NULL_SCALE);
/**
* Compute offset.
*
* @return the gama point
*/
public void computeOffset() {
LayerObject.this.computeOffset(this);
}

/**
* Gets the offset.
*
* @return the offset
*/
public GamaPoint getOffset() { return offset; }

/**
* Gets the scale.
*
* @return the scale
*/
public GamaPoint getScale() { return scale; }

/**
* As array.
*
* @return the abstract object[]
*/
public AbstractObject[] asArray() {
return toArray(new AbstractObject[size()]);
}
}

/** The alpha. */
protected volatile Double alpha = 1d;
Expand All @@ -82,10 +134,10 @@ public class LayerObject {
protected final IOpenGLRenderer renderer;

/** The traces. */
protected final LinkedList<List<AbstractObject<?, ?>>> traces;
protected final LinkedList<Trace> traces;

/** The current list. */
protected List<AbstractObject<?, ?>> currentList;
protected Trace currentList;

/** The open GL list index. */
protected volatile Integer openGLListIndex;
Expand All @@ -104,9 +156,7 @@ public class LayerObject {
public LayerObject(final IOpenGLRenderer renderer2, final ILayer layer) {
this.renderer = renderer2;
this.layer = layer;
computeOffset();
computeScale();
currentList = newCurrentList();
currentList = new Trace();
if (layer != null && layer.getData().getTrace() != null || renderer.useShader()) {
traces = new LinkedList();
traces.add(currentList);
Expand All @@ -118,40 +168,41 @@ public LayerObject(final IOpenGLRenderer renderer2, final ILayer layer) {
/**
* Compute scale.
*/
public void computeScale() {
public void computeScale(final Trace list) {
double zScale = layer.getData().getSize().getZ();
if (zScale <= 0) { zScale = 1; }
scale.setLocation(renderer.getLayerWidth() / renderer.getWidth(),
list.scale.setLocation(renderer.getLayerWidth() / renderer.getWidth(),
renderer.getLayerHeight() / renderer.getHeight(), zScale);

}

/**
* Compute offset.
*/
public void computeOffset() {
public void computeOffset(final Trace list) {
final IScope scope = renderer.getSurface().getScope();
final IExpression expr = layer.getDefinition().getFacet(IKeyword.POSITION);

if (expr != null) {
final boolean containsPixels = expr.findAny(e -> e instanceof PixelUnitExpression);
GamaPoint offset = list.offset;
offset.setLocation(Cast.asPoint(scope, expr.value(scope)));
if (Math.abs(offset.x) <= 1 && !containsPixels) { offset.x *= renderer.getEnvWidth(); }
if (offset.x < 0) { offset.x = renderer.getEnvWidth() - offset.x; }
if (Math.abs(offset.y) <= 1 && !containsPixels) { offset.y *= renderer.getEnvHeight(); }
if (offset.y < 0) { offset.y = renderer.getEnvHeight() - offset.y; }

}
increaseZ();
increaseZ(list);
}

/**
* Increase Z.
*/
protected void increaseZ() {
protected void increaseZ(final Trace list) {
double currentZLayer = renderer.getMaxEnvDim() * layer.getData().getPosition().getZ();
currentZLayer += layer.getData().getAddedElevation() * renderer.getMaxEnvDim();
offset.z = currentZLayer;
list.offset.z = currentZLayer;
}

/**
Expand All @@ -161,16 +212,6 @@ protected void increaseZ() {
*/
public boolean isLightInteraction() { return true; }

/**
* New current list.
*
* @return the list
*/
protected List newCurrentList() {
return new ArrayList();
// return /* Collections.synchronizedList( */new ArrayList()/* ) */;
}

/**
* Checks if is pickable.
*
Expand All @@ -186,7 +227,14 @@ protected List newCurrentList() {
*/
public void draw(final OpenGL gl) {
if (isInvalid()) return;
prepareDrawing(gl);
if (hasDepth()) {
gl.getGL().glEnable(GL.GL_DEPTH_TEST);
} else {
// Addition to fix #2228 and #2222
gl.suspendZTranslation();
gl.getGL().glDisable(GL.GL_DEPTH_TEST);
}
gl.pushIdentity(GLMatrixFunc.GL_MODELVIEW);
try {
doDrawing(gl);
} finally {
Expand Down Expand Up @@ -219,15 +267,22 @@ protected void doDrawing(final OpenGL gl) {
* @param gl
* the gl
*/
protected void prepareDrawing(final OpenGL gl) {
gl.getGL().glEnable(GL.GL_DEPTH_TEST);
gl.push(GLMatrixFunc.GL_MODELVIEW);
final GamaPoint nonNullOffset = getOffset();
gl.translateBy(nonNullOffset.x, -nonNullOffset.y, nonNullOffset.z);
final GamaPoint nonNullScale = getScale();
protected void prepareDrawing(final OpenGL gl, final Trace list) {
final GamaPoint nonNullOffset = list.getOffset();
gl.translateBy(nonNullOffset.x, -nonNullOffset.y, hasDepth() ? nonNullOffset.z : 0);
final GamaPoint nonNullScale = list.getScale();
gl.scaleBy(nonNullScale.x, nonNullScale.y, nonNullScale.z);
}

/**
* Enable depth test.
*
* @return true, if successful
*/
protected boolean hasDepth() {
return true;
}

/**
* Stop drawing.
*
Expand All @@ -254,7 +309,7 @@ protected void drawAllObjects(final OpenGL gl, final boolean picking) {
delta = size == 0 ? 0 : 1d / size;
}
double alpha = 0d;
for (final List<AbstractObject<?, ?>> list : traces) {
for (final Trace list : traces) {
alpha = delta == 0d ? this.alpha : this.alpha * (alpha + delta);
drawObjects(gl, list, alpha, picking);
}
Expand All @@ -275,10 +330,10 @@ protected void drawAllObjects(final OpenGL gl, final boolean picking) {
* @param picking
* the picking
*/
protected final void drawObjects(final OpenGL gl, final List<AbstractObject<?, ?>> list, final double alpha,
final boolean picking) {
protected final void drawObjects(final OpenGL gl, final Trace list, final double alpha, final boolean picking) {
prepareDrawing(gl, list);
gl.setCurrentObjectAlpha(alpha);
for (final AbstractObject object : list) { gl.getDrawerFor(object.type).draw(object, picking); }
for (final AbstractObject object : list.asArray()) { gl.getDrawerFor(object.type).draw(object, picking); }
}

/**
Expand All @@ -299,41 +354,30 @@ public boolean isStatic() {
*/
public void setAlpha(final Double a) { alpha = a; }

/**
* Gets the offset.
*
* @return the offset
*/
public GamaPoint getOffset() { return offset == null ? NULL_OFFSET : offset; }

/**
* Sets the offset.
*
* @param offset
* the new offset
*/
public void setOffset(final GamaPoint offset) {

if (offset != null) {
this.offset = new GamaPoint(offset);
currentList.offset.setLocation(offset);
} else {
this.offset = null;
currentList.offset.setLocation(NULL_OFFSET);
}
}

/**
* Gets the scale.
*
* @return the scale
*/
public GamaPoint getScale() { return scale == null ? NULL_SCALE : scale; }

/**
* Sets the scale.
*
* @param scale
* the new scale
*/
public void setScale(final GamaPoint scale) { this.scale = new GamaPoint(scale); }
public void setScale(final GamaPoint scale) {
currentList.scale.setLocation(scale);
}

/**
* Adds the string.
Expand Down Expand Up @@ -444,7 +488,7 @@ public void clear(final OpenGL gl) {
isFading = getFading();
final int size = traces.size();
for (int i = 0, n = size - sizeLimit; i < n; i++) { traces.poll(); }
currentList = newCurrentList();
currentList = new Trace();
traces.offer(currentList);
} else {
currentList.clear();
Expand Down Expand Up @@ -537,4 +581,11 @@ public void forceRedraw(final OpenGL gl) {

}

/**
* Recompute offset.
*/
public void recomputeOffset() {
computeOffset(currentList);
}

}

0 comments on commit 8147c34

Please sign in to comment.