Enforcing the "positive y" policy regarding cameras in GAML/GAMA (#2694)

gama-platform · Mar 4, 2022 · 6949c48 · 6949c48
1 parent 07abedd
commit 6949c48
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/displays/LayerSideControls.java b/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/displays/LayerSideControls.java
@@ -214,14 +214,14 @@ private void fillCameraParameters(final ParameterExpandBar viewer, final Layered
 		// ds.updateDisplay(true);
 		// });
 
-		cameraPos = (PointEditor) EditorFactory.create(scope, contents, "Position:", data.getCameraPos(),
+		cameraPos = (PointEditor) EditorFactory.create(scope, contents, "Position:", data.getCameraPos().yNegated(),
 				(EditorListener<GamaPoint>) newValue -> {
-					data.setCameraPos(newValue);
+					data.setCameraPos(newValue.yNegated());
 					ds.updateDisplay(true);
 				});
-		cameraTarget = (PointEditor) EditorFactory.create(scope, contents, "Target:", data.getCameraTarget(),
+		cameraTarget = (PointEditor) EditorFactory.create(scope, contents, "Target:", data.getCameraTarget().yNegated(),
 				(EditorListener<GamaPoint>) newValue -> {
-					data.setCameraTarget(newValue);
+					data.setCameraTarget(newValue.yNegated());
 					ds.updateDisplay(true);
 				});
 		// preset.setActive(true);
@@ -231,12 +231,12 @@ private void fillCameraParameters(final ParameterExpandBar viewer, final Layered
 		data.addListener((p, v) -> {
 			switch (p) {
 				case CAMERA_POS:
-					cameraPos.getParam().setValue(scope, data.getCameraPos());
+					cameraPos.getParam().setValue(scope, data.getCameraPos().yNegated());
 					cameraPos.updateWithValueOfParameter();
 					copyCameraAndKeystoneDefinition(scope, data);
 					break;
 				case CAMERA_TARGET:
-					cameraTarget.getParam().setValue(scope, data.getCameraTarget());
+					cameraTarget.getParam().setValue(scope, data.getCameraTarget().yNegated());
 					cameraTarget.updateWithValueOfParameter();
 					copyCameraAndKeystoneDefinition(scope, data);
 					break;
@@ -618,12 +618,10 @@ private void copyCameraAndKeystoneDefinition(final IScope scope, final LayeredDi
 	 * @return the string
 	 */
 	private String cameraDefinitionToCopy() {
-		StringBuilder text =
-				new StringBuilder(IKeyword.CAMERA).append(" 'default' ").append(IKeyword.LOCATION).append(": ").append(
-						new GamaPoint(cameraPos.getCurrentValue()).yNegated().withPrecision(4).serialize(false));
+		StringBuilder text = new StringBuilder(IKeyword.CAMERA).append(" 'default' ").append(IKeyword.LOCATION)
+				.append(": ").append(new GamaPoint(cameraPos.getCurrentValue()).withPrecision(4).serialize(false));
 		text.append(" ").append(IKeyword.TARGET).append(": ")
-				.append(new GamaPoint(cameraTarget.getCurrentValue()).yNegated().withPrecision(4).serialize(false))
-				.append(";");
+				.append(new GamaPoint(cameraTarget.getCurrentValue()).withPrecision(4).serialize(false)).append(";");
 		return text.toString();
 	}