Skip to content

Commit 8ee1674

Browse files
committed
Use config for for panel separator height
1 parent 5d84228 commit 8ee1674

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

generator/org.svis.generator/src/org/svis/generator/city/m2t/City2AFrame.xtend

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import java.util.List
44
import org.apache.commons.logging.LogFactory
55
import org.eclipse.emf.ecore.resource.Resource
66
import org.eclipse.xtext.EcoreUtil2
7-
import org.svis.generator.city.CitySettings.Panels
87
import org.svis.xtext.city.Building
98
import org.svis.xtext.city.BuildingSegment
109
import org.svis.xtext.city.Entity
@@ -116,7 +115,7 @@ class City2AFrame {
116115
«val separatorC = separator»
117116
<a-cylinder position="«separator.position.x + " " + separator.position.y + " " + separator.position.z»"
118117
radius="«separatorC.radius»"
119-
height="«Panels::SEPARATOR_HEIGHT»"
118+
height="«config.panelSeparatorHeight»"
120119
color="«config.getCityColorHex("black")»"
121120
shader="flat"
122121
fog="false"
@@ -128,7 +127,7 @@ class City2AFrame {
128127
«val separatorB = separator as PanelSeparatorBox»
129128
<a-box position="«separator.position.x + " " + separator.position.y + " " + separator.position.z»"
130129
width="«separatorB.width»"
131-
height="«Panels::SEPARATOR_HEIGHT»"
130+
height="«config.panelSeparatorHeight»"
132131
depth="«separatorB.length»"
133132
color="«config.getCityColorHex("black")»"
134133
shader="flat"

generator/org.svis.generator/src/org/svis/generator/city/m2t/City2X3DOM.xtend

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ class City2X3DOM {
125125
<Shape>
126126
«IF separator instanceof PanelSeparatorCylinder»
127127
«val separatorC = separator»
128-
<Cylinder radius='«separatorC.radius»' height='«Panels::SEPARATOR_HEIGHT»'></Cylinder>
128+
<Cylinder radius='«separatorC.radius»' height='«config.panelSeparatorHeight»'></Cylinder>
129129
«ELSE»
130130
«val separatorB = separator as PanelSeparatorBox»
131-
<Box size='«separatorB.width +" "+ Panels::SEPARATOR_HEIGHT + " "+ separatorB.length»'></Box>
131+
<Box size='«separatorB.width +" "+ config.panelSeparatorHeight + " "+ separatorB.length»'></Box>
132132
«ENDIF»
133133
<Appearance>
134134
<Material diffuseColor='«config.getCityColorAsPercentage("black")»'></Material>

0 commit comments

Comments
 (0)