Commit 10c5cf70 authored by Florian Hölzl's avatar Florian Hölzl
Browse files

fixed eCar model names

refs 490
parent 46019211
<?xml version="1.0" encoding="UTF-8"?>
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-viewpanel="http://www.fortiss.org/af3/viewpanel" xmlns:org-fortiss-af3-viewpanel-node3D="http://www.fortiss.org/af3/viewpanel/node3D" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" name="eCar">
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-viewpanel="http://www.fortiss.org/af3/viewpanel" xmlns:org-fortiss-af3-viewpanel-node3D="http://www.fortiss.org/af3/viewpanel/node3D" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" name="eCar23">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" id="1" name="" comment="">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" id="2" name="" comment="">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
......@@ -271,7 +271,7 @@
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="1553" name="FrontLeft" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="1554" name="Rotation" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="1546" name="Scaling" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1545" name="Test" comment="" model="SimpleWheel"/>
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1545" name="Wheel" comment="" model="SimpleWheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
......@@ -280,11 +280,15 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
<angle xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1557" name="toDeg"/>
<function xsi:type="org-fortiss-af3-expression-terms:PredefinedFunction"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1558" name="vwsAngle"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:Var" identifier="frontLeft"/>
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1590" name="toDeg"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1591" name="vwsAngle"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:Var" identifier="frontLeft"/>
</arguments>
</arguments>
<arguments xsi:type="org-fortiss-af3-expression-terms:IntConst" value="90"/>
</angle>
</subNodes>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
......@@ -294,7 +298,7 @@
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="1559" name="FrontRight" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="1560" name="Rotation" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="1561" name="Scaling" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1562" name="Test" comment="" model="SimpleWheel"/>
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1562" name="Wheel" comment="" model="SimpleWheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
......@@ -317,7 +321,7 @@
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="1567" name="RearLeft" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="1568" name="Rotation" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="1569" name="Scaling" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1570" name="Test" comment="" model="SimpleWheel"/>
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1570" name="Wheel" comment="" model="SimpleWheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
......@@ -340,7 +344,7 @@
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:TranslationDisplayNode" id="1575" name="RearRight" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:RotationDisplayNode" id="1576" name="Rotation" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ScalingDisplayNode" id="1577" name="Scaling" comment="">
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1578" name="Test" comment="" model="SimpleWheel"/>
<subNodes xsi:type="org-fortiss-af3-viewpanel-node3D:ObjectDisplayNode" id="1578" name="Wheel" comment="" model="SimpleWheel"/>
<x xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="0.25"/>
......@@ -349,10 +353,10 @@
<y xsi:type="org-fortiss-af3-expression-terms:DoubleConst"/>
<z xsi:type="org-fortiss-af3-expression-terms:DoubleConst" value="1.0"/>
<angle xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1579" name="toDeg"/>
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1587" name="toDeg"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1580" name="vwsAngle"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:Var" identifier="rearLeft"/>
<function xsi:type="org-fortiss-af3-expression-terms:UserdefinedFunction" id="1588" name="vwsAngle"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:Var" identifier="rearRight"/>
</arguments>
</angle>
</subNodes>
......@@ -899,7 +903,7 @@
<normals x="-0.688649" y="-0.050521" z="-0.723333"/>
<normals x="-0.999202" y="0.030592" z="0.025698"/>
<normals x="-0.649903" z="0.760017"/>
<materialGroups smoothShading="true">
<materialGroups>
<faces vertices="//@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.0 //@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.1 //@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.3" normals="//@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@normals.0"/>
<faces vertices="//@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.0 //@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.3 //@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.2" normals="//@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@normals.0"/>
<faces vertices="//@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.2 //@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.3 //@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@vertices.5" normals="//@rootElements.1/@containedElements.0/@containedElements.1/@specifications.1/@containedElements.13/@loadedObjects.0/@mesh/@normals.1"/>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment