From d661da13175992f055e35cef20e200c3f1a569cf Mon Sep 17 00:00:00 2001 From: AlexisDrogoul Date: Mon, 7 Mar 2022 09:50:36 +0700 Subject: [PATCH] A bit of cleansing of constants and keywords - Reorganizes IKeyword.java and removes unused keywords - Clarifies the status of the "name" of lights and cameras (now they are strings, and not labels anymore) - Adds the #default constant in GAML. (value = "default"). - Removes the #regular constant so that default cameras and lights use the same keyword (#default or "default") - Deprecates "draw_env" in display in favor of "axes" - Makes sure 'ambient_light' is transformed into an equivalent 'light #ambient..' statement. --- .../msi/gama/outputs/LayeredDisplayData.java | 6 +- .../gama/outputs/LayeredDisplayOutput.java | 60 +- .../layers/properties/AbstractDefinition.java | 5 +- .../layers/properties/CameraStatement.java | 12 +- .../layers/properties/ILightDefinition.java | 5 - .../layers/properties/LightDefinition.java | 2 +- .../layers/properties/LightStatement.java | 49 +- .../layers/properties/RotationStatement.java | 2 +- .../src/msi/gaml/operators/IUnits.java | 3 + .../models/3D shapefile Loading.gaml | 2 +- .../models/Graph Importation.gaml | 2 +- .../Data Importation/models/Grid DEM.gaml | 18 +- .../models/Generate GIS Data.gaml | 2 +- .../Co-AntPreyPredator/Ants Adapter.gaml | 2 +- .../Graphs/models/Clustering.gaml | 8 +- .../models/Simplification and Buffer.gaml | 2 +- .../models/Ant Foraging.gaml | 4 +- .../Art/Gama 1.8/models/GAMA 1.8.gaml | 4 +- .../Art/L-Trees/models/Tree and Seasons.gaml | 14 +- .../Mondrian City/models/Mondrian City.gaml | 2 +- .../models/Radiohead In Point Coud.gaml | 2 +- .../Bubble Sort/models/Bubble Sort 3D.gaml | 2 +- .../Adapters/Procedural City Adapter.gaml | 2 +- .../models/MODAVI.gaml | 4 +- .../models/Incremental Model 5.gaml | 2 +- .../models/Incremental Model 6.gaml | 2 +- .../models/Incremental Model 7.gaml | 2 +- .../models/Mouse Exit and Enter.gaml | 2 +- .../models/Camera Definitions.gaml | 12 +- .../models/Camera Shared Zoom.experiment | 8 +- .../3D Visualization/models/Lighting.gaml | 24 +- .../models/Procedural City.gaml | 2 +- .../models/Specular Effects.gaml | 2 +- .../Visualization/Building Heatmap.gaml | 4 +- .../Visualization/Color Brewer.gaml | 2 +- .../Visualization/DEM Generator.gaml | 2 +- .../Visualization/Text Display.gaml | 2 +- .../models/Eroding Vulcano.gaml | 2 +- .../models/Flow on Terrain.gaml | 2 +- .../Physics Engine/models/Hello World.gaml | 2 +- .../models/Perfect Gas Chamber.gaml | 2 +- .../Physics Engine/models/Play Pool.gaml | 2 +- .../models/Physics Engine/models/Stairs.gaml | 2 +- .../models/Tricky Fountain.gaml | 4 +- .../models/Simple Intersection.gaml | 2 +- .../msi/gama/common/interfaces/IKeyword.java | 629 ++++++++---------- ...ener Mouse from Processing For camera.gaml | 2 +- 47 files changed, 437 insertions(+), 492 deletions(-) diff --git a/msi.gama.core/src/msi/gama/outputs/LayeredDisplayData.java b/msi.gama.core/src/msi/gama/outputs/LayeredDisplayData.java index f21b7835e4..1a8ea30d52 100644 --- a/msi.gama.core/src/msi/gama/outputs/LayeredDisplayData.java +++ b/msi.gama.core/src/msi/gama/outputs/LayeredDisplayData.java @@ -660,7 +660,7 @@ public void initWith(final IScope scope, final IDescription desc) { toolbarColor = Cast.asColor(scope, toolbar.value(scope)); } } - final IExpression fps = facets.getExpr(IKeyword.SHOWFPS); + final IExpression fps = facets.getExpr("show_fps"); if (fps != null) { setShowfps(Cast.asBool(scope, fps.value(scope))); } final IExpression nZ = facets.getExpr("z_near"); @@ -668,7 +668,7 @@ public void initWith(final IScope scope, final IDescription desc) { final IExpression fZ = facets.getExpr("z_far"); if (fZ != null) { setZFar(Cast.asFloat(scope, fZ.value(scope))); } - final IExpression denv = facets.getExpr(IKeyword.DRAWENV); + final IExpression denv = facets.getExpr("draw_env", "axes"); if (denv != null) { setDrawEnv(Cast.asBool(scope, denv.value(scope))); } final IExpression ortho = facets.getExpr(IKeyword.ORTHOGRAPHIC_PROJECTION); @@ -1149,7 +1149,7 @@ public void resetRotation() { private final Map lights = new LinkedHashMap<>() { { put(ILightDefinition.ambient, new GenericLightDefinition(ILightDefinition.ambient, -1, 127)); - put(ILightDefinition.regular, new GenericLightDefinition(ILightDefinition.regular, 0, 127)); + put(IKeyword.DEFAULT, new GenericLightDefinition(IKeyword.DEFAULT, 0, 127)); } }; diff --git a/msi.gama.core/src/msi/gama/outputs/LayeredDisplayOutput.java b/msi.gama.core/src/msi/gama/outputs/LayeredDisplayOutput.java index fd13a7e970..3eabb72258 100644 --- a/msi.gama.core/src/msi/gama/outputs/LayeredDisplayOutput.java +++ b/msi.gama.core/src/msi/gama/outputs/LayeredDisplayOutput.java @@ -156,16 +156,23 @@ value = "Allows to display a scale bar in the overlay. Accepts true/false or an unit name", deprecated = "Not functional anymore. Scale is now displayed by default")), @facet ( - name = IKeyword.SHOWFPS, + name = "show_fps", internal = true, type = IType.BOOL, optional = true, doc = @doc ("Allows to enable/disable the drawing of the number of frames per second")), @facet ( - name = IKeyword.DRAWENV, + name = "axes", type = IType.BOOL, optional = true, doc = @doc ("Allows to enable/disable the drawing of the world shape and the ordinate axes. Default can be configured in Preferences")), + @facet ( + name = "draw_env", + type = IType.BOOL, + optional = true, + doc = @doc ( + deprecated = "Use 'axes' instead", + value = "Allows to enable/disable the drawing of the world shape and the ordinate axes. Default can be configured in Preferences")), @facet ( name = IKeyword.ORTHOGRAPHIC_PROJECTION, internal = true, @@ -175,21 +182,21 @@ /// LIGHT FACETS @facet ( - name = IKeyword.AMBIENT_LIGHT, + name = "ambient_light", type = { IType.INT, IType.COLOR }, optional = true, doc = @doc ( deprecated = "Define a statement 'light #ambient intensity: ...;' instead", value = "Allows to define the value of the ambient light either using an int (ambient_light:(125)) or a rgb color ((ambient_light:rgb(255,255,255)). default is rgb(127,127,127,255)")), @facet ( - name = IKeyword.DIFFUSE_LIGHT, + name = "diffuse_light", type = { IType.INT, IType.COLOR }, optional = true, doc = @doc ( value = "Allows to define the value of the diffuse light either using an int (diffuse_light:(125)) or a rgb color ((diffuse_light:rgb(255,255,255)). default is (127,127,127,255)", - deprecated = "Use statement \"light\" instead to define a new light and its intensity")), + deprecated = "Use statement \"light\" instead with a #point or #direction light, to define a new light and its intensity")), @facet ( - name = IKeyword.DIFFUSE_LIGHT_POS, + name = "diffuse_light_pos", type = IType.POINT, optional = true, doc = @doc ( @@ -199,9 +206,9 @@ name = IKeyword.IS_LIGHT_ON, type = IType.BOOL, optional = true, - doc = @doc ("Allows to enable/disable the light. Default is true")), + doc = @doc ("Allows to enable/disable the light at once. Default is true")), @facet ( - name = IKeyword.DRAW_DIFFUSE_LIGHT, + name = "draw_diffuse_light", type = IType.BOOL, optional = true, doc = @doc ( @@ -211,12 +218,12 @@ /// CAMERA FACETS @facet ( name = IKeyword.CAMERA, - type = { IType.STRING }, + type = IType.STRING, optional = true, doc = @doc ("Allows to define the name of the camera to use. Default value is 'default'. " + "Accepted values are (1) the name of one of the cameras defined using the 'camera' statement or " + "(2) one of the preset cameras, accessible using constants: #from_above, #from_left, #from_right, " - + "#from_up_left, #from_up_right, #from_front, #from_up_front")), + + "#from_up_left, #from_up_right, #from_front, #from_up_front, #isometric")), @facet ( name = "camera_pos", type = { IType.POINT, IType.AGENT }, @@ -225,14 +232,14 @@ deprecated = "Define a separate camera instead in the body of the display using the 'camera' statement and attach the 'location:' facet to it", value = "Allows to define the position of the camera")), @facet ( - name = IKeyword.CAMERA_LOCATION, + name = "camera_location", type = { IType.POINT, IType.AGENT }, optional = true, doc = @doc ( deprecated = "Define a separate camera instead in the body of the display using the 'camera' statement and attach the 'location:' facet to it", value = "Allows to define the location of the camera, the origin being the center of the model")), @facet ( - name = IKeyword.CAMERA_TARGET, + name = "camera_target", type = IType.POINT, optional = true, doc = @doc ( @@ -246,7 +253,7 @@ deprecated = "Define a separate camera instead in the body of the display using the 'camera' statement and attach the 'target:' facet to it", value = "Allows to define the direction of the camera")), @facet ( - name = IKeyword.CAMERA_ORIENTATION, + name = "camera_orientation", type = IType.POINT, optional = true, doc = @doc ( @@ -260,7 +267,7 @@ deprecated = "This facet is not used anymore. The orientation of the camera is computed automatically by GAMA", value = "Allows to define the orientation of the 'up-vector' of the camera")), @facet ( - name = IKeyword.CAMERA_LENS, + name = "camera_lens", internal = true, type = IType.INT, optional = true, @@ -268,7 +275,7 @@ deprecated = "Define a separate camera instead in the body of the display using the 'camera' statement and attach the 'lens:' facet to it", value = "Allows to define the lens of the camera")), @facet ( - name = IKeyword.CAMERA_INTERACTION, + name = "camera_interaction", type = IType.BOOL, optional = true, doc = @doc ( @@ -434,13 +441,14 @@ public void validate(final IDescription d) { d.setFacet(TYPE, LabelExpressionDescription.create(LayeredDisplayData.OPENGL)); } - final String camera = d.firstFacetFoundAmong(CAMERA_LOCATION, CAMERA_TARGET, CAMERA_ORIENTATION, - CAMERA_LENS, "z_near", "z_far", IKeyword.CAMERA); - if (!isOpenGLWanted && camera != null) { - d.warning( - "camera-related facets will have no effect on 2D displays. Use 'focus:' instead if you want to change the default zoom and position.", - IGamlIssue.UNUSED, camera); - } + // final String camera = d.firstFacetFoundAmong(CAMERA_LOCATION, CAMERA_TARGET, CAMERA_ORIENTATION, + // CAMERA_LENS, "z_near", "z_far", IKeyword.CAMERA); + // if (!isOpenGLWanted && camera != null) { + // d.warning( + // "camera-related facets will have no effect on 2D displays. Use 'focus:' instead if you want to change the + // default zoom and position.", + // IGamlIssue.UNUSED, camera); + // } // AD: addressing the deprecation of the "trace:" facet final IExpressionDescription trace = d.getFacet(TRACE); @@ -456,11 +464,11 @@ public void validate(final IDescription d) { // IExpressionDescription up = d.getFacet("camera_up_vector"); // if (target == null) { target = d.getFacet(CAMERA_ORIENTATION); } IExpressionDescription target = d.getFacet("camera_look_pos"); - if (target == null) { target = d.getFacet(CAMERA_TARGET); } + if (target == null) { target = d.getFacet("camera_target"); } IExpressionDescription location = d.getFacet("camera_pos"); - if (location == null) { location = d.getFacet(CAMERA_LOCATION); } - IExpressionDescription lens = d.getFacet(CAMERA_LENS); - IExpressionDescription locked = d.getFacet(CAMERA_INTERACTION); + if (location == null) { location = d.getFacet("camera_location"); } + IExpressionDescription lens = d.getFacet("camera_lens"); + IExpressionDescription locked = d.getFacet("camera_interaction"); String lockedString = locked == null ? "false" : locked.equalsString("true") ? "false" : "true"; // d.removeFacets("camera_pos", "camera_look_pos", "camera_up_vector",CAMERA_LOCATION, diff --git a/msi.gama.core/src/msi/gama/outputs/layers/properties/AbstractDefinition.java b/msi.gama.core/src/msi/gama/outputs/layers/properties/AbstractDefinition.java index 6a746b161a..5b49b5e55e 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/properties/AbstractDefinition.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/properties/AbstractDefinition.java @@ -10,6 +10,7 @@ ********************************************************************************************************/ package msi.gama.outputs.layers.properties; +import msi.gama.common.interfaces.IKeyword; import msi.gama.runtime.IScope; import msi.gaml.compilation.ISymbol; import msi.gaml.statements.draw.AttributeHolder; @@ -34,7 +35,7 @@ public abstract class AbstractDefinition extends AttributeHolder { */ public AbstractDefinition(final ISymbol symbol) { super(symbol); - dynamic = create("dynamic", Types.BOOL, getDefaultDynamicValue()); + dynamic = create(IKeyword.DYNAMIC, Types.BOOL, getDefaultDynamicValue()); } /** @@ -63,7 +64,7 @@ public final void init(final IScope scope) { @Override public final void refresh(final IScope scope) { - dynamic.refresh("dynamic", scope); + dynamic.refresh(IKeyword.DYNAMIC, scope); if (shouldRefresh()) { super.refresh(scope); this.update(scope); diff --git a/msi.gama.core/src/msi/gama/outputs/layers/properties/CameraStatement.java b/msi.gama.core/src/msi/gama/outputs/layers/properties/CameraStatement.java index fa6081304f..c129408f99 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/properties/CameraStatement.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/properties/CameraStatement.java @@ -13,8 +13,6 @@ import msi.gama.common.interfaces.IKeyword; import msi.gama.outputs.LayeredDisplayOutput; import msi.gama.outputs.layers.AbstractLayerStatement; -import msi.gama.outputs.layers.ILayerStatement; -import msi.gama.outputs.layers.ILayerStatement.LayerType; import msi.gama.precompiler.GamlAnnotations.doc; import msi.gama.precompiler.GamlAnnotations.facet; import msi.gama.precompiler.GamlAnnotations.facets; @@ -41,14 +39,14 @@ @facets ( value = { @facet ( name = IKeyword.NAME, - type = IType.LABEL, + type = IType.STRING, optional = false, - doc = @doc ("The name of the camera. Either a string or a plain label. Will be used to populate a menu with the other camera presets. " + doc = @doc ("The name of the camera. Will be used to populate a menu with the other camera presets. " + "Can provide a value to the 'camera:' facet of the display, which specifies which camera to use." - + "Using the name 'default' will make it the default of the surrounding display")), + + "Using the special constant #default will make it the default of the surrounding display")), @facet ( - name = "dynamic", + name = IKeyword.DYNAMIC, type = IType.BOOL, optional = true, doc = @doc ("If true, the location, distance and target are automatically recomputed every step. Default is false. When true, will also set 'locked' to true, to avoid interferences from users")), @@ -87,7 +85,7 @@ @doc ( value = "`" + IKeyword.CAMERA + "` allows the modeler to define a camera. The display will then be able to choose among the camera defined (either within this statement or globally in GAMA) in a dynamic way. " - + "Several preset cameras are provided and accessible in the preferences (to choose the default) or in GAML using the keywords #from_above, #from_left, #from_right, #from_up_right, #from_up_left, #from_front, #from_up_front." + + "Several preset cameras are provided and accessible in the preferences (to choose the default) or in GAML using the keywords #from_above, #from_left, #from_right, #from_up_right, #from_up_left, #from_front, #from_up_front, #isometric." + "These cameras are unlocked (so that they can be manipulated by the user), look at the center of the world from a symbolic position, and the distance between this position and the target is equal to the maximum of the width and height of the world's shape. " + "These preset cameras can be reused when defining new cameras, since their names can become symbolic positions for them. For instance: camera 'my_camera' location: #from_top distance: 10; will lower (or extend) the distance between the camera and the center of the world to 10. " + "camera 'my_camera' locked: true location: #from_up_front target: people(0); will continuously follow the first agent of the people species from the up-front position. ", diff --git a/msi.gama.core/src/msi/gama/outputs/layers/properties/ILightDefinition.java b/msi.gama.core/src/msi/gama/outputs/layers/properties/ILightDefinition.java index 99dc31faf3..c97be3e62f 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/properties/ILightDefinition.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/properties/ILightDefinition.java @@ -41,11 +41,6 @@ public interface ILightDefinition extends INamed { category = IOperatorCategory.THREED, doc = @doc ("Represent the 'ambient' type of light")) String ambient = "Ambient light"; - /** The regular. */ - @constant ( - value = "regular", - category = IOperatorCategory.THREED, - doc = @doc ("Represent the 'regular' -- default -- type of light")) String regular = "Regular light source"; /** The direction. */ @constant ( value = "direction", diff --git a/msi.gama.core/src/msi/gama/outputs/layers/properties/LightDefinition.java b/msi.gama.core/src/msi/gama/outputs/layers/properties/LightDefinition.java index 262ecd742b..ccabf925ad 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/properties/LightDefinition.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/properties/LightDefinition.java @@ -113,7 +113,7 @@ public LightDefinition(final LightStatement lightStatement) { public String getName() { return symbol.getName(); } @Override - public int getId() { return regular.equals(getName()) ? 0 : id; } + public int getId() { return IKeyword.DEFAULT.equals(getName()) ? 0 : id; } /** * Sets the id. diff --git a/msi.gama.core/src/msi/gama/outputs/layers/properties/LightStatement.java b/msi.gama.core/src/msi/gama/outputs/layers/properties/LightStatement.java index fb8520bddf..c4737b15e3 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/properties/LightStatement.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/properties/LightStatement.java @@ -47,12 +47,12 @@ omissible = IKeyword.NAME, value = { @facet ( name = IKeyword.NAME, - type = IType.LABEL, + type = IType.STRING, optional = false, doc = @doc ("The name of the light source, must be unique (otherwise the last definition prevails). " - + "Either a string or a plain label. Will be used to populate a menu where light sources can be easily turned on and off" - + "Using the name #ambient will allow to redefine or control the ambient light intensity and presence" - + "Using the name 'default' will replace the default directional light of the surrounding display")), + + "Will be used to populate a menu where light sources can be easily turned on and off. Special names can be used:" + + "Using the special constant #ambient will allow to redefine or control the ambient light intensity and presence" + + "Using the special constant #default will replace the default directional light of the surrounding display")), @facet ( name = IKeyword.POSITION, type = IType.POINT, @@ -76,7 +76,7 @@ optional = true, doc = @doc ("the direction of the light (only for direction and spot light). (default value : {0.5,0.5,-1})")), @facet ( - name = IKeyword.SPOT_ANGLE, + name = "spot_angle", type = IType.FLOAT, optional = true, doc = @doc ( @@ -90,7 +90,7 @@ deprecated = "use 'intensity:' instead", value = "")), @facet ( - name = IKeyword.DRAW_LIGHT, + name = "draw_light", type = { IType.BOOL }, optional = true, doc = @doc ( @@ -134,16 +134,16 @@ optional = true, doc = @doc ("If true, draws the light source. (default value if not specified : false).")), @facet ( - name = "dynamic", + name = IKeyword.DYNAMIC, type = { IType.BOOL }, optional = true, doc = @doc ("specify if the parameters of the light need to be updated every cycle or treated as constants. (default value : true).")) }) @doc ( value = "`light` allows to define diffusion lights in your 3D display. They must be given a name, which will help track them in the UI. Two names have however special meanings: #ambient, " - + "which designates the ambient luminosity and color of the scene (with a default intensity of (127,127,127,255)) and #regular, " + + "which designates the ambient luminosity and color of the scene (with a default intensity of (127,127,127,255)) and #default, " + "which designates the default directional light applied to a scene (with a default medium intensity of (127,127,127,255) in the direction given by (0.5,0.5,1)). Redefining a light named #ambient or #regular " - + "will then modify these default lights (for example changing their color or decactivating them). To be more precise, and given all the default values of the facets, the existence of these two lights is effectively equivalent to redefining:" - + "light #ambient intensity: 127; light #regular type: #direction intensity: 127 direction: {0.5,0.5,-1};", + + "will then modify these default lights (for example changing their color or deactivating them). To be more precise, and given all the default values of the facets, the existence of these two lights is effectively equivalent to redefining:" + + "light #ambient intensity: 127; light #default type: #direction intensity: 127 direction: {0.5,0.5,-1};", usages = { @usage ( value = "The general syntax is:", examples = { @example ( @@ -174,13 +174,13 @@ public void validate(final IDescription desc) { // Taking care of deprecations swap(desc, IKeyword.POSITION, IKeyword.LOCATION); swap(desc, IKeyword.COLOR, "intensity"); - swap(desc, IKeyword.SPOT_ANGLE, "angle"); - swap(desc, IKeyword.UPDATE, "dynamic"); - swap(desc, IKeyword.DRAW_LIGHT, "show"); + swap(desc, "spot_angle", IKeyword.ANGLE); + swap(desc, IKeyword.UPDATE, IKeyword.DYNAMIC); + swap(desc, "draw_light", "show"); final IExpressionDescription position = desc.getFacet(IKeyword.LOCATION); final IExpressionDescription direction = desc.getFacet(IKeyword.DIRECTION); - final IExpressionDescription spotAngle = desc.getFacet("angle"); + final IExpressionDescription spotAngle = desc.getFacet(IKeyword.ANGLE); final IExpressionDescription linearAttenuation = desc.getFacet(IKeyword.LINEAR_ATTENUATION); final IExpressionDescription quadraticAttenuation = desc.getFacet(IKeyword.QUADRATIC_ATTENUATION); @@ -235,17 +235,38 @@ public LightStatement(final IDescription desc) throws GamaRuntimeException { definition = new LightDefinition(this); } + /** + * Inits the. + * + * @param scope + * the scope + * @return true, if successful + */ @Override protected boolean _init(final IScope scope) { definition.refresh(scope); return true; } + /** + * Gets the type. + * + * @param output + * the output + * @return the type + */ @Override public LayerType getType(final LayeredDisplayOutput output) { return LayerType.LIGHT; } + /** + * Step. + * + * @param scope + * the scope + * @return true, if successful + */ @Override protected boolean _step(final IScope scope) { definition.refresh(scope); diff --git a/msi.gama.core/src/msi/gama/outputs/layers/properties/RotationStatement.java b/msi.gama.core/src/msi/gama/outputs/layers/properties/RotationStatement.java index 613cb14242..9d89cf4efb 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/properties/RotationStatement.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/properties/RotationStatement.java @@ -40,7 +40,7 @@ value = { @facet ( - name = "dynamic", + name = IKeyword.DYNAMIC, type = IType.BOOL, optional = true, doc = @doc ("If true, the rotation is applied every step. Default is false.")), diff --git a/msi.gama.core/src/msi/gaml/operators/IUnits.java b/msi.gama.core/src/msi/gaml/operators/IUnits.java index 38e8c5daf1..9cbe9d2b37 100644 --- a/msi.gama.core/src/msi/gaml/operators/IUnits.java +++ b/msi.gama.core/src/msi/gaml/operators/IUnits.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.Map; +import msi.gama.common.interfaces.IKeyword; import msi.gama.metamodel.shape.GamaPoint; import msi.gama.outputs.layers.MouseEventLayerDelegate; import msi.gama.outputs.layers.properties.ICameraDefinition; @@ -965,6 +966,8 @@ static void init() { browse(ILightDefinition.class); browse(IUnits.class); + add(IKeyword.DEFAULT, IKeyword.DEFAULT, "Default value for cameras and lights", null, false, null); + for (final Map.Entry entry : GamaColor.colors.entrySet()) { final GamaColor c = entry.getValue(); final String doc = "standard CSS color corresponding to " + "rgb (" + c.red() + ", " + c.green() + ", " diff --git a/msi.gama.models/models/Data/Data Importation/models/3D shapefile Loading.gaml b/msi.gama.models/models/Data/Data Importation/models/3D shapefile Loading.gaml index ca20c54c93..8efc819b60 100644 --- a/msi.gama.models/models/Data/Data Importation/models/3D shapefile Loading.gaml +++ b/msi.gama.models/models/Data/Data Importation/models/3D shapefile Loading.gaml @@ -25,7 +25,7 @@ species gis_3d_object { experiment display_shape type: gui { output { - display city_display type: opengl draw_env:false background: #black{ + display city_display type: opengl axes:false background: #black{ species gis_3d_object aspect: base; } diff --git a/msi.gama.models/models/Data/Data Importation/models/Graph Importation.gaml b/msi.gama.models/models/Data/Data Importation/models/Graph Importation.gaml index 9ce3f2e183..1e3e24e289 100644 --- a/msi.gama.models/models/Data/Data Importation/models/Graph Importation.gaml +++ b/msi.gama.models/models/Data/Data Importation/models/Graph Importation.gaml @@ -55,7 +55,7 @@ global { experiment import_graph type: gui { output { - display graph_display type: opengl draw_env: false{ + display graph_display type: opengl axes: false{ graphics "graph " { loop v over: g.vertices { diff --git a/msi.gama.models/models/Data/Data Importation/models/Grid DEM.gaml b/msi.gama.models/models/Data/Data Importation/models/Grid DEM.gaml index 44b1d64ca4..23446b3760 100644 --- a/msi.gama.models/models/Data/Data Importation/models/Grid DEM.gaml +++ b/msi.gama.models/models/Data/Data Importation/models/Grid DEM.gaml @@ -136,47 +136,47 @@ experiment "Grids" type: gui { experiment "Meshes" type: gui { output { layout #split toolbars: false; - display "Large file, rectangles, wireframe and scaled" type: opengl draw_env: false { + display "Large file, rectangles, wireframe and scaled" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh europe wireframe: true border: #green refresh: false size: {1, 1, 0.2}; } - display "Large file, triangles, wireframe and scaled" type: opengl draw_env: false { + display "Large file, triangles, wireframe and scaled" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh europe grayscale: true triangulation: true smooth: true refresh: false size: {1, 1, 0.2}; } - display "Large file, triangles, smooth, wireframe and scaled" type: opengl draw_env: false { + display "Large file, triangles, smooth, wireframe and scaled" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh europe wireframe: true triangulation: true border: #green refresh: false size: {1, 1, 0.2} smooth: true; } - display "Triangles, grayscale, lines, colored and scaled" type: opengl draw_env: false { + display "Triangles, grayscale, lines, colored and scaled" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh grid_data size: {1, 1, 0.75} triangulation: true border: #yellow color: #violet; } - display "Triangles, textured, no scale" type: opengl draw_env: false { + display "Triangles, textured, no scale" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh grid_data texture: texture triangulation: true; } - display "Triangles, textured and scaled" type: opengl draw_env: false { + display "Triangles, textured and scaled" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh grid_data texture: texture triangulation: true scale: 0.75; } - display "Triangles, textured, smooth and scaled" type: opengl draw_env: false { + display "Triangles, textured, smooth and scaled" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh grid_data texture: texture smooth: true triangulation: true size: {1, 1, 0.75}; } - display "Triangles, textured, scaled, with labels" type: opengl draw_env: false { + display "Triangles, textured, scaled, with labels" type: opengl axes: false { camera "default" location: {100.0, 269.7056, 169.7056} target: {100.0, 100.0, 0.0}; mesh grid_data texture: texture triangulation: true size: {1, 1, 0.5} text: true; } - display "Large file, trianges, grayscale, scaled" type: opengl draw_env: false { + display "Large file, trianges, grayscale, scaled" type: opengl axes: false { camera 'default' location: {104.7273,233.3361,685.4581} target: {100.135,-29.7603,0.0}; mesh dem_file grayscale: true triangulation: true scale: 2.0; } diff --git a/msi.gama.models/models/Data/Spatial Data Generation/models/Generate GIS Data.gaml b/msi.gama.models/models/Data/Spatial Data Generation/models/Generate GIS Data.gaml index efd2856321..131b49ff89 100644 --- a/msi.gama.models/models/Data/Spatial Data Generation/models/Generate GIS Data.gaml +++ b/msi.gama.models/models/Data/Spatial Data Generation/models/Generate GIS Data.gaml @@ -481,7 +481,7 @@ experiment generateGISdata type: gui autorun: true{ gama.pref_gis_default_crs <- crs; } output { - display map type: opengl draw_env: false{ + display map type: opengl axes: false{ image file_exists(exporting_path + "satellite.png")? (exporting_path + "satellite.png") : default_background_image transparency: 0.2 refresh: false; species OSM_agent; graphics "google map building" { diff --git a/msi.gama.models/models/Modeling/Model Coupling/Co-AntPreyPredator/Ants Adapter.gaml b/msi.gama.models/models/Modeling/Model Coupling/Co-AntPreyPredator/Ants Adapter.gaml index 4bdf2580d5..9ca7e9a9ad 100644 --- a/msi.gama.models/models/Modeling/Model Coupling/Co-AntPreyPredator/Ants Adapter.gaml +++ b/msi.gama.models/models/Modeling/Model Coupling/Co-AntPreyPredator/Ants Adapter.gaml @@ -25,4 +25,4 @@ experiment Base type: gui { } -} \ No newline at end of file +} \ No newline at end of file diff --git a/msi.gama.models/models/Modeling/Spatial Topology/Graphs/models/Clustering.gaml b/msi.gama.models/models/Modeling/Spatial Topology/Graphs/models/Clustering.gaml index 82898fd14d..028ff44c17 100644 --- a/msi.gama.models/models/Modeling/Spatial Topology/Graphs/models/Clustering.gaml +++ b/msi.gama.models/models/Modeling/Spatial Topology/Graphs/models/Clustering.gaml @@ -74,19 +74,19 @@ experiment clustering type: gui { output { layout #split; - display general_graph type: opengl draw_env: false{ + display general_graph type: opengl axes: false{ species edge_agent ; species node_agent ; } - display cluster_girvan_newman type: opengl draw_env: false{ + display cluster_girvan_newman type: opengl axes: false{ species edge_agent ; species node_agent aspect: color_cluster_gn ; } - display cluster_k_spanning_tree type: opengl draw_env: false{ + display cluster_k_spanning_tree type: opengl axes: false{ species edge_agent ; species node_agent aspect: color_cluster_stc ; } - display cluster_label_propagation type: opengl draw_env: false{ + display cluster_label_propagation type: opengl axes: false{ species edge_agent ; species node_agent aspect: color_cluster_lpc ; } diff --git a/msi.gama.models/models/Modeling/Spatial Topology/Spatial Operators/models/Simplification and Buffer.gaml b/msi.gama.models/models/Modeling/Spatial Topology/Spatial Operators/models/Simplification and Buffer.gaml index 9af4c986e3..b5b06fc6ee 100644 --- a/msi.gama.models/models/Modeling/Spatial Topology/Spatial Operators/models/Simplification and Buffer.gaml +++ b/msi.gama.models/models/Modeling/Spatial Topology/Spatial Operators/models/Simplification and Buffer.gaml @@ -43,7 +43,7 @@ experiment "Simplify this ! " { output { layout #split consoles: false tray: false tabs: false controls: false editors: false toolbars: false navigator: false; - display my_display type:opengl draw_env: false { + display my_display type:opengl axes: false { species shapes { draw shape color: #red; } diff --git a/msi.gama.models/models/Toy Models/Ants (Foraging and Sorting)/models/Ant Foraging.gaml b/msi.gama.models/models/Toy Models/Ants (Foraging and Sorting)/models/Ant Foraging.gaml index 7235443b48..12f324cb00 100644 --- a/msi.gama.models/models/Toy Models/Ants (Foraging and Sorting)/models/Ant Foraging.gaml +++ b/msi.gama.models/models/Toy Models/Ants (Foraging and Sorting)/models/Ant Foraging.gaml @@ -215,7 +215,7 @@ experiment "Classic" type: gui { output { display Ants type: opengl synchronized: true antialias: false { light #ambient intensity: 127; - light #regular intensity: 127; + light #default intensity: 127; image terrain refresh: false; agents "Grid" transparency: 0.4 value: ant_grid where ((each.food > 0) or (each.road > 0) or (each.is_nest)); species ant aspect: info; @@ -269,7 +269,7 @@ experiment "3 Simulations" type: gui { output { layout #split editors: false consoles: false toolbars: true tabs: false tray: false; - display Ants background: color type: opengl toolbar: color draw_env: false { + display Ants background: color type: opengl toolbar: color axes: false { image terrain position: {0.05, 0.05} size: {0.9, 0.9} refresh: false; agents "agents" transparency: 0.5 position: {0.05, 0.05} size: {0.9, 0.9} value: (ant_grid as list) where ((each.food > 0) or (each.road > 0) or (each.is_nest)); species ant position: {0.05, 0.05} size: {0.9, 0.9} aspect: icon; diff --git a/msi.gama.models/models/Toy Models/Art/Gama 1.8/models/GAMA 1.8.gaml b/msi.gama.models/models/Toy Models/Art/Gama 1.8/models/GAMA 1.8.gaml index 3e1b4324b6..831af8ff3d 100644 --- a/msi.gama.models/models/Toy Models/Art/Gama 1.8/models/GAMA 1.8.gaml +++ b/msi.gama.models/models/Toy Models/Art/Gama 1.8/models/GAMA 1.8.gaml @@ -210,8 +210,8 @@ species runner skills: [moving] { experiment "Run me !" type: gui autorun: true { output { - display "1.8" type: opengl fullscreen: true toolbar: #black background: #black draw_env: false { - camera default location: {1298.0375, 3277.2938, 2177.5545} target: {1261.3366, 1174.7007, 0.0}; + display "1.8" type: opengl fullscreen: true toolbar: #black background: #black axes: false { + camera #default location: {1298.0375, 3277.2938, 2177.5545} target: {1261.3366, 1174.7007, 0.0}; species roads; species runner { draw my_shape at: location depth: depth color: color; diff --git a/msi.gama.models/models/Toy Models/Art/L-Trees/models/Tree and Seasons.gaml b/msi.gama.models/models/Toy Models/Art/L-Trees/models/Tree and Seasons.gaml index 6366adcb9b..3d9fcdf0e1 100644 --- a/msi.gama.models/models/Toy Models/Art/L-Trees/models/Tree and Seasons.gaml +++ b/msi.gama.models/models/Toy Models/Art/L-Trees/models/Tree and Seasons.gaml @@ -401,9 +401,9 @@ species fruit { experiment "Random" type: gui autorun: true { output { - display 'Tree' type: opengl background: season.sky_color draw_env: false toolbar: false fullscreen: true { + display 'Tree' type: opengl background: season.sky_color axes: false toolbar: false fullscreen: true { light #ambient intensity: 150; - camera default location: {50.0,250,200} target: {50.0,50.0,0.0}; + camera #default location: {50.0,250,200} target: {50.0,50.0,0.0}; species branch aspect: default; species leaf aspect: default; species trunk aspect: default; @@ -424,9 +424,9 @@ experiment "4 simulations" type: gui autorun: true { } output { - display 'Tree' type: opengl background: season.sky_color draw_env: false toolbar: false { + display 'Tree' type: opengl background: season.sky_color axes: false toolbar: false { light #ambient intensity: 150; - camera default location: {50.0,250,200} target: {50.0,50.0,0.0}; + camera #default location: {50.0,250,200} target: {50.0,50.0,0.0}; species branch aspect: default; species leaf aspect: default; species trunk aspect: default; @@ -443,10 +443,10 @@ experiment L_Tri type: gui autorun: true { float minimum_cycle_duration <- 0.0005; float seed <- 0.05387546426306633; output { - display 'Tree' type: opengl background: season.sky_color draw_env: false toolbar: true { + display 'Tree' type: opengl background: season.sky_color axes: false toolbar: true { light #ambient intensity:0; - light #regular intensity: 120; - camera default location: {50.0,250,200} target: {50.0,50.0,0.0}; + light #default intensity: 120; + camera #default location: {50.0,250,200} target: {50.0,50.0,0.0}; species branch aspect: default; species leaf aspect: default; species trunk aspect: default; diff --git a/msi.gama.models/models/Toy Models/Art/Mondrian City/models/Mondrian City.gaml b/msi.gama.models/models/Toy Models/Art/Mondrian City/models/Mondrian City.gaml index 16da31fbb2..91f0391316 100644 --- a/msi.gama.models/models/Toy Models/Art/Mondrian City/models/Mondrian City.gaml +++ b/msi.gama.models/models/Toy Models/Art/Mondrian City/models/Mondrian City.gaml @@ -456,7 +456,7 @@ experiment MondrianCity type: gui autorun: true{ parameter "Population level" var: population_level min: 0 max: 100 step: 1 colors: [#gamablue] <-50; output { - display map synchronized:true background:#black toolbar:false type:opengl draw_env:false fullscreen:false{ + display map synchronized:true background:#black toolbar:false type:opengl axes:false fullscreen:false{ species cell aspect:default; species road ; species people; diff --git a/msi.gama.models/models/Toy Models/Art/Radiohead In Point Cloud/models/Radiohead In Point Coud.gaml b/msi.gama.models/models/Toy Models/Art/Radiohead In Point Cloud/models/Radiohead In Point Coud.gaml index ed15a46b21..8af69ecea0 100644 --- a/msi.gama.models/models/Toy Models/Art/Radiohead In Point Cloud/models/Radiohead In Point Coud.gaml +++ b/msi.gama.models/models/Toy Models/Art/Radiohead In Point Cloud/models/Radiohead In Point Coud.gaml @@ -47,7 +47,7 @@ species paranoid_android skills:[moving]{ experiment OK_Computer type:gui autorun:true{ output{ - display videotape type:opengl background:rgb(0,0,15) draw_env:false synchronized:true fullscreen:true toolbar:false{ + display videotape type:opengl background:rgb(0,0,15) axes:false synchronized:true fullscreen:true toolbar:false{ species paranoid_android aspect:house_of_cards; event["r"] {pyramid_song<-!pyramid_song;} event["a"] {the_bend<-{1,0,0};} diff --git a/msi.gama.models/models/Toy Models/Bubble Sort/models/Bubble Sort 3D.gaml b/msi.gama.models/models/Toy Models/Bubble Sort/models/Bubble Sort 3D.gaml index 4120ea23fe..16225e5921 100644 --- a/msi.gama.models/models/Toy Models/Bubble Sort/models/Bubble Sort 3D.gaml +++ b/msi.gama.models/models/Toy Models/Bubble Sort/models/Bubble Sort 3D.gaml @@ -109,7 +109,7 @@ species cells{ experiment Display type: gui { output { - display View1 type:opengl draw_env:false{ + display View1 type:opengl axes:false{ species cells transparency:0.1; graphics "di"{ draw "black(0,0,0)" at:{0,0,0} color:°black perspective:false; diff --git a/msi.gama.models/models/Toy Models/Comodels/City Boids/Adapters/Procedural City Adapter.gaml b/msi.gama.models/models/Toy Models/Comodels/City Boids/Adapters/Procedural City Adapter.gaml index 3178a0b1a1..513600cea8 100644 --- a/msi.gama.models/models/Toy Models/Comodels/City Boids/Adapters/Procedural City Adapter.gaml +++ b/msi.gama.models/models/Toy Models/Comodels/City Boids/Adapters/Procedural City Adapter.gaml @@ -27,4 +27,4 @@ experiment "Adapter" type:gui { output{ } -} \ No newline at end of file +} \ No newline at end of file diff --git a/msi.gama.models/models/Toy Models/Multi-level Data Analysis/models/MODAVI.gaml b/msi.gama.models/models/Toy Models/Multi-level Data Analysis/models/MODAVI.gaml index f672c5a2d9..0edc0d6334 100644 --- a/msi.gama.models/models/Toy Models/Multi-level Data Analysis/models/MODAVI.gaml +++ b/msi.gama.models/models/Toy Models/Multi-level Data Analysis/models/MODAVI.gaml @@ -279,8 +279,8 @@ global { experiment MODAVI type: gui { output { - display MODAVI type:opengl draw_env:false synchronized: true { - camera default location:{world.shape.width*1.5, world.shape.height,world.shape.width*4} target:{world.shape.width*1.5, world.shape.height,0}; + display MODAVI type:opengl axes:false synchronized: true { + camera #default location:{world.shape.width*1.5, world.shape.height,world.shape.width*4} target:{world.shape.width*1.5, world.shape.height,0}; graphics 'ReferenceModel'{ draw "Reference model" at:{200,50,0} size:5 color: #black perspective:false; } diff --git a/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 5.gaml b/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 5.gaml index 6896e56323..538ed65e16 100644 --- a/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 5.gaml +++ b/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 5.gaml @@ -98,7 +98,7 @@ experiment main_experiment type:gui{ monitor "Infected people rate" value: infected_rate; display map_3D type: opengl { light #ambient intensity: 20; - light #regular intensity:(is_night ? 0 : 127); + light #default intensity:(is_night ? 0 : 127); image "../includes/soil.jpg"; species road ; species people aspect:sphere3D; diff --git a/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 6.gaml b/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 6.gaml index bd37989f5b..5912e56fe0 100644 --- a/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 6.gaml +++ b/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 6.gaml @@ -120,7 +120,7 @@ experiment main_experiment type: gui { monitor "Infected people rate" value: infected_rate; display map_3D type: opengl { light #ambient intensity: 20; - light #regular intensity:(is_night ? 0 : 127); + light #default intensity:(is_night ? 0 : 127); image "../includes/soil.jpg"; species road; species people aspect: sphere3D; diff --git a/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 7.gaml b/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 7.gaml index 4f97afb971..a276b7bcd6 100644 --- a/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 7.gaml +++ b/msi.gama.models/models/Tutorials/Incremental Model/models/Incremental Model 7.gaml @@ -148,7 +148,7 @@ experiment main_experiment type: gui { monitor "Infected people rate" value: infected_rate; display map_3D type: opengl { light #ambient intensity: 20; - light #regular intensity:(is_night ? 0 : 127); + light #default intensity:(is_night ? 0 : 127); image "../includes/soil.jpg"; species road; species people aspect: sphere3D; diff --git a/msi.gama.models/models/Visualization and User Interaction/User Interaction/models/Mouse Exit and Enter.gaml b/msi.gama.models/models/Visualization and User Interaction/User Interaction/models/Mouse Exit and Enter.gaml index 3e8a5da492..3a8ce25b68 100644 --- a/msi.gama.models/models/Visualization and User Interaction/User Interaction/models/Mouse Exit and Enter.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/User Interaction/models/Mouse Exit and Enter.gaml @@ -35,7 +35,7 @@ species eyes { experiment Run { output { - display Eyes type: opengl draw_env: false { + display Eyes type: opengl axes: false { graphics face { draw circle(60) color: #gamaorange; } diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Definitions.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Definitions.gaml index 668dd61bc4..476cc632f1 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Definitions.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Definitions.gaml @@ -44,22 +44,22 @@ experiment Display type: gui autorun: true { display "Fixed location" parent: shared camera: "fixed" { camera "fixed" locked: true location: {w / 2, h * 2, w / factor} target: {w / 2, h / 2, 0} dynamic: true; } - display "Dynamic location" parent: shared { - camera default location: {w * cos(cycle), w * sin(cycle), w / factor} target: {w / 2, h / 2, 0} dynamic: true; + display "Dynamic location" parent: shared camera: #default { + camera #default location: {w * cos(cycle), w * sin(cycle), w / factor} target: {w / 2, h / 2, 0} dynamic: true; } display "Follow object" parent: shared { - camera default target: p distance: 150 / factor location: #from_above dynamic: true; + camera #default target: p distance: 150 / factor location: #from_above dynamic: true; } display "First person" parent: shared { - camera default dynamic: true location: {int(first(object).location.x), int(first(object).location.y), 5/factor} target: + camera #default dynamic: true location: {int(first(object).location.x), int(first(object).location.y), 5/factor} target: {cos(first(object).heading) * first(object).speed + int(first(object).location.x), sin(first(object).heading) * first(object).speed + int(first(object).location.y), 5/factor}; } display "Camera & rotation" parent: shared { rotation angle: 1.0 axis: {0,1,0} dynamic: true; - camera default location: #from_right distance: 40 / factor target: {w, p.y, 0} dynamic: true; + camera #default location: #from_right distance: 40 / factor target: {w, p.y, 0} dynamic: true; } display "Isometric" parent: shared { - camera default location: #isometric target: {p.x, p.y, 0} dynamic: true; + camera #default location: #isometric target: {p.x, p.y, 0} dynamic: true; } diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Shared Zoom.experiment b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Shared Zoom.experiment index 6cd93e8655..be033f5dd2 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Shared Zoom.experiment +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Camera Shared Zoom.experiment @@ -26,19 +26,19 @@ experiment "Shared Zoom Example" model: 'Building Elevation.gaml' type: gui { layout #split; display "1" parent: base { - camera default location: #isometric target: building at target1 distance: distance dynamic: true; + camera #default location: #isometric target: building at target1 distance: distance dynamic: true; } display "2" parent: base { - camera default target: building at target2 distance: distance dynamic: true; + camera #default target: building at target2 distance: distance dynamic: true; } display "3" parent: base { - camera default target: building at target3 distance: distance dynamic: true; + camera #default target: building at target3 distance: distance dynamic: true; } display "4" parent: base { - camera default target: building at target4 distance: distance dynamic: true; + camera #default target: building at target4 distance: distance dynamic: true; } } diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Lighting.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Lighting.gaml index 62254c7943..5b92f0b630 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Lighting.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Lighting.gaml @@ -44,12 +44,12 @@ experiment Display type: gui autorun: true { // we define 3 lights : the blue and red turn around the scene, changing their orientation so that the scene is always lightened // the green light does not change its position, but the angle of the spot changes light #ambient intensity: 0; - light #regular intensity: 0; - light 1 type: #spot location: {world.shape.width * cos(cycle) + world.shape.width / 2, world.shape.height * sin(cycle) + world.shape.height / 2, 20} direction: + light #default intensity: 0; + light "1" type: #spot location: {world.shape.width * cos(cycle) + world.shape.width / 2, world.shape.height * sin(cycle) + world.shape.height / 2, 20} direction: {cos(cycle + 180), sin(cycle + 180), -1} intensity: #red show: true quadratic_attenuation: 0.0001 dynamic: true; - light 2 type: #spot location: {world.shape.width * cos(cycle + 180) + world.shape.width / 2, world.shape.height * sin(cycle + 180) + world.shape.height / 2, 20} direction: + light "2" type: #spot location: {world.shape.width * cos(cycle + 180) + world.shape.width / 2, world.shape.height * sin(cycle + 180) + world.shape.height / 2, 20} direction: {cos(cycle), sin(cycle), -1} intensity: #blue show: true quadratic_attenuation: 0.0001 dynamic: true; - light 3 type: #spot location: {world.shape.width / 2, world.shape.height / 2, world.shape.width / 2} direction: {0, 0, -1} intensity: #green show: true angle: + light "3" type: #spot location: {world.shape.width / 2, world.shape.height / 2, world.shape.width / 2} direction: {0, 0, -1} intensity: #green show: true angle: 30 * (1 + cos(2 * cycle)) quadratic_attenuation: 0.0001 dynamic: true; species GAMAGeometry2D; } @@ -59,12 +59,12 @@ experiment Display type: gui autorun: true { // we define 3 lights : the blue and red turn around the scene // the green light change its location up and down, we can see the quadratic_attenuation effect : the farther the light is, the less power it has light #ambient intensity: 0; - light #regular intensity: 0; - light 1 type: #point location: {world.shape.width * cos(cycle) + world.shape.width / 2, world.shape.height * sin(cycle) + world.shape.height / 2, 20} intensity: #red show: true + light #default intensity: 0; + light "1" type: #point location: {world.shape.width * cos(cycle) + world.shape.width / 2, world.shape.height * sin(cycle) + world.shape.height / 2, 20} intensity: #red show: true quadratic_attenuation: 0.0001 dynamic: true; - light 2 type: #point location: {world.shape.width * cos(cycle + 180) + world.shape.width / 2, world.shape.height * sin(cycle + 180) + world.shape.height / 2, 20} intensity: + light "2" type: #point location: {world.shape.width * cos(cycle + 180) + world.shape.width / 2, world.shape.height * sin(cycle + 180) + world.shape.height / 2, 20} intensity: #blue show: true quadratic_attenuation: 0.0001 dynamic: true; - light 3 type: #point location: {world.shape.width / 2, world.shape.height / 2, world.shape.width * cos(cycle)} intensity: #green show: true quadratic_attenuation: 0.0001 + light "3" type: #point location: {world.shape.width / 2, world.shape.height / 2, world.shape.width * cos(cycle)} intensity: #green show: true quadratic_attenuation: 0.0001 dynamic: true; species GAMAGeometry2D aspect: default; } @@ -74,10 +74,10 @@ experiment Display type: gui autorun: true { // we define 3 lights : the blue and red change their direction // the green light change its intensity light #ambient intensity: 0; - light #regular intensity: 0; - light 1 type: #direction direction: {cos(cycle + 180), sin(cycle + 180), -1} intensity: #red show: true dynamic: true; - light 2 type: #direction direction: {cos(cycle), sin(cycle), -1} intensity: #blue show: true dynamic: true; - light 3 type: #direction direction: {0, 0, -1} intensity: rgb(0, 255 * (1 + cos(cycle)), 0) show: true dynamic: true; + light #default intensity: 0; + light "1" type: #direction direction: {cos(cycle + 180), sin(cycle + 180), -1} intensity: #red show: true dynamic: true; + light "2" type: #direction direction: {cos(cycle), sin(cycle), -1} intensity: #blue show: true dynamic: true; + light "3" type: #direction direction: {0, 0, -1} intensity: rgb(0, 255 * (1 + cos(cycle)), 0) show: true dynamic: true; species GAMAGeometry2D aspect: default; } diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Procedural City.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Procedural City.gaml index b2b321a3d6..9f499ed29e 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Procedural City.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Procedural City.gaml @@ -63,7 +63,7 @@ experiment DisplayWithDynamicDiffuseLight type: gui { output { display City type:opengl background:rgb(10,40,55){ light #ambient intensity: 0; - light #regular type:#point intensity:hsb((time mod 255) /255,1.0 ,0.5) location:{world.shape.width*0.5+ world.shape.width*1.5*sin(time*2),world.shape.width*0.5,world.shape.width*cos(time*2)} show:true dynamic:true; + light #default type:#point intensity:hsb((time mod 255) /255,1.0 ,0.5) location:{world.shape.width*0.5+ world.shape.width*1.5*sin(time*2),world.shape.width*0.5,world.shape.width*cos(time*2)} show:true dynamic:true; species Building aspect:base; } } diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Specular Effects.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Specular Effects.gaml index 43e647db7a..69e692e8d0 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Specular Effects.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/3D Visualization/models/Specular Effects.gaml @@ -120,7 +120,7 @@ experiment specular_light type: gui { display "OpenGL" type: opengl background:#black { light #ambient intensity: 20; - light #regular active:button type: #point location: {7, 7, 48} intensity: #white show: true; + light #default active:button type: #point location: {7, 7, 48} intensity: #white show: true; species sphere_species aspect: base; species cube_species aspect: base; species cylinder_species aspect: base; diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/Building Heatmap.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/Building Heatmap.gaml index c70fe0b593..b99da249d9 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/Building Heatmap.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/Building Heatmap.gaml @@ -26,11 +26,11 @@ global { experiment "Show heatmap" type: gui { output { layout #split; - display HeatmapPalette type: opengl draw_env: false background: #black { + display HeatmapPalette type: opengl axes: false background: #black { // The field is displayed without 3D rendering, a palettre of cold to warm colors and a smoothness of 4 (meaning three passes of box blur are being done to "spread" the values) mesh heatmap scale: 0 color: palette([ #black, #cyan, #yellow, #yellow, #red, #red, #red]) smooth: 4 ; } - display HeatmapGradient type: opengl draw_env: false background: #black { + display HeatmapGradient type: opengl axes: false background: #black { species building refresh: false { draw shape border: #white wireframe: true width: 3; } diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/Color Brewer.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/Color Brewer.gaml index 94eaf3b47e..c746d2f2af 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/Color Brewer.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/Color Brewer.gaml @@ -66,7 +66,7 @@ experiment BrewerPalette type: gui { parameter "Diverging Palettes" var:divergingPalette category:"Brewer"; parameter "Qualitatives Palettes" var:qualitativePalette category:"Brewer"; output { - display View1 type:opengl draw_env:false{ + display View1 type:opengl axes:false{ graphics "brewer"{ //Sequential draw "Sequential" at:{-world.shape.width*0.2,0} color:#black perspective:true; diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/DEM Generator.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/DEM Generator.gaml index 5660f8ecfd..a64b4e5648 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/DEM Generator.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/DEM Generator.gaml @@ -87,7 +87,7 @@ experiment Terrain type: gui { list field_and_forest <- palette(reverse([#sienna, #olive, #darkgreen, #green, #forestgreen, #lightgreen])); output { layout #split consoles: false controls: false toolbars: false; - display "Terrain" type: opengl draw_env: false { + display "Terrain" type: opengl axes: false { mesh terrain color: palette_name = "Seaside" ? land_and_sea : field_and_forest triangulation: true; } diff --git a/msi.gama.models/models/Visualization and User Interaction/Visualization/Text Display.gaml b/msi.gama.models/models/Visualization and User Interaction/Visualization/Text Display.gaml index 2cce8d6887..960f4dd029 100644 --- a/msi.gama.models/models/Visualization and User Interaction/Visualization/Text Display.gaml +++ b/msi.gama.models/models/Visualization and User Interaction/Visualization/Text Display.gaml @@ -21,7 +21,7 @@ experiment Strings { output { layout #split; - display "Strings" type: opengl synchronized: true draw_env: false { + display "Strings" type: opengl synchronized: true axes: false { graphics Strings { draw world.shape wireframe: true color: #black; int y <- 5; diff --git a/simtools.gaml.extensions.physics/models/Physics Engine/models/Eroding Vulcano.gaml b/simtools.gaml.extensions.physics/models/Physics Engine/models/Eroding Vulcano.gaml index 1449c87d7e..c6a63ea14a 100644 --- a/simtools.gaml.extensions.physics/models/Physics Engine/models/Eroding Vulcano.gaml +++ b/simtools.gaml.extensions.physics/models/Physics Engine/models/Eroding Vulcano.gaml @@ -106,7 +106,7 @@ experiment "3D view" type: gui { parameter "Show legend" var: show_legend <- true; output { - display "3D" type: opengl draw_env: false background: #black camera:#from_up_front antialias: false { + display "3D" type: opengl axes: false background: #black camera:#from_up_front antialias: false { graphics title { if (show_legend) { draw "Average height " + (patches mean_of each.grid_value) with_precision 2 + " / # of lava agents " + length(lava) color: #white font: title at: {world.location.x, 100, patches max_of each.grid_value + 10} anchor: #center depth: 2 rotate: -20::{1,0,0}; diff --git a/simtools.gaml.extensions.physics/models/Physics Engine/models/Flow on Terrain.gaml b/simtools.gaml.extensions.physics/models/Physics Engine/models/Flow on Terrain.gaml index f4c674ff55..af4519d70d 100644 --- a/simtools.gaml.extensions.physics/models/Physics Engine/models/Flow on Terrain.gaml +++ b/simtools.gaml.extensions.physics/models/Physics Engine/models/Flow on Terrain.gaml @@ -75,7 +75,7 @@ experiment "3D view" type: gui { output { layout #split; display "Flow" type: opengl background: #white antialias: false { - camera default location: camera_loc distance: distance dynamic: true; + camera #default location: camera_loc distance: distance dynamic: true; graphics world { draw "Scale: " + z_scale color: #cadetblue font: font("Helvetica", 18, #bold) at: {world.location.x, -10, 25} anchor: #center depth: 2 rotate: -90::{1,0,0}; draw aabb wireframe: true color: #lightblue; diff --git a/simtools.gaml.extensions.physics/models/Physics Engine/models/Hello World.gaml b/simtools.gaml.extensions.physics/models/Physics Engine/models/Hello World.gaml index d0e0305476..9c8a9ef18a 100644 --- a/simtools.gaml.extensions.physics/models/Physics Engine/models/Hello World.gaml +++ b/simtools.gaml.extensions.physics/models/Physics Engine/models/Hello World.gaml @@ -60,7 +60,7 @@ species ball skills: [dynamic_body] { experiment Display type: gui { output { - display Falling type: opengl background:rgb(128,128,128) draw_env:false{ + display Falling type: opengl background:rgb(128,128,128) axes:false{ graphics World refresh: false{ draw shape color: #white; } diff --git a/simtools.gaml.extensions.physics/models/Physics Engine/models/Perfect Gas Chamber.gaml b/simtools.gaml.extensions.physics/models/Physics Engine/models/Perfect Gas Chamber.gaml index 352a33bece..83fb5bd230 100644 --- a/simtools.gaml.extensions.physics/models/Physics Engine/models/Perfect Gas Chamber.gaml +++ b/simtools.gaml.extensions.physics/models/Physics Engine/models/Perfect Gas Chamber.gaml @@ -85,7 +85,7 @@ experiment "Gas Chamber" type: gui { } } output { - display Cube type:opengl background:#white draw_env:false camera: "1" { + display Cube type:opengl background:#white axes:false camera: "1" { camera "1" location: {236.9814,1275.9964,799.6291} target: {250.0,250.0,150.0}; camera "2" location: {236.9814,-1275.9964,799.6291} target: {250.0,250.0,150.0}; species wall; diff --git a/simtools.gaml.extensions.physics/models/Physics Engine/models/Play Pool.gaml b/simtools.gaml.extensions.physics/models/Physics Engine/models/Play Pool.gaml index af82eb6df1..c81bb83f2f 100644 --- a/simtools.gaml.extensions.physics/models/Physics Engine/models/Play Pool.gaml +++ b/simtools.gaml.extensions.physics/models/Physics Engine/models/Play Pool.gaml @@ -179,7 +179,7 @@ experiment "Play !" type: gui autorun: true { output { display Pool type: opengl antialias: false { - camera default location: {100.0,400.0,300.0} target: {width/2,height/2,-20.0}; + camera #default location: {100.0,400.0,300.0} target: {width/2,height/2,-20.0}; graphics user { if (white != nil) and (target != nil) { draw line(white, target) color: #white end_arrow: 3; diff --git a/simtools.gaml.extensions.physics/models/Physics Engine/models/Stairs.gaml b/simtools.gaml.extensions.physics/models/Physics Engine/models/Stairs.gaml index d2fd1d283d..f339c6f015 100644 --- a/simtools.gaml.extensions.physics/models/Physics Engine/models/Stairs.gaml +++ b/simtools.gaml.extensions.physics/models/Physics Engine/models/Stairs.gaml @@ -84,7 +84,7 @@ species ball skills: [dynamic_body] { experiment Stairs type: gui { output { - display "Climb" type: opengl draw_env: false { + display "Climb" type: opengl axes: false { graphics ground { draw shape color: rgb(122, 140, 70, 255); //draw aabb wireframe: true color: #blue; diff --git a/simtools.gaml.extensions.physics/models/Physics Engine/models/Tricky Fountain.gaml b/simtools.gaml.extensions.physics/models/Physics Engine/models/Tricky Fountain.gaml index 1936eb7a27..c0a279dc00 100644 --- a/simtools.gaml.extensions.physics/models/Physics Engine/models/Tricky Fountain.gaml +++ b/simtools.gaml.extensions.physics/models/Physics Engine/models/Tricky Fountain.gaml @@ -105,8 +105,8 @@ species water skills: [dynamic_body] { experiment "3D View" type: gui { output { //The initial orientation of the display makes water drops 'fall' slightly towards the user... calling (hopefully) from immediate action! - display Flow type: opengl background: #black draw_env: false { - camera default location: {50,300,150} target: {dim/2,dim/2,10}; + display Flow type: opengl background: #black axes: false { + camera #default location: {50,300,150} target: {dim/2,dim/2,10}; species water {draw shape color: color;} species wall refresh: false {draw shape texture: image_file("../images/marble2.jpg");} species pillarAndFloor refresh: false {draw shape texture: image_file("../images/marble.jpg");} diff --git a/simtools.gaml.extensions.traffic/models/Driving Skill/models/Simple Intersection.gaml b/simtools.gaml.extensions.traffic/models/Driving Skill/models/Simple Intersection.gaml index f518091a2d..b9e4a58a3a 100644 --- a/simtools.gaml.extensions.traffic/models/Driving Skill/models/Simple Intersection.gaml +++ b/simtools.gaml.extensions.traffic/models/Driving Skill/models/Simple Intersection.gaml @@ -218,7 +218,7 @@ species car skills: [advanced_driving] { experiment simple_intersection type: gui { output { - display city type: opengl background: #black synchronized: true draw_env: false{ + display city type: opengl background: #black synchronized: true axes: false{ species road aspect: base_ligne; species intersection aspect: base; species car ; diff --git a/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java b/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java index 398f04db66..104130be83 100644 --- a/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java +++ b/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java @@ -19,9 +19,6 @@ */ public interface IKeyword { - /** The origin. */ - String ORIGIN = "**origin**"; - /** The dot. */ String _DOT = "."; @@ -46,15 +43,18 @@ public interface IKeyword { /** The all. */ String ALL = "all"; - /** The anchor. */ - String ANCHOR = "anchor"; - - /** The ambient light. */ - String AMBIENT_LIGHT = "ambient_light"; + /** The alpha. */ + String ALPHA = "alpha"; /** The among. */ String AMONG = "among"; + /** The anchor. */ + String ANCHOR = "anchor"; + + /** The angle. */ + String ANGLE = "angle"; + /** The annealing. */ String ANNEALING = "annealing"; @@ -82,9 +82,6 @@ public interface IKeyword { /** The aspect. */ String ASPECT = "aspect"; - /** The asset3d. */ - String ASSET3D = "asset3D"; - /** The at. */ String AT = "at"; @@ -94,12 +91,12 @@ public interface IKeyword { /** The author. */ String AUTHOR = "author"; - /** The autosave. */ - String AUTOSAVE = "autosave"; - /** The autorun. */ String AUTORUN = "autorun"; + /** The autosave. */ + String AUTOSAVE = "autosave"; + /** The avoid mask. */ String AVOID_MASK = "avoid_mask"; @@ -109,38 +106,42 @@ public interface IKeyword { /** The background. */ String BACKGROUND = "background"; + /** The bands. */ + String BANDS = "bands"; + /** The bar. */ String BAR = "bar"; - /** The box whisker. */ - String BOX_WHISKER = "box_whisker"; // new type of - // chart: box and /** The batch. */ - // whisker String BATCH = "batch"; - /** The batch outputs */ - String BATCH_VAR_OUTPUTS = "outputs"; - /** The batch outputs */ String BATCH_OUTPUT = "results"; /** The batch outputs */ String BATCH_REPORT = "report"; + /** The batch outputs */ + String BATCH_VAR_OUTPUTS = "outputs"; + /** The behavior. */ String BEHAVIOR = "behavior"; - /** The behaviors. */ - String BEHAVIORS = "behaviors"; - /** The benchmark. */ - // public static final String BITMAP = "bitmap"; String BENCHMARK = "benchmark"; + /** The bool. */ + String BOOL = "bool"; + + /** The border. */ + String BORDER = "border"; + /** The bounds. */ String BOUNDS = "bounds"; + /** The box whisker. */ + String BOX_WHISKER = "box_whisker"; + /** The break. */ String BREAK = "break"; @@ -153,21 +154,6 @@ public interface IKeyword { /** The camera. */ String CAMERA = "camera"; - /** The camera location. */ - String CAMERA_LOCATION = "camera_location"; - - /** The camera target. */ - String CAMERA_TARGET = "camera_target"; - - /** The camera orientation. */ - String CAMERA_ORIENTATION = "camera_orientation"; - - /** The camera lens. */ - String CAMERA_LENS = "camera_lens"; - - /** The camera interaction. */ - String CAMERA_INTERACTION = "camera_interaction"; - /** The capture. */ String CAPTURE = "capture"; @@ -177,12 +163,12 @@ public interface IKeyword { /** The category. */ String CATEGORY = "category"; - /** The cell width. */ - String CELL_WIDTH = "cell_width"; - /** The cell height. */ String CELL_HEIGHT = "cell_height"; + /** The cell width. */ + String CELL_WIDTH = "cell_width"; + /** The cellular. */ String CELLULAR = "cellular"; @@ -228,11 +214,14 @@ public interface IKeyword { /** The const. */ String CONST = "const"; + /** The container. */ + String CONTAINER = "container"; + /** The contents. */ String CONTENTS = "contents"; - /** The contribute. */ - String CONTRIBUTE = "contribute"; + /** The continue. */ + String CONTINUE = "continue"; /** The control. */ String CONTROL = "control"; @@ -240,9 +229,6 @@ public interface IKeyword { /** The convolution. */ String CONVOLUTION = "convolution"; - /** The continue. */ - String CONTINUE = "continue"; - /** The create. */ String CREATE = "create"; @@ -252,6 +238,9 @@ public interface IKeyword { /** The current state. */ String CURRENT_STATE = "currentState"; + /** The cycle length. */ + String CYCLE_LENGTH = "cycle_length"; + /** The damper. */ String DAMPER = "damper"; @@ -266,41 +255,39 @@ public interface IKeyword { /** The default. */ String DEFAULT = "default"; - // public static final String DEFAULT_EXP = "default"; - // public static final String DEM = "dem"; + /** The depth. */ - // public static final String DEPENDS_ON = "depends_on"; String DEPTH = "depth"; + /** The description. */ + String DESCRIPTION = "description"; + /** The destination. */ String DESTINATION = "destination"; - /** The diffusion. */ - String DIFFUSION = "diffusion"; + /** The dif2. */ + String DIF2 = "diff2"; + + /** The diff. */ + String DIFF = "diff"; /** The diffuse. */ String DIFFUSE = "diffuse"; - /** The diffuse light. */ - String DIFFUSE_LIGHT = "diffuse_light"; - - /** The diffuse light pos. */ - String DIFFUSE_LIGHT_POS = "diffuse_light_pos"; + /** The diffusion. */ + String DIFFUSION = "diffusion"; /** The direction. */ String DIRECTION = "direction"; - /** The display. */ - String DISPLAY = "display"; - - /** The display gl. */ - String DISPLAY_GL = "graphdisplaygl"; + /** The directory. */ + String DIRECTORY = "directory"; - /** The display graph. */ - String DISPLAY_GRAPH = "graphdisplay"; + /** The disables. */ + String DISABLES = "disables"; - /** The distance cache. */ - String DISTANCE_CACHE = "distance_cache_enabled"; + /** The display. */ + String DISPLAY = "display"; /** The divide. */ String DIVIDE = "/"; @@ -314,18 +301,6 @@ public interface IKeyword { /** The draw. */ String DRAW = "draw"; - /** The drawenv. */ - String DRAWENV = "draw_env"; - - /** The draw diffuse light. */ - String DRAW_DIFFUSE_LIGHT = "draw_diffuse_light"; - - /** The draw light. */ - String DRAW_LIGHT = "draw_light"; - - /** The elevation. */ - String ELEVATION = "elevation"; - /** The dynamic. */ String DYNAMIC = "dynamic"; @@ -338,17 +313,20 @@ public interface IKeyword { /** The edge species. */ String EDGE_SPECIES = "edge_species"; + /** The elevation. */ + String ELEVATION = "elevation"; + /** The else. */ String ELSE = "else"; /** The empty. */ String EMPTY = "empty"; - /** The wireframe. */ - String WIREFRAME = "wireframe"; - - /** The border. */ - String BORDER = "border"; + /** The enables. */ + /* + * + */ + String ENABLES = "enables"; /** The enter. */ String ENTER = "enter"; @@ -362,8 +340,11 @@ public interface IKeyword { /** The equals. */ String EQUALS = "equals"; - /** The gama. */ - String GAMA = "gama"; + /** The equation. */ + String EQUATION = "equation"; + + /** The equation left. */ + String EQUATION_LEFT = "left"; /** The equation op. */ /* @@ -371,125 +352,78 @@ public interface IKeyword { */ String EQUATION_OP = "="; - /** The equation left. */ - String EQUATION_LEFT = "left"; - /** The equation right. */ String EQUATION_RIGHT = "right"; - /** The equation. */ - String EQUATION = "equation"; - - /** The simultaneously. */ - String SIMULTANEOUSLY = "simultaneously"; - - /** The solver. */ - String SOLVER = "solver"; - - /** The solve. */ - String SOLVE = "solve"; - - /** The time initial. */ - String TIME_INITIAL = "t0"; - - /** The time final. */ - String TIME_FINAL = "tf"; - - /** The cycle length. */ - String CYCLE_LENGTH = "cycle_length"; - - /** The diff. */ - String DIFF = "diff"; - - /** The dif2. */ - String DIF2 = "diff2"; - - /** The zero. */ - String ZERO = "internal_zero_order_equation"; - - /** The enables. */ - /* - * - */ - String ENABLES = "enables"; - - /** The disables. */ - String DISABLES = "disables"; - - /** The updates. */ - String UPDATES = "updates"; - - /** The extensions. */ - String EXTENSIONS = "extensions"; + /** The error. */ + String ERROR = "error"; /** The event. */ String EVENT = "event"; - /** The error. */ - String ERROR = "error"; - /** The exhaustive. */ String EXHAUSTIVE = "exhaustive"; /** The exists. */ String EXISTS = "exists"; - /** The explicit. */ - String EXPLICIT = "explicit"; - /** The experiment. */ String EXPERIMENT = "experiment"; + /** The explicit. */ + String EXPLICIT = "explicit"; + /** The exploded. */ - // public static final String EXPERIMENTATOR = "experimentator"; String EXPLODED = "exploded"; /** The extension. */ - // public static final String EXPORT = "export"; String EXTENSION = "extension"; + /** The extensions. */ + String EXTENSIONS = "extensions"; + /** The fading. */ String FADING = "fading"; /** The false. */ String FALSE = "false"; + /** The field. */ + String FIELD = "field"; + /** The file. */ String FILE = "file"; - /** The folder. */ - String FOLDER = "folder"; - - /** The directory. */ - String DIRECTORY = "directory"; - /** The files. */ String FILES = "files"; - /** The output file. */ - String OUTPUT_FILE = "output_file"; - /** The fill with. */ String FILL_WITH = "fill_with"; - /** The field. */ - String FIELD = "field"; - /** The fitness. */ String FITNESS = "fitness"; + /** The float. */ + String FLOAT = "float"; + /** The focus. */ String FOCUS = "focus"; /** The focus on. */ String FOCUS_ON = "focus_on"; + /** The folder. */ + String FOLDER = "folder"; + /** The font. */ String FONT = "font"; /** The footer. */ String FOOTER = "footer"; + /** The fragment. */ + String FRAGMENT = "fragment"; + /** The framerate. */ String FRAMERATE = "framerate"; @@ -502,11 +436,14 @@ public interface IKeyword { /** The fsm. */ String FSM = "fsm"; + /** The fullscreen. */ + String FULLSCREEN = "fullscreen"; + /** The function. */ String FUNCTION = "function"; - /** The fullscreen. */ - String FULLSCREEN = "fullscreen"; + /** The gama. */ + String GAMA = "gama"; /** The gap. */ String GAP = "gap"; @@ -517,6 +454,9 @@ public interface IKeyword { /** The genetic. */ String GENETIC = "genetic"; + /** The geometry. */ + String GEOMETRY = "geometry"; + /** The gis. */ String GIS = "gis"; @@ -547,18 +487,15 @@ public interface IKeyword { /** The grid population. */ String GRID_POPULATION = "display_grid"; + /** The grid value. */ + String GRID_VALUE = "grid_value"; + /** The grid x. */ String GRID_X = "grid_x"; /** The grid y. */ String GRID_Y = "grid_y"; - /** The grid value. */ - String GRID_VALUE = "grid_value"; - - /** The bands. */ - String BANDS = "bands"; - /** The group. */ String GROUP = "group"; @@ -628,18 +565,30 @@ public interface IKeyword { /** The inspect. */ String INSPECT = "inspect"; + /** The int. */ + String INT = "int"; + + /** The internal. */ + String INTERNAL = "_internal_"; + /** The internal function. */ String INTERNAL_FUNCTION = "internal_function"; + /** The invoke. */ + String INVOKE = "invoke"; + /** The is. */ String IS = "is"; - /** The isfolder. */ - String ISFOLDER = "is_folder"; - /** The is light on. */ String IS_LIGHT_ON = "light"; + /** The is skill. */ + String IS_SKILL = "is_skill"; + + /** The isfolder. */ + String ISFOLDER = "is_folder"; + /** The isnot. */ String ISNOT = "is_not"; @@ -649,9 +598,6 @@ public interface IKeyword { /** The its. */ String ITS = "its"; - /** The fragment. */ - String FRAGMENT = "fragment"; - /** The java. */ String JAVA = "java"; @@ -671,12 +617,8 @@ public interface IKeyword { String KEYSTONE = "keystone"; /** The kill. */ - // public static final String KEYWORD = "keyword"; String KILL = "kill"; - /** The overlay. */ - String OVERLAY = "overlay"; - /** The layout. */ String LAYOUT = "layout"; @@ -689,29 +631,40 @@ public interface IKeyword { /** The let. */ String LET = "let"; + /** The lighted. */ + String LIGHTED = "lighted"; + /** The line. */ String LINE = "line"; + /** The linear attenuation. */ + String LINEAR_ATTENUATION = "linear_attenuation"; + /** The lines. */ String LINES = "lines"; - /** The linear attenuation. */ - String LINEAR_ATTENUATION = "linear_attenuation"; + /** + * TYPES + */ + String LIST = "list"; /** The location. */ String LOCATION = "location"; + /** The look at. */ + String LOOK_AT = "look_at"; + /** The loop. */ String LOOP = "loop"; - /** The look at. */ - String LOOK_AT = "look_at"; + /** The map. */ + String MAP = "map"; /** The mapping. */ String MAPPING = "mapping"; - /** The material. */ - String MATERIAL = "material"; + /** The mask. */ + String MASK = "mask"; /** The match. */ String MATCH = "match"; @@ -725,8 +678,11 @@ public interface IKeyword { /** The match regex. */ String MATCH_REGEX = "match_regex"; - /** The mask. */ - String MASK = "mask"; + /** The material. */ + String MATERIAL = "material"; + + /** The matrix. */ + String MATRIX = "matrix"; /** The max. */ String MAX = "max"; @@ -743,12 +699,12 @@ public interface IKeyword { /** The mersenne. */ String MERSENNE = "mersenne"; - /** The message. */ - String MESSAGE = "message"; - /** The mesh. */ String MESH = "mesh"; + /** The message. */ + String MESSAGE = "message"; + /** The method. */ String METHOD = "method"; @@ -785,17 +741,11 @@ public interface IKeyword { /** The monitor. */ String MONITOR = "monitor"; - /** The mouse down. */ - String MOUSE_DOWN = "mouse_down"; - - /** The mouse up. */ - String MOUSE_UP = "mouse_up"; - /** The mouse clicked. */ String MOUSE_CLICKED = "mouse_click"; - /** The mouse moved. */ - String MOUSE_MOVED = "mouse_move"; + /** The mouse down. */ + String MOUSE_DOWN = "mouse_down"; /** The mouse entered. */ String MOUSE_ENTERED = "mouse_enter"; @@ -806,18 +756,24 @@ public interface IKeyword { /** The mouse menu. */ String MOUSE_MENU = "mouse_menu"; - /** The moving skill. */ - String MOVING_SKILL = "moving"; + /** The mouse moved. */ + String MOUSE_MOVED = "mouse_move"; + + /** The mouse up. */ + String MOUSE_UP = "mouse_up"; /** The moving 3d skill. */ String MOVING_3D_SKILL = "moving3D"; - /** The multiply. */ - String MULTIPLY = "*"; + /** The moving skill. */ + String MOVING_SKILL = "moving"; /** The multicore. */ String MULTICORE = "multicore"; + /** The multiply. */ + String MULTIPLY = "*"; + /** The my. */ String MY = "my"; @@ -830,14 +786,20 @@ public interface IKeyword { /** The name. */ String NAME = "name"; - /** The neighbours. */ - String NEIGHBOURS = "neighbours"; + /** The nb cols. */ + String NB_COLS = "nb_cols"; + + /** The nb rows. */ + String NB_ROWS = "nb_rows"; /** The neighbors. */ String NEIGHBORS = "neighbors"; - /** The node. */ - String NODE = "node"; + /** The neighbours. */ + String NEIGHBOURS = "neighbours"; + + /** The no experiment. */ + String NO_EXPERIMENT = "no_experiment"; /** The no info. */ String NO_INFO = "no_info"; @@ -845,8 +807,8 @@ public interface IKeyword { /** The no warning. */ String NO_WARNING = "no_warning"; - /** The no experiment. */ - String NO_EXPERIMENT = "no_experiment"; + /** The node. */ + String NODE = "node"; /** The null. */ String NULL = "nil"; @@ -854,12 +816,6 @@ public interface IKeyword { /** The number. */ String NUMBER = "number"; - /** The nb cols. */ - String NB_COLS = "nb_cols"; - - /** The nb rows. */ - String NB_ROWS = "nb_rows"; - /** The of. */ String OF = "of"; @@ -869,6 +825,9 @@ public interface IKeyword { /** The on change. */ String ON_CHANGE = "on_change"; + /** The open. */ + String OPEN = "open"; + /** The open exp. */ String OPEN_EXP = "("; @@ -881,6 +840,9 @@ public interface IKeyword { /** The optional. */ String OPTIONAL = "optional"; + /** The origin. */ + String ORIGIN = "**origin**"; + /** The orthographic projection. */ String ORTHOGRAPHIC_PROJECTION = "orthographic_projection"; @@ -890,15 +852,30 @@ public interface IKeyword { /** The output. */ String OUTPUT = "output"; + /** The output file. */ + String OUTPUT_FILE = "output_file"; + /** The over. */ String OVER = "over"; + /** The overlay. */ + String OVERLAY = "overlay"; /** The overwrite. */ String OVERWRITE = "overwrite"; + /** The pair. */ + String PAIR = "pair"; + + /** The parallel. */ + // " + String PARALLEL = "parallel"; + /** The parameter. */ String PARAMETER = "parameter"; + /** The parameters. */ + String PARAMETERS = "parameters"; + /** The params. */ String PARAMS = "params"; @@ -915,11 +892,7 @@ public interface IKeyword { String PEERS = "peers"; /** The permanent. */ - String PERMANENT = "permanent"; // "show" // "front_end" - // // "presentation" // - /** The parallel. */ - // " - String PARALLEL = "parallel"; + String PERMANENT = "permanent"; /** The perspective. */ String PERSPECTIVE = "perspective"; @@ -933,9 +906,15 @@ public interface IKeyword { /** The places. */ String PLACES = "places"; + /** The platform. */ + String PLATFORM = "platform"; + /** The plus. */ String PLUS = "+"; + /** The point. */ + String POINT = "point"; + /** The population. */ String POPULATION = "display_population"; @@ -990,6 +969,9 @@ public interface IKeyword { /** The readable. */ String READABLE = "readable"; + /** The real speed. */ + String REAL_SPEED = "real_speed"; + /** The reflectivity. */ String REFLECTIVITY = "reflectivity"; @@ -1032,6 +1014,9 @@ public interface IKeyword { /** The rewrite. */ String REWRITE = "rewrite"; + /** The rgb. */ + String RGB = "rgb"; + /** The right. */ String RIGHT = "right"; @@ -1044,15 +1029,15 @@ public interface IKeyword { /** The roll. */ String ROLL = "roll"; - /** The rounded. */ - String ROUNDED = "rounded"; - /** The rotate. */ String ROTATE = "rotate"; /** The rotation. */ String ROTATION = "rotation"; + /** The rounded. */ + String ROUNDED = "rounded"; + /** The save. */ String SAVE = "save"; @@ -1083,9 +1068,6 @@ public interface IKeyword { /** The self. */ String SELF = "self"; - /** The super. */ - String SUPER = "super"; - /** The series. */ String SERIES = "series"; @@ -1095,8 +1077,8 @@ public interface IKeyword { /** The shape. */ String SHAPE = "shape"; - /** The showfps. */ - String SHOWFPS = "show_fps"; + /** The show. */ + String SHOW = "show"; /** The simulation. */ String SIMULATION = "simulation"; @@ -1104,6 +1086,9 @@ public interface IKeyword { /** The simulations. */ String SIMULATIONS = "simulations"; + /** The simultaneously. */ + String SIMULTANEOUSLY = "simultaneously"; + /** The size. */ String SIZE = "size"; @@ -1113,30 +1098,30 @@ public interface IKeyword { /** The skills. */ String SKILLS = "skills"; + /** The smooth. */ + String SMOOTH = "smooth"; + /** The sobol exploration method */ String SOBOL = "sobol"; + /** The solve. */ + String SOLVE = "solve"; + + /** The solver. */ + String SOLVER = "solver"; + /** The source. */ String SOURCE = "source"; /** The species. */ String SPECIES = "species"; - /** The specular. */ - String SPECULAR = "specular"; - /** The speed. */ String SPEED = "speed"; - /** The real speed. */ - String REAL_SPEED = "real_speed"; - /** The spline. */ String SPLINE = "spline"; - /** The spot angle. */ - String SPOT_ANGLE = "spot_angle"; - /** The stack. */ String STACK = "stack"; @@ -1158,27 +1143,33 @@ public interface IKeyword { /** The stop sound. */ String STOP_SOUND = "stop_sound"; - /** The strategy. */ - String STRATEGY = "scheduling_strategy"; + /** The string. */ + String STRING = "string"; /** The style. */ String STYLE = "style"; + /** The super. */ + String SUPER = "super"; + /** The switch. */ String SWITCH = "switch"; /** The synthetic. */ String SYNTHETIC = "__synthetic__"; + /** The synthetic resources prefix. */ + String SYNTHETIC_RESOURCES_PREFIX = "__synthetic__"; + + /** The table. */ + String TABLE = "table"; + /** The tabu. */ String TABU = "tabu"; /** The target. */ String TARGET = "target"; - /** The targets. */ - String TARGETS = "scheduling_targets"; - /** The tesselation. */ String TESSELATION = "tesselation"; @@ -1200,21 +1191,17 @@ public interface IKeyword { /** The three d. */ String THREE_D = "3d"; - /** The times. */ - String TIMES = "times"; - - /** The time series. */ - String TIME_SERIES = "time_series"; // hqnghi facet for + /** The time final. */ + String TIME_FINAL = "tf"; - /** The table. */ - // continuous Chart - String TABLE = "table"; + /** The time initial. */ + String TIME_INITIAL = "t0"; - /** The description. */ - String DESCRIPTION = "description"; + /** The time series. */ + String TIME_SERIES = "time_series"; - /** The parameters. */ - String PARAMETERS = "parameters"; + /** The times. */ + String TIMES = "times"; /** The title. */ String TITLE = "title"; @@ -1222,6 +1209,9 @@ public interface IKeyword { /** The to. */ String TO = "to"; + /** The toolbar. */ + String TOOLBAR = "toolbar"; + /** The topology. */ String TOPOLOGY = "topology"; @@ -1249,20 +1239,32 @@ public interface IKeyword { /** The unit. */ String UNIT = "unit"; + /** The unknown. */ + String UNKNOWN = "unknown"; + /** The until. */ String UNTIL = "until"; /** The update. */ String UPDATE = "update"; - /** The up vector. */ - String UP_VECTOR = "up_vector"; + /** The updates. */ + String UPDATES = "updates"; + + /** The user command. */ + String USER_COMMAND = "user_command"; + + /** The user confirm. */ + String USER_CONFIRM = "user_confirm"; /** The user controlled. */ String USER_CONTROLLED = "user_controlled"; - /** The user command. */ - String USER_COMMAND = "user_command"; + /** The user first. */ + String USER_FIRST = "user_first"; + + /** The user init. */ + String USER_INIT = "user_init"; /** The user input. */ String USER_INPUT = "user_input"; @@ -1270,24 +1272,12 @@ public interface IKeyword { /** The user input dialog. */ String USER_INPUT_DIALOG = "user_input_dialog"; - /** The user confirm. */ - String USER_CONFIRM = "user_confirm"; - - /** The wizard. */ - String WIZARD = "wizard"; - - /** The wizard page. */ - String WIZARD_PAGE = "wizard_page"; + /** The user last. */ + String USER_LAST = "user_last"; /** The user only. */ String USER_ONLY = "user_only"; - /** The user first. */ - String USER_FIRST = "user_first"; - - /** The user last. */ - String USER_LAST = "user_last"; - /** The user panel. */ String USER_PANEL = "user_panel"; @@ -1333,21 +1323,27 @@ public interface IKeyword { /** The when. */ String WHEN = "when"; - /** The whisker. */ - String WHISKER = "whisker"; // new type of datachart - /** The while. */ String WHILE = "while"; + /** The whisker. */ + String WHISKER = "whisker"; + /** The width. */ String WIDTH = "width"; - /** The lighted. */ - String LIGHTED = "lighted"; + /** The wireframe. */ + String WIREFRAME = "wireframe"; /** The with. */ String WITH = "with"; + /** The wizard. */ + String WIZARD = "wizard"; + + /** The wizard page. */ + String WIZARD_PAGE = "wizard_page"; + /** The world agent name. */ String WORLD_AGENT_NAME = "world"; @@ -1360,19 +1356,18 @@ public interface IKeyword { /** The x. */ String X = "x"; - /** The xml. */ - String XML = "xml"; - - /** The xy. */ - // public static final String XOR = "xor"; - String XY = "xy"; - /** The x labels. */ String X_LABELS = "x_serie_labels"; /** The x serie. */ String X_SERIE = "x_serie"; + /** The xml. */ + String XML = "xml"; + + /** The xy. */ + String XY = "xy"; + /** The y. */ String Y = "y"; @@ -1385,89 +1380,13 @@ public interface IKeyword { /** The z. */ String Z = "z"; - /** The zfighting. */ - String ZFIGHTING = "z_fighting"; - - /** The methods. */ - String[] METHODS = { GENETIC, ANNEALING, HILL_CLIMBING, TABU, REACTIVE_TABU, EXHAUSTIVE, PSO, EXPLICIT, SOBOL }; + /** The zero. */ + String ZERO = "internal_zero_order_equation"; /** The event type. */ String[] EVENT_TYPE = { OTHER_EVENTS, MOUSE_DOWN }; - /** The user init. */ - String USER_INIT = "user_init"; - - /** The is skill. */ - // public static final String AS_SKILL = "as_skill"; - String IS_SKILL = "is_skill"; - - /** - * TYPES - */ - String LIST = "list"; - - /** The map. */ - String MAP = "map"; - - /** The bool. */ - String BOOL = "bool"; - - /** The float. */ - String FLOAT = "float"; - - /** The int. */ - String INT = "int"; - - /** The string. */ - String STRING = "string"; - - /** The point. */ - String POINT = "point"; - - /** The pair. */ - String PAIR = "pair"; - - /** The unknown. */ - String UNKNOWN = "unknown"; - - /** The matrix. */ - String MATRIX = "matrix"; - - /** The rgb. */ - String RGB = "rgb"; - - /** The container. */ - String CONTAINER = "container"; - - /** The geometry. */ - String GEOMETRY = "geometry"; - - /** The open. */ - /* - * files - */ - String OPEN = "open"; // TODO "launch", or "open", or - // "sysopen" ? This opens a file - // with an - /** The alpha. */ - // external progam - String ALPHA = "alpha"; - - /** The internal. */ - String INTERNAL = "_internal_"; - - /** The synthetic resources prefix. */ - String SYNTHETIC_RESOURCES_PREFIX = "__synthetic__"; - - /** The platform. */ - String PLATFORM = "platform"; - - /** The invoke. */ - String INVOKE = "invoke"; - - /** The toolbar. */ - String TOOLBAR = "toolbar"; + /** The methods. */ + String[] METHODS = { GENETIC, ANNEALING, HILL_CLIMBING, TABU, REACTIVE_TABU, EXHAUSTIVE, PSO, EXPLICIT, SOBOL }; - /** The smooth. */ - String SMOOTH = "smooth"; } diff --git a/ummisco.gama.network/models/Network/2 Available protocols/UDP protocol/UDP Listener Mouse from Processing For camera.gaml b/ummisco.gama.network/models/Network/2 Available protocols/UDP protocol/UDP Listener Mouse from Processing For camera.gaml index 7190073084..55302b4cd2 100644 --- a/ummisco.gama.network/models/Network/2 Available protocols/UDP protocol/UDP Listener Mouse from Processing For camera.gaml +++ b/ummisco.gama.network/models/Network/2 Available protocols/UDP protocol/UDP Listener Mouse from Processing For camera.gaml @@ -45,7 +45,7 @@ species observedAgents { experiment Server_testdd type: gui { output { display d type: opengl { - camera default target: cam_loc; + camera #default target: cam_loc; species observedAgents; }