Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
4b9008ff
Commit
4b9008ff
authored
Aug 19, 2020
by
Christina
Browse files
Merge branch 'close_frame_mesh'
parents
53e0e85d
0a16c872
Pipeline
#310014
passed with stages
in 147 minutes and 25 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario
View file @
4b9008ff
...
...
@@ -77,7 +77,8 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor",
"attributes" : {
"measurementAreaId" : 1,
"edgeLength" : 1.5
"edgeLength" : 1.5,
"displayMesh" : false
}
} ],
"isTimestamped" : true,
...
...
Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario
View file @
4b9008ff
...
...
@@ -77,7 +77,8 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor",
"attributes" : {
"measurementAreaId" : 1,
"edgeLength" : 1.5
"edgeLength" : 1.5,
"displayMesh" : false
}
} ],
"isTimestamped" : true,
...
...
@@ -350,4 +351,4 @@
},
"stimulusInfos" : [ ]
}
}
}
\ No newline at end of file
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/MeshProcessor.java
View file @
4b9008ff
...
...
@@ -142,7 +142,8 @@ public class MeshProcessor extends NoDataKeyProcessor<IMesh<PVertex, PHalfEdge,
var
meshRenderer
=
new
MeshRenderer
<>(
meshImprover
.
getMesh
(),
f
->
false
,
f
->
Color
.
WHITE
,
e
->
Color
.
GRAY
);
var
meshPanel
=
new
PMeshPanel
(
meshRenderer
,
300
,
300
);
meshPanel
.
display
();
if
(
getAttributes
().
isDisplayMesh
())
meshPanel
.
display
();
}
@Override
...
...
VadereState/src/org/vadere/state/attributes/processor/AttributesMeshProcessor.java
View file @
4b9008ff
...
...
@@ -3,6 +3,7 @@ package org.vadere.state.attributes.processor;
public
class
AttributesMeshProcessor
extends
AttributesProcessor
{
private
int
measurementAreaId
=
-
1
;
private
double
edgeLength
=
1.0
;
private
boolean
displayMesh
=
true
;
public
int
getMeasurementAreaId
()
{
return
this
.
measurementAreaId
;
...
...
@@ -21,4 +22,13 @@ public class AttributesMeshProcessor extends AttributesProcessor {
checkSealed
();
this
.
edgeLength
=
edgeLength
;
}
public
boolean
isDisplayMesh
()
{
return
displayMesh
;
}
public
void
setDisplayMesh
(
boolean
displayMesh
)
{
checkSealed
();
this
.
displayMesh
=
displayMesh
;
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment