See #2761. Prevents overlays to rotate when the display rotates

gama-platform · Mar 27, 2022 · d38b6eb · d38b6eb
1 parent 32a4f40
commit d38b6eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/msi.gama.core/src/msi/gama/outputs/LayeredDisplayOutput.java b/msi.gama.core/src/msi/gama/outputs/LayeredDisplayOutput.java
@@ -97,7 +97,7 @@
 						type = IType.GEOMETRY,
 						optional = true,
 						doc = @doc (
-								deprecated = "Use 'camera default target: the_agent' to achieve the same effect",
+								deprecated = "Use 'camera default target: the_agent' to achieve the same effect. And please note that this possibility does not exist on Java2D anymore",
 								value = "the geometry (or agent) on which the display will (dynamically) focus")),
 				// WARNING VALIDER EN VERIFIANT LE TYPE DU DISPLAY
 				@facet (

diff --git a/msi.gama.core/src/msi/gama/outputs/layers/AgentLayerStatement.java b/msi.gama.core/src/msi/gama/outputs/layers/AgentLayerStatement.java
@@ -109,11 +109,11 @@
 						type = IType.LABEL,
 						optional = true,
 						doc = @doc ("Human readable title of the layer")),
-				@facet (
-						name = IKeyword.FOCUS,
-						type = IType.AGENT,
-						optional = true,
-						doc = @doc ("the agent on which the camera will be focused (it is dynamically computed)")),
+				// @facet (
+				// name = IKeyword.FOCUS,
+				// type = IType.AGENT,
+				// optional = true,
+				// doc = @doc ("the agent on which the camera will be focused (it is dynamically computed)")),
 				@facet (
 						name = IKeyword.ASPECT,
 						type = IType.ID,

diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/ModelScene.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/ModelScene.java
@@ -121,12 +121,16 @@ public void draw(final OpenGL gl) {
 		gl.rotateModel();
 		for (LayerObject layer : layers.values()) {
 			if (layer != null && !layer.isInvalid()) {
+				// AD added to prevent overlays to rotate
+				if (layer.isOverlay()) { gl.pushIdentity(GLMatrixFunc.GL_MODELVIEW); }
 				try {
 					layer.lock();
 					layer.draw(gl);
 				} catch (final RuntimeException r) {
 					DEBUG.ERR("Runtime error " + r.getMessage() + " in OpenGL loop");
 					r.printStackTrace();
+				} finally {
+					if (layer.isOverlay()) { gl.pop(GLMatrixFunc.GL_MODELVIEW); }
 				}
 			}
 		}