bprocessor-commit Mailing List for B-processor (Page 25)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2008-02-08 13:41:15
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5575/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: Platform Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** GUI.java 25 Jan 2008 13:06:06 -0000 1.94 --- GUI.java 8 Feb 2008 13:41:14 -0000 1.95 *************** *** 86,89 **** --- 86,91 ---- /** */ private static final long serialVersionUID = 1L; + + private boolean isMac; /** The logger */ *************** *** 138,141 **** --- 140,149 ---- public GUI() { super("B-processor"); + String os = System.getProperty("os.name"); + + if (os.startsWith("Mac")) { + isMac = true; + } + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); instance = this; *************** *** 540,549 **** file.add(fileProperties); ! file.addSeparator(); - JMenuItem fileExit = new JMenuItem("Exit"); - fileExit.addActionListener(new FileExitActionListener()); - fileExit.setMnemonic(KeyEvent.VK_X); - file.add(fileExit); return file; } --- 548,559 ---- file.add(fileProperties); ! if (!isMac) { ! file.addSeparator(); ! JMenuItem fileExit = new JMenuItem("Exit"); ! fileExit.addActionListener(new FileExitActionListener()); ! fileExit.setMnemonic(KeyEvent.VK_X); ! file.add(fileExit); ! } return file; } |
|
From: Michael L. <he...@us...> - 2008-02-08 13:41:09
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5566/src/net/sourceforge/bprocessor Modified Files: Application.java Log Message: Platform Index: Application.java =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/Application.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Application.java 18 Nov 2007 21:30:41 -0000 1.6 --- Application.java 8 Feb 2008 13:41:10 -0000 1.7 *************** *** 17,20 **** --- 17,21 ---- */ public static void main(String[] args) { + System.out.println("os = " + System.getProperty("os.name")); if (args.length > 0) { PropertyConfigurator.configure(args[0]); |
|
From: Michael L. <he...@us...> - 2008-02-08 12:50:30
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_3 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18189/src/etc/building_3 Modified Files: elements.bp Log Message: elements example Index: elements.bp =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/src/etc/building_3/elements.bp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** elements.bp 6 Feb 2008 14:41:57 -0000 1.1 --- elements.bp 8 Feb 2008 12:50:21 -0000 1.2 *************** *** 2,133 **** <bmodel> <active>1</active> ! <cs>126</cs> <name>new project</name> ! <space transparent="true" type="1" name="World" net="false" union="false" voidref="2" progid="0" id="1"> <description/> <Classification>unassigned</Classification> ! <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="126" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ! <vertex z="0.0" x="0.0" y="0.0" id="127"/> <ijn> [...2841 lines suppressed...] </space> ! <material R="0.9" G="0.9" name="Construction" B="0.9" id="416"/> ! <material R="0.96" G="0.87" name="Functional" B="0.7" id="417"/> ! <material R="0.91071427" G="0.8142857" name="Void" B="0.8035714" id="418"/> ! <view name="(Current)" id="419"> <scalefactor>0</scalefactor> ! <camera x="13.923454571489625" y="-8.00070671394371" z="13.492675674600678"/> ! <center x="6.720064480225855" y="6.5193715056285875" z="1.5051402849739148"/> ! <roll x="0.0464540616531115" y="-0.0936387728936469" z="0.9945218953683465"/> <focalwidth>35.0</focalwidth> <type>6</type> <hidden>3</hidden> + <hidden>295</hidden> + <hidden>15</hidden> + <hidden>297</hidden> + <hidden>303</hidden> + <hidden>299</hidden> + <hidden>301</hidden> </view> <global> |
|
From: Michael L. <he...@us...> - 2008-02-07 13:04:17
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5595/src/net/sourceforge/bprocessor/model Modified Files: Command.java Log Message: improvements to offset Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** Command.java 25 Jan 2008 13:06:02 -0000 1.66 --- Command.java 7 Feb 2008 13:04:21 -0000 1.67 *************** *** 135,139 **** public static class OffsetNormal extends Command { private Surface surface; - /** * --- 135,138 ---- *************** *** 146,149 **** --- 145,149 ---- parameters.put("direction", ""); parameters.put("controlled", true); + parameters.put("holes", true); } *************** *** 155,158 **** --- 155,235 ---- } + private static Surface offset(Surface surface, double distance) { + // prolog + HashMap map = new HashMap(); + Surface copy = (Surface) surface.copy(map); + Vertex normal = surface.normal(); + + // epilog + Vertex direction = normal.scale(distance); + for (Vertex current : copy.getVertices()) { + current.set(current.add(direction)); + } + return copy; + } + + private static Surface offset(Surface surface, Space space, double distance) { + // prolog + HashMap map = new HashMap(); + Surface copy = (Surface) surface.copy(map); + Vertex normal = surface.normal(); + List<Vertex> vertices = surface.getVertices(); + + Map<Vertex, Collection<Edge>> edgemap = new HashMap(); + { + Collection<Surface> envelope = space.getEnvelope(); + Collection<Edge> edges = Surface.edges(envelope); + for (Vertex current : vertices) { + edgemap.put(current, new LinkedList()); + } + for (Edge current : edges) { + { + Collection<Edge> lst = edgemap.get(current.from); + if (lst != null) { + lst.add(current); + } + } + { + Collection<Edge> lst = edgemap.get(current.to); + if (lst != null) { + lst.add(current); + } + } + } + } + Map<Vertex, Vertex> directions = new HashMap(); + for (Vertex current : vertices) { + Collection<Edge> edges = edgemap.get(current); + Collection<Edge> candidates = new LinkedList(); + for (Edge edge : edges) { + Vertex other = edge.otherVertex(current); + Vertex direction = other.minus(current); + double dot = direction.dot(normal); + if (Math.abs(dot) > 0.0000001) { + candidates.add(edge); + } + } + if (candidates.size() == 1) { + Edge edge = candidates.iterator().next(); + Vertex other = edge.otherVertex(current); + Vertex direction = other.minus(current); + directions.put(current, direction); + } else { + directions.put(current, normal); + } + } + + + // epilog + for (Vertex original : vertices) { + Vertex direction = directions.get(original); + Vertex current = (Vertex) map.get(original); + double factor = direction.dot(normal); + double t = distance / factor; + current.set(current.add(direction.scale(t))); + } + return copy; + } + /** {@inheritDoc} */ @Override *************** *** 161,211 **** double distance = parameters.getDouble("distance"); Container space = (Container) owner.find((String)parameters.get("direction")); if (space != null) { if (surface.getBackDomain() == space) { distance = -distance; } } boolean controlled = parameters.getBoolean("controlled"); ! HashMap map = new HashMap(); ! Surface copy = (Surface) surface.copy(map); ! Vertex normal = surface.normal(); if (controlled) { ! List<Vertex> vertices = surface.getVertices(); ! Map<Vertex, Collection<Edge>> edgemap = owner.edgeMap(vertices); ! Map<Vertex, Vertex> directions = new HashMap(); ! for (Vertex current : vertices) { ! Collection<Edge> edges = edgemap.get(current); ! Collection<Edge> candidates = new LinkedList(); ! for (Edge edge : edges) { ! Vertex other = edge.otherVertex(current); ! Vertex direction = other.minus(current); ! double dot = direction.dot(normal); ! if (Math.abs(dot) > 0.0000001) { ! candidates.add(edge); } } - if (candidates.size() == 1) { - Edge edge = candidates.iterator().next(); - Vertex other = edge.otherVertex(current); - Vertex direction = other.minus(current); - directions.put(current, direction); - } else { - directions.put(current, normal); - } - } - for (Vertex original : vertices) { - Vertex direction = directions.get(original); - Vertex current = (Vertex) map.get(original); - double factor = direction.dot(normal); - double t = distance / factor; - current.set(current.add(direction.scale(t))); } } else { ! Vertex direction = normal.scale(distance); ! for (Vertex current : copy.getVertices()) { ! current.set(current.add(direction)); ! } } --- 238,291 ---- double distance = parameters.getDouble("distance"); Container space = (Container) owner.find((String)parameters.get("direction")); + boolean front = true; if (space != null) { if (surface.getBackDomain() == space) { distance = -distance; + front = false; } + } else { + space = surface.getFrontDomain(); } + boolean controlled = parameters.getBoolean("controlled"); + boolean holes = parameters.getBoolean("holes"); ! System.out.println("offset " + distance + " in direction of " + space); ! ! Surface copy = null; if (controlled) { ! ! copy = offset(surface, space, distance); ! if (holes) { ! Vertex n0 = surface.normal(); ! for (Surface current : surface.getHoles()) { ! Vertex n = current.normal(); ! double t = n0.dot(n); ! Space sp; ! double d; ! if (front) { ! if (t > 0) { ! sp = current.getFrontDomain(); ! d = distance; ! } else { ! sp = current.getBackDomain(); ! d = -distance; ! } ! } else { ! if (t > 0) { ! sp = current.getBackDomain(); ! d = distance; ! } else { ! sp = current.getFrontDomain(); ! d = -distance; ! } } + Surface hole = offset(current, sp, d); + Geometry.insertEdges(hole.getEdges()); } } } else { ! copy = offset(surface, distance); } |
|
From: Michael L. <he...@us...> - 2008-02-06 14:42:02
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_2 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6102/src/etc/building_2 Modified Files: openings.bp Added Files: elements.bp Log Message: more examples --- NEW FILE: elements.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>298</cs> <name>new project</name> <space transparent="true" type="1" name="World" net="false" union="false" voidref="2" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="298" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="299"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="295"/> <vertex z="0.0" x="0.0" y="1.0" id="296"/> <vertex z="1.0" x="0.0" y="0.0" id="297"/> </ijn> </constructor> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="2"> <description/> <Classification>unassigned</Classification> [...1572 lines suppressed...] <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> Index: openings.bp =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/src/etc/building_2/openings.bp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openings.bp 5 Feb 2008 08:30:00 -0000 1.1 --- openings.bp 6 Feb 2008 14:41:56 -0000 1.2 *************** *** 2,208 **** <bmodel> <active>1</active> ! <cs>292</cs> <name>new project</name> ! <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> ! <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="292" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ! <vertex z="0.0" x="0.0" y="0.0" id="293"/> <ijn> [...3032 lines suppressed...] ! <camera z="11.334689883867176" x="18.112660025501967" y="0.30137570176506534"/> ! <center z="1.5435139662396518" x="5.786249634009477" y="12.46283346402349"/> ! <roll z="0.9743700647852483" x="0.16013225616963953" y="-0.15798935845315307"/> ! <focalwidth>35.0</focalwidth> ! <type>6</type> ! <hidden>7</hidden> ! <hidden>9</hidden> ! <hidden>21</hidden> ! <hidden>17</hidden> ! <hidden>23</hidden> ! <hidden>13</hidden> ! <hidden>11</hidden> ! <hidden>25</hidden> ! <hidden>27</hidden> ! <hidden>19</hidden> ! <hidden>5</hidden> ! <hidden>15</hidden> ! </view> <global> <key>brick</key> |
|
From: Michael L. <he...@us...> - 2008-02-06 14:41:59
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_3 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6102/src/etc/building_3 Added Files: elements.bp openings.bp Log Message: more examples --- NEW FILE: elements.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>126</cs> <name>new project</name> <space transparent="true" type="1" name="World" net="false" union="false" voidref="2" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="126" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="127"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="123"/> <vertex z="0.0" x="0.0" y="1.0" id="124"/> <vertex z="1.0" x="0.0" y="0.0" id="125"/> </ijn> </constructor> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> <space transparent="true" type="1" name="Exteriør" net="false" union="false" voidref="4" progid="2" id="3"> <description/> <Classification>unassigned</Classification> <boundary>20</boundary> <boundary>23</boundary> <boundary>24</boundary> <boundary>30</boundary> <boundary>31</boundary> <boundary>32</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Vægsystem" net="false" union="false" voidref="6" progid="3" id="5"> <description/> <Classification>unassigned</Classification> <boundary>17</boundary> <boundary>19</boundary> <boundary>20</boundary> <boundary>21</boundary> <boundary>22</boundary> <boundary>23</boundary> <boundary>24</boundary> <boundary>25</boundary> <boundary>26</boundary> <boundary>27</boundary> <boundary>28</boundary> <boundary>31</boundary> <boundary>33</boundary> <boundary>34</boundary> <boundary>36</boundary> <boundary>37</boundary> <boundary>39</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="6"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" type="1" name="Værelse" net="false" union="false" voidref="8" progid="4" id="7"> <description/> <Classification>unassigned</Classification> <boundary>18</boundary> <boundary>19</boundary> <boundary>21</boundary> <boundary>22</boundary> <boundary>29</boundary> <boundary>34</boundary> <boundary>35</boundary> <boundary>40</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="8"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Tag" net="false" union="false" voidref="10" progid="5" id="9"> <description/> <Classification>unassigned</Classification> <boundary>17</boundary> <boundary>18</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="10"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Gulv" net="false" union="false" voidref="12" progid="6" id="11"> <description/> <Classification>unassigned</Classification> <boundary>38</boundary> <boundary>39</boundary> <boundary>40</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="12"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Vindue" net="false" union="false" voidref="14" progid="7" id="13"> <description/> <Classification>unassigned</Classification> <boundary>25</boundary> <boundary>26</boundary> <boundary>27</boundary> <boundary>28</boundary> <boundary>29</boundary> <boundary>30</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="14"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Dør" net="false" union="false" voidref="16" progid="8" id="15"> <description/> <Classification>unassigned</Classification> <boundary>32</boundary> <boundary>33</boundary> <boundary>35</boundary> <boundary>36</boundary> <boundary>37</boundary> <boundary>38</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="16"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="13" id="17"> <edgeref>49</edgeref> <edgeref>58</edgeref> <edgeref>61</edgeref> <edgeref>54</edgeref> <hole>18</hole> <back>9</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="14" id="18"> <edgeref>47</edgeref> <edgeref>50</edgeref> <edgeref>51</edgeref> <edgeref>52</edgeref> <back>9</back> <front>7</front> <exterior>17</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="15" id="19"> <edgeref>47</edgeref> <edgeref>48</edgeref> <edgeref>42</edgeref> <edgeref>57</edgeref> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="19" id="20"> <edgeref>49</edgeref> <edgeref>59</edgeref> <edgeref>45</edgeref> <edgeref>53</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="20" id="21"> <edgeref>51</edgeref> <edgeref>62</edgeref> <edgeref>43</edgeref> <edgeref>55</edgeref> <hole>29</hole> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="21" id="22"> <edgeref>52</edgeref> <edgeref>57</edgeref> <edgeref>41</edgeref> <edgeref>62</edgeref> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="23" id="23"> <edgeref>53</edgeref> <edgeref>54</edgeref> <edgeref>56</edgeref> <edgeref>44</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="24"> <edgeref>56</edgeref> <edgeref>61</edgeref> <edgeref>60</edgeref> <edgeref>46</edgeref> <hole>30</hole> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="31" id="25"> <edgeref>67</edgeref> <edgeref>69</edgeref> <edgeref>70</edgeref> <edgeref>65</edgeref> <back>13</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="32" id="26"> <edgeref>67</edgeref> <edgeref>71</edgeref> <edgeref>73</edgeref> <edgeref>66</edgeref> <back>5</back> <front>13</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="33" id="27"> <edgeref>68</edgeref> <edgeref>74</edgeref> <edgeref>70</edgeref> <edgeref>64</edgeref> <back>5</back> <front>13</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="34" id="28"> <edgeref>68</edgeref> <edgeref>72</edgeref> <edgeref>73</edgeref> <edgeref>63</edgeref> <back>13</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="35" id="29"> <edgeref>74</edgeref> <edgeref>72</edgeref> <edgeref>71</edgeref> <edgeref>69</edgeref> <back>7</back> <front>13</front> <exterior>21</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="36" id="30"> <edgeref>63</edgeref> <edgeref>64</edgeref> <edgeref>65</edgeref> <edgeref>66</edgeref> <back>3</back> <front>13</front> <exterior>24</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="45" id="31"> <edgeref>84</edgeref> <edgeref>88</edgeref> <edgeref>83</edgeref> <edgeref>60</edgeref> <edgeref>58</edgeref> <edgeref>59</edgeref> <edgeref>81</edgeref> <edgeref>89</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="46" id="32"> <edgeref>84</edgeref> <edgeref>88</edgeref> <edgeref>82</edgeref> <edgeref>89</edgeref> <back>15</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="47" id="33"> <edgeref>84</edgeref> <edgeref>87</edgeref> <edgeref>79</edgeref> <edgeref>86</edgeref> <back>5</back> <front>15</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="48" id="34"> <edgeref>78</edgeref> <edgeref>79</edgeref> <edgeref>80</edgeref> <edgeref>75</edgeref> <edgeref>55</edgeref> <edgeref>50</edgeref> <edgeref>48</edgeref> <edgeref>76</edgeref> <back>5</back> <front>7</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="49" id="35"> <edgeref>78</edgeref> <edgeref>79</edgeref> <edgeref>80</edgeref> <edgeref>77</edgeref> <back>7</back> <front>15</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="50" id="36"> <edgeref>78</edgeref> <edgeref>86</edgeref> <edgeref>89</edgeref> <edgeref>90</edgeref> <back>15</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="51" id="37"> <edgeref>85</edgeref> <edgeref>88</edgeref> <edgeref>87</edgeref> <edgeref>80</edgeref> <back>15</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="52" id="38"> <edgeref>85</edgeref> <edgeref>82</edgeref> <edgeref>90</edgeref> <edgeref>77</edgeref> <back>11</back> <front>15</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="53" id="39"> <edgeref>85</edgeref> <edgeref>83</edgeref> <edgeref>46</edgeref> <edgeref>44</edgeref> <edgeref>45</edgeref> <edgeref>81</edgeref> <edgeref>90</edgeref> <edgeref>76</edgeref> <edgeref>42</edgeref> <edgeref>41</edgeref> <edgeref>43</edgeref> <edgeref>75</edgeref> <back>5</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="54" id="40"> <edgeref>77</edgeref> <edgeref>75</edgeref> <edgeref>43</edgeref> <edgeref>41</edgeref> <edgeref>42</edgeref> <edgeref>76</edgeref> <back>7</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge constructor="false" smooth="false" progid="1" id="41"> <from>94</from> <to>92</to> </edge> <edge constructor="false" smooth="false" progid="2" id="42"> <from>92</from> <to>93</to> </edge> <edge constructor="false" smooth="false" progid="4" id="43"> <from>91</from> <to>94</to> </edge> <edge constructor="false" smooth="false" progid="5" id="44"> <from>97</from> <to>95</to> </edge> <edge constructor="false" smooth="false" progid="6" id="45"> <from>95</from> <to>96</to> </edge> <edge constructor="false" smooth="false" progid="8" id="46"> <from>98</from> <to>97</to> </edge> <edge constructor="false" smooth="false" progid="9" id="47"> <from>101</from> <to>105</to> </edge> <edge constructor="false" smooth="false" progid="10" id="48"> <from>93</from> <to>105</to> </edge> <edge constructor="false" smooth="false" progid="11" id="49"> <from>100</from> <to>106</to> </edge> <edge constructor="false" smooth="false" progid="12" id="50"> <from>105</from> <to>102</to> </edge> <edge constructor="false" smooth="false" progid="13" id="51"> <from>102</from> <to>104</to> </edge> <edge constructor="false" smooth="false" progid="14" id="52"> <from>104</from> <to>101</to> </edge> <edge constructor="false" smooth="false" progid="15" id="53"> <from>95</from> <to>100</to> </edge> <edge constructor="false" smooth="false" progid="16" id="54"> <from>103</from> <to>100</to> </edge> <edge constructor="false" smooth="false" progid="17" id="55"> <from>91</from> <to>102</to> </edge> <edge constructor="false" smooth="false" progid="18" id="56"> <from>97</from> <to>103</to> </edge> <edge constructor="false" smooth="false" progid="19" id="57"> <from>92</from> <to>101</to> </edge> <edge constructor="false" smooth="false" progid="20" id="58"> <from>106</from> <to>99</to> </edge> <edge constructor="false" smooth="false" progid="21" id="59"> <from>96</from> <to>106</to> </edge> <edge constructor="false" smooth="false" progid="22" id="60"> <from>98</from> <to>99</to> </edge> <edge constructor="false" smooth="false" progid="23" id="61"> <from>99</from> <to>103</to> </edge> <edge constructor="false" smooth="false" progid="24" id="62"> <from>94</from> <to>104</to> </edge> <edge constructor="false" smooth="false" progid="25" id="63"> <from>109</from> <to>110</to> </edge> <edge constructor="false" smooth="false" progid="26" id="64"> <from>110</from> <to>107</to> </edge> <edge constructor="false" smooth="false" progid="27" id="65"> <from>107</from> <to>108</to> </edge> <edge constructor="false" smooth="false" progid="28" id="66"> <from>108</from> <to>109</to> </edge> <edge constructor="false" smooth="false" progid="29" id="67"> <from>108</from> <to>111</to> </edge> <edge constructor="false" smooth="false" progid="30" id="68"> <from>110</from> <to>113</to> </edge> <edge constructor="false" smooth="false" progid="31" id="69"> <from>114</from> <to>111</to> </edge> <edge constructor="false" smooth="false" progid="32" id="70"> <from>107</from> <to>114</to> </edge> <edge constructor="false" smooth="false" progid="33" id="71"> <from>111</from> <to>112</to> </edge> <edge constructor="false" smooth="false" progid="34" id="72"> <from>112</from> <to>113</to> </edge> <edge constructor="false" smooth="false" progid="35" id="73"> <from>109</from> <to>112</to> </edge> <edge constructor="false" smooth="false" progid="36" id="74"> <from>113</from> <to>114</to> </edge> <edge constructor="false" smooth="false" progid="38" id="75"> <from>115</from> <to>91</to> </edge> <edge constructor="false" smooth="false" progid="39" id="76"> <from>93</from> <to>117</to> </edge> <edge constructor="false" smooth="false" progid="40" id="77"> <from>117</from> <to>115</to> </edge> <edge constructor="false" smooth="false" progid="41" id="78"> <from>117</from> <to>116</to> </edge> <edge constructor="false" smooth="false" progid="42" id="79"> <from>116</from> <to>118</to> </edge> <edge constructor="false" smooth="false" progid="43" id="80"> <from>118</from> <to>115</to> </edge> <edge constructor="false" smooth="false" progid="44" id="81"> <from>96</from> <to>121</to> </edge> <edge constructor="false" smooth="false" progid="46" id="82"> <from>121</from> <to>122</to> </edge> <edge constructor="false" smooth="false" progid="47" id="83"> <from>122</from> <to>98</to> </edge> <edge constructor="false" smooth="false" progid="48" id="84"> <from>119</from> <to>120</to> </edge> <edge constructor="false" smooth="false" progid="49" id="85"> <from>115</from> <to>122</to> </edge> <edge constructor="false" smooth="false" progid="50" id="86"> <from>116</from> <to>119</to> </edge> <edge constructor="false" smooth="false" progid="51" id="87"> <from>118</from> <to>120</to> </edge> <edge constructor="false" smooth="false" progid="52" id="88"> <from>120</from> <to>122</to> </edge> <edge constructor="false" smooth="false" progid="53" id="89"> <from>121</from> <to>119</to> </edge> <edge constructor="false" smooth="false" progid="54" id="90"> <from>117</from> <to>121</to> </edge> <vertex z="0.0" x="9.6899503858" y="2.5372001518" progid="1" id="91"/> <vertex z="0.0" x="3.6899503858" y="10.5372001518" progid="2" id="92"/> <vertex z="0.0" x="9.6899503858" y="10.5372001518" progid="3" id="93"/> <vertex z="0.0" x="3.6899503858" y="2.5372001518" progid="4" id="94"/> <vertex z="0.0" x="3.2999503858" y="10.9272001518" progid="5" id="95"/> <vertex z="0.0" x="10.0799503858" y="10.9272001518" progid="6" id="96"/> <vertex z="0.0" x="3.2999503858" y="2.1472001518" progid="7" id="97"/> <vertex z="0.0" x="10.0799503858" y="2.1472001518" progid="8" id="98"/> <vertex z="3.0" x="10.0799503858" y="2.1472001518" progid="9" id="99"/> <vertex z="3.0" x="3.2999503858" y="10.9272001518" progid="10" id="100"/> <vertex z="3.0" x="3.6899503858" y="10.5372001518" progid="11" id="101"/> <vertex z="3.0" x="9.6899503858" y="2.5372001518" progid="12" id="102"/> <vertex z="3.0" x="3.2999503858" y="2.1472001518" progid="13" id="103"/> <vertex z="3.0" x="3.6899503858" y="2.5372001518" progid="14" id="104"/> <vertex z="3.0" x="9.6899503858" y="10.5372001518" progid="15" id="105"/> <vertex z="3.0" x="10.0799503858" y="10.9272001518" progid="16" id="106"/> <vertex z="2.4" x="7.2899503858" y="2.1472001518" progid="17" id="107"/> <vertex z="0.8" x="7.2899503858" y="2.1472001518" progid="18" id="108"/> <vertex z="0.8" x="5.4899503858" y="2.1472001518" progid="19" id="109"/> <vertex z="2.4" x="5.4899503858" y="2.1472001518" progid="20" id="110"/> <vertex z="0.8" x="7.2899503858" y="2.5372001518" progid="21" id="111"/> <vertex z="0.8" x="5.4899503858" y="2.5372001518" progid="22" id="112"/> <vertex z="2.4" x="5.4899503858" y="2.5372001518" progid="23" id="113"/> <vertex z="2.4" x="7.2899503858" y="2.5372001518" progid="24" id="114"/> <vertex z="0.0" x="9.6899503858" y="9.3272001518" progid="25" id="115"/> <vertex z="2.0" x="9.6899503858" y="10.1372001518" progid="26" id="116"/> <vertex z="0.0" x="9.6899503858" y="10.1372001518" progid="27" id="117"/> <vertex z="2.0" x="9.6899503858" y="9.3272001518" progid="28" id="118"/> <vertex z="2.0" x="10.0799503858" y="10.1372001518" progid="29" id="119"/> <vertex z="2.0" x="10.0799503858" y="9.3272001518" progid="30" id="120"/> <vertex z="0.0" x="10.0799503858" y="10.1372001518" progid="31" id="121"/> <vertex z="0.0" x="10.0799503858" y="9.3272001518" progid="32" id="122"/> </space> <material B="0.7" name="Functional" R="0.96" G="0.87" id="128"/> <material B="0.9" name="Construction" R="0.9" G="0.9" id="129"/> <material B="0.8035714" name="Void" R="0.91071427" G="0.8142857" id="130"/> <view name="(Current)" id="131"> <scalefactor>0</scalefactor> <camera z="15.69626620173325" x="23.761219885957058" y="-4.257319254324549"/> <center z="2.5103395841204" x="6.46044668071669" y="6.392038953270357"/> <roll z="0.9862856015372424" x="0.1405542709262026" y="-0.08651710307647685"/> <focalwidth>35.0</focalwidth> <type>6</type> <hidden>9</hidden> <hidden>13</hidden> <hidden>15</hidden> <hidden>7</hidden> <hidden>11</hidden> <hidden>3</hidden> </view> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> --- NEW FILE: openings.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>126</cs> <name>new project</name> <space transparent="true" type="1" name="World" net="false" union="false" voidref="2" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="126" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="127"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="123"/> <vertex z="0.0" x="0.0" y="1.0" id="124"/> <vertex z="1.0" x="0.0" y="0.0" id="125"/> </ijn> </constructor> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> <space transparent="true" type="1" name="Exteriør" net="false" union="false" voidref="4" progid="2" id="3"> <description/> <Classification>unassigned</Classification> <boundary>20</boundary> <boundary>23</boundary> <boundary>24</boundary> <boundary>30</boundary> <boundary>31</boundary> <boundary>32</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Vægsystem" net="false" union="false" voidref="6" progid="3" id="5"> <description/> <Classification>unassigned</Classification> <boundary>17</boundary> <boundary>19</boundary> <boundary>20</boundary> <boundary>21</boundary> <boundary>22</boundary> <boundary>23</boundary> <boundary>24</boundary> <boundary>25</boundary> <boundary>26</boundary> <boundary>27</boundary> <boundary>28</boundary> <boundary>31</boundary> <boundary>33</boundary> <boundary>34</boundary> <boundary>36</boundary> <boundary>37</boundary> <boundary>39</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="6"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" type="1" name="Værelse" net="false" union="false" voidref="8" progid="4" id="7"> <description/> <Classification>unassigned</Classification> <boundary>18</boundary> <boundary>19</boundary> <boundary>21</boundary> <boundary>22</boundary> <boundary>29</boundary> <boundary>34</boundary> <boundary>35</boundary> <boundary>40</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="8"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Tag" net="false" union="false" voidref="10" progid="5" id="9"> <description/> <Classification>unassigned</Classification> <boundary>17</boundary> <boundary>18</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="10"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Gulv" net="false" union="false" voidref="12" progid="6" id="11"> <description/> <Classification>unassigned</Classification> <boundary>38</boundary> <boundary>39</boundary> <boundary>40</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="12"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Vindue" net="false" union="false" voidref="14" progid="7" id="13"> <description/> <Classification>unassigned</Classification> <boundary>25</boundary> <boundary>26</boundary> <boundary>27</boundary> <boundary>28</boundary> <boundary>29</boundary> <boundary>30</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="14"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Dør" net="false" union="false" voidref="16" progid="8" id="15"> <description/> <Classification>unassigned</Classification> <boundary>32</boundary> <boundary>33</boundary> <boundary>35</boundary> <boundary>36</boundary> <boundary>37</boundary> <boundary>38</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="16"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="13" id="17"> <edgeref>49</edgeref> <edgeref>58</edgeref> <edgeref>61</edgeref> <edgeref>54</edgeref> <hole>18</hole> <back>9</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="14" id="18"> <edgeref>47</edgeref> <edgeref>50</edgeref> <edgeref>51</edgeref> <edgeref>52</edgeref> <back>9</back> <front>7</front> <exterior>17</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="15" id="19"> <edgeref>47</edgeref> <edgeref>48</edgeref> <edgeref>42</edgeref> <edgeref>57</edgeref> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="19" id="20"> <edgeref>49</edgeref> <edgeref>59</edgeref> <edgeref>45</edgeref> <edgeref>53</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="20" id="21"> <edgeref>51</edgeref> <edgeref>62</edgeref> <edgeref>43</edgeref> <edgeref>55</edgeref> <hole>29</hole> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="21" id="22"> <edgeref>52</edgeref> <edgeref>57</edgeref> <edgeref>41</edgeref> <edgeref>62</edgeref> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="23" id="23"> <edgeref>53</edgeref> <edgeref>54</edgeref> <edgeref>56</edgeref> <edgeref>44</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="24"> <edgeref>56</edgeref> <edgeref>61</edgeref> <edgeref>60</edgeref> <edgeref>46</edgeref> <hole>30</hole> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="31" id="25"> <edgeref>67</edgeref> <edgeref>69</edgeref> <edgeref>70</edgeref> <edgeref>65</edgeref> <back>13</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="32" id="26"> <edgeref>67</edgeref> <edgeref>71</edgeref> <edgeref>73</edgeref> <edgeref>66</edgeref> <back>5</back> <front>13</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="33" id="27"> <edgeref>68</edgeref> <edgeref>74</edgeref> <edgeref>70</edgeref> <edgeref>64</edgeref> <back>5</back> <front>13</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="34" id="28"> <edgeref>68</edgeref> <edgeref>72</edgeref> <edgeref>73</edgeref> <edgeref>63</edgeref> <back>13</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="35" id="29"> <edgeref>74</edgeref> <edgeref>72</edgeref> <edgeref>71</edgeref> <edgeref>69</edgeref> <back>7</back> <front>13</front> <exterior>21</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="36" id="30"> <edgeref>63</edgeref> <edgeref>64</edgeref> <edgeref>65</edgeref> <edgeref>66</edgeref> <back>3</back> <front>13</front> <exterior>24</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="45" id="31"> <edgeref>84</edgeref> <edgeref>88</edgeref> <edgeref>83</edgeref> <edgeref>60</edgeref> <edgeref>58</edgeref> <edgeref>59</edgeref> <edgeref>81</edgeref> <edgeref>89</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="46" id="32"> <edgeref>84</edgeref> <edgeref>88</edgeref> <edgeref>82</edgeref> <edgeref>89</edgeref> <back>15</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="47" id="33"> <edgeref>84</edgeref> <edgeref>87</edgeref> <edgeref>79</edgeref> <edgeref>86</edgeref> <back>5</back> <front>15</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="48" id="34"> <edgeref>78</edgeref> <edgeref>79</edgeref> <edgeref>80</edgeref> <edgeref>75</edgeref> <edgeref>55</edgeref> <edgeref>50</edgeref> <edgeref>48</edgeref> <edgeref>76</edgeref> <back>5</back> <front>7</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="49" id="35"> <edgeref>78</edgeref> <edgeref>79</edgeref> <edgeref>80</edgeref> <edgeref>77</edgeref> <back>7</back> <front>15</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="50" id="36"> <edgeref>78</edgeref> <edgeref>86</edgeref> <edgeref>89</edgeref> <edgeref>90</edgeref> <back>15</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="51" id="37"> <edgeref>85</edgeref> <edgeref>88</edgeref> <edgeref>87</edgeref> <edgeref>80</edgeref> <back>15</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="52" id="38"> <edgeref>85</edgeref> <edgeref>82</edgeref> <edgeref>90</edgeref> <edgeref>77</edgeref> <back>11</back> <front>15</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="53" id="39"> <edgeref>85</edgeref> <edgeref>83</edgeref> <edgeref>46</edgeref> <edgeref>44</edgeref> <edgeref>45</edgeref> <edgeref>81</edgeref> <edgeref>90</edgeref> <edgeref>76</edgeref> <edgeref>42</edgeref> <edgeref>41</edgeref> <edgeref>43</edgeref> <edgeref>75</edgeref> <back>5</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="54" id="40"> <edgeref>77</edgeref> <edgeref>75</edgeref> <edgeref>43</edgeref> <edgeref>41</edgeref> <edgeref>42</edgeref> <edgeref>76</edgeref> <back>7</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge constructor="false" smooth="false" progid="1" id="41"> <from>94</from> <to>92</to> </edge> <edge constructor="false" smooth="false" progid="2" id="42"> <from>92</from> <to>93</to> </edge> <edge constructor="false" smooth="false" progid="4" id="43"> <from>91</from> <to>94</to> </edge> <edge constructor="false" smooth="false" progid="5" id="44"> <from>97</from> <to>95</to> </edge> <edge constructor="false" smooth="false" progid="6" id="45"> <from>95</from> <to>96</to> </edge> <edge constructor="false" smooth="false" progid="8" id="46"> <from>98</from> <to>97</to> </edge> <edge constructor="false" smooth="false" progid="9" id="47"> <from>101</from> <to>105</to> </edge> <edge constructor="false" smooth="false" progid="10" id="48"> <from>93</from> <to>105</to> </edge> <edge constructor="false" smooth="false" progid="11" id="49"> <from>100</from> <to>106</to> </edge> <edge constructor="false" smooth="false" progid="12" id="50"> <from>105</from> <to>102</to> </edge> <edge constructor="false" smooth="false" progid="13" id="51"> <from>102</from> <to>104</to> </edge> <edge constructor="false" smooth="false" progid="14" id="52"> <from>104</from> <to>101</to> </edge> <edge constructor="false" smooth="false" progid="15" id="53"> <from>95</from> <to>100</to> </edge> <edge constructor="false" smooth="false" progid="16" id="54"> <from>103</from> <to>100</to> </edge> <edge constructor="false" smooth="false" progid="17" id="55"> <from>91</from> <to>102</to> </edge> <edge constructor="false" smooth="false" progid="18" id="56"> <from>97</from> <to>103</to> </edge> <edge constructor="false" smooth="false" progid="19" id="57"> <from>92</from> <to>101</to> </edge> <edge constructor="false" smooth="false" progid="20" id="58"> <from>106</from> <to>99</to> </edge> <edge constructor="false" smooth="false" progid="21" id="59"> <from>96</from> <to>106</to> </edge> <edge constructor="false" smooth="false" progid="22" id="60"> <from>98</from> <to>99</to> </edge> <edge constructor="false" smooth="false" progid="23" id="61"> <from>99</from> <to>103</to> </edge> <edge constructor="false" smooth="false" progid="24" id="62"> <from>94</from> <to>104</to> </edge> <edge constructor="false" smooth="false" progid="25" id="63"> <from>109</from> <to>110</to> </edge> <edge constructor="false" smooth="false" progid="26" id="64"> <from>110</from> <to>107</to> </edge> <edge constructor="false" smooth="false" progid="27" id="65"> <from>107</from> <to>108</to> </edge> <edge constructor="false" smooth="false" progid="28" id="66"> <from>108</from> <to>109</to> </edge> <edge constructor="false" smooth="false" progid="29" id="67"> <from>108</from> <to>111</to> </edge> <edge constructor="false" smooth="false" progid="30" id="68"> <from>110</from> <to>113</to> </edge> <edge constructor="false" smooth="false" progid="31" id="69"> <from>114</from> <to>111</to> </edge> <edge constructor="false" smooth="false" progid="32" id="70"> <from>107</from> <to>114</to> </edge> <edge constructor="false" smooth="false" progid="33" id="71"> <from>111</from> <to>112</to> </edge> <edge constructor="false" smooth="false" progid="34" id="72"> <from>112</from> <to>113</to> </edge> <edge constructor="false" smooth="false" progid="35" id="73"> <from>109</from> <to>112</to> </edge> <edge constructor="false" smooth="false" progid="36" id="74"> <from>113</from> <to>114</to> </edge> <edge constructor="false" smooth="false" progid="38" id="75"> <from>115</from> <to>91</to> </edge> <edge constructor="false" smooth="false" progid="39" id="76"> <from>93</from> <to>117</to> </edge> <edge constructor="false" smooth="false" progid="40" id="77"> <from>117</from> <to>115</to> </edge> <edge constructor="false" smooth="false" progid="41" id="78"> <from>117</from> <to>116</to> </edge> <edge constructor="false" smooth="false" progid="42" id="79"> <from>116</from> <to>118</to> </edge> <edge constructor="false" smooth="false" progid="43" id="80"> <from>118</from> <to>115</to> </edge> <edge constructor="false" smooth="false" progid="44" id="81"> <from>96</from> <to>121</to> </edge> <edge constructor="false" smooth="false" progid="46" id="82"> <from>121</from> <to>122</to> </edge> <edge constructor="false" smooth="false" progid="47" id="83"> <from>122</from> <to>98</to> </edge> <edge constructor="false" smooth="false" progid="48" id="84"> <from>119</from> <to>120</to> </edge> <edge constructor="false" smooth="false" progid="49" id="85"> <from>115</from> <to>122</to> </edge> <edge constructor="false" smooth="false" progid="50" id="86"> <from>116</from> <to>119</to> </edge> <edge constructor="false" smooth="false" progid="51" id="87"> <from>118</from> <to>120</to> </edge> <edge constructor="false" smooth="false" progid="52" id="88"> <from>120</from> <to>122</to> </edge> <edge constructor="false" smooth="false" progid="53" id="89"> <from>121</from> <to>119</to> </edge> <edge constructor="false" smooth="false" progid="54" id="90"> <from>117</from> <to>121</to> </edge> <vertex z="0.0" x="9.6899503858" y="2.5372001518" progid="1" id="91"/> <vertex z="0.0" x="3.6899503858" y="10.5372001518" progid="2" id="92"/> <vertex z="0.0" x="9.6899503858" y="10.5372001518" progid="3" id="93"/> <vertex z="0.0" x="3.6899503858" y="2.5372001518" progid="4" id="94"/> <vertex z="0.0" x="3.2999503858" y="10.9272001518" progid="5" id="95"/> <vertex z="0.0" x="10.0799503858" y="10.9272001518" progid="6" id="96"/> <vertex z="0.0" x="3.2999503858" y="2.1472001518" progid="7" id="97"/> <vertex z="0.0" x="10.0799503858" y="2.1472001518" progid="8" id="98"/> <vertex z="3.0" x="10.0799503858" y="2.1472001518" progid="9" id="99"/> <vertex z="3.0" x="3.2999503858" y="10.9272001518" progid="10" id="100"/> <vertex z="3.0" x="3.6899503858" y="10.5372001518" progid="11" id="101"/> <vertex z="3.0" x="9.6899503858" y="2.5372001518" progid="12" id="102"/> <vertex z="3.0" x="3.2999503858" y="2.1472001518" progid="13" id="103"/> <vertex z="3.0" x="3.6899503858" y="2.5372001518" progid="14" id="104"/> <vertex z="3.0" x="9.6899503858" y="10.5372001518" progid="15" id="105"/> <vertex z="3.0" x="10.0799503858" y="10.9272001518" progid="16" id="106"/> <vertex z="2.4" x="7.2899503858" y="2.1472001518" progid="17" id="107"/> <vertex z="0.8" x="7.2899503858" y="2.1472001518" progid="18" id="108"/> <vertex z="0.8" x="5.4899503858" y="2.1472001518" progid="19" id="109"/> <vertex z="2.4" x="5.4899503858" y="2.1472001518" progid="20" id="110"/> <vertex z="0.8" x="7.2899503858" y="2.5372001518" progid="21" id="111"/> <vertex z="0.8" x="5.4899503858" y="2.5372001518" progid="22" id="112"/> <vertex z="2.4" x="5.4899503858" y="2.5372001518" progid="23" id="113"/> <vertex z="2.4" x="7.2899503858" y="2.5372001518" progid="24" id="114"/> <vertex z="0.0" x="9.6899503858" y="9.3272001518" progid="25" id="115"/> <vertex z="2.0" x="9.6899503858" y="10.1372001518" progid="26" id="116"/> <vertex z="0.0" x="9.6899503858" y="10.1372001518" progid="27" id="117"/> <vertex z="2.0" x="9.6899503858" y="9.3272001518" progid="28" id="118"/> <vertex z="2.0" x="10.0799503858" y="10.1372001518" progid="29" id="119"/> <vertex z="2.0" x="10.0799503858" y="9.3272001518" progid="30" id="120"/> <vertex z="0.0" x="10.0799503858" y="10.1372001518" progid="31" id="121"/> <vertex z="0.0" x="10.0799503858" y="9.3272001518" progid="32" id="122"/> </space> <material B="0.9" name="Construction" R="0.9" G="0.9" id="128"/> <material B="0.8035714" name="Void" R="0.91071427" G="0.8142857" id="129"/> <material B="0.7" name="Functional" R="0.96" G="0.87" id="130"/> <view name="(Current)" id="131"> <scalefactor>0</scalefactor> <camera z="12.514155170850627" x="18.259064293390107" y="-6.311033823360508"/> <center z="2.5103395841204" x="6.46044668071669" y="6.392038953270357"/> <roll z="0.9762960071199434" x="0.1472960613708447" y="-0.15858744208263212"/> <focalwidth>35.0</focalwidth> <type>6</type> <hidden>9</hidden> <hidden>15</hidden> <hidden>11</hidden> <hidden>3</hidden> <hidden>13</hidden> <hidden>7</hidden> </view> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> |
|
From: Michael L. <he...@us...> - 2008-02-06 14:41:56
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6086/src/net/sourceforge/bprocessor/model Modified Files: Geometry.java Container.java Log Message: more examples Index: Geometry.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Geometry.java 25 Jan 2008 13:06:02 -0000 1.71 --- Geometry.java 6 Feb 2008 14:41:52 -0000 1.72 *************** *** 32,35 **** --- 32,37 ---- public static final double EPS = 0.0000000001; + private static final boolean EXTERIOR_HOLE_ANALYSIS = false; + /** * *************** *** 185,196 **** Collection<Surface> surfaces = surface.getOwner().getSurfaces(); candidates.addAll(surfaces); - if (surface.getOwner().isUnion()) { - Collection<Surface> surrounding = surface.getOwner().getOwner().getSurfaces(); - candidates.addAll(surrounding); - } else { - Collection<Surface> envelope = surface.getOwner().getEnvelope(); - candidates.addAll(envelope); - } --- 187,200 ---- Collection<Surface> surfaces = surface.getOwner().getSurfaces(); candidates.addAll(surfaces); + if (EXTERIOR_HOLE_ANALYSIS) { + if (surface.getOwner().isUnion()) { + Collection<Surface> surrounding = surface.getOwner().getOwner().getSurfaces(); + candidates.addAll(surrounding); + } else { + Collection<Surface> envelope = surface.getOwner().getEnvelope(); + candidates.addAll(envelope); + } + } Index: Container.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Container.java 23 Jan 2008 14:49:33 -0000 1.14 --- Container.java 6 Feb 2008 14:41:52 -0000 1.15 *************** *** 1511,1518 **** --- 1511,1533 ---- if (ns == 0) { Collection<Surface> surfaces = new LinkedList(); + Collection<Surface> originals = new HashSet(); + Map map = new HashMap(); for (Surface current : envelope) { + originals.add(current); + originals.addAll(current.getHoles()); + } + for (Surface current : originals) { surfaces.add((Surface) current.copy(map)); } + for (Surface current : originals) { + Surface surface = (Surface) map.get(current); + if (current.getExterior() != null) { + Surface exterior = (Surface) map.get(current.getExterior()); + if (exterior != null) { + exterior.addHole(surface); + } + } + } Collection<Edge> edges = Surface.edges(surfaces); Collection<Vertex> vertices = Edge.vertices(edges); |
|
From: Michael L. <he...@us...> - 2008-02-06 14:41:53
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/walls In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6102/src/etc/walls Added Files: wall1.bp Log Message: more examples --- NEW FILE: wall1.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>71</cs> <name>new project</name> <space transparent="true" type="1" name="World" net="false" union="false" voidref="2" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="71" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="72"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="68"/> <vertex z="0.0" x="0.0" y="1.0" id="69"/> <vertex z="1.0" x="0.0" y="0.0" id="70"/> </ijn> </constructor> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> <space transparent="false" type="0" name="Mur" net="false" union="false" voidref="4" progid="2" id="3"> <description/> <Classification>unassigned</Classification> <boundary>13</boundary> <boundary>14</boundary> <boundary>15</boundary> <boundary>17</boundary> <boundary>19</boundary> <boundary>20</boundary> <boundary>21</boundary> <boundary>23</boundary> <boundary>24</boundary> <boundary>25</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" type="1" name="Exteriør" net="false" union="false" voidref="6" progid="3" id="5"> <description/> <Classification>unassigned</Classification> <boundary>13</boundary> <boundary>15</boundary> <boundary>16</boundary> <boundary>17</boundary> <boundary>21</boundary> <boundary>22</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="6"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Dør" net="false" union="false" voidref="8" progid="4" id="7"> <description/> <Classification>unassigned</Classification> <boundary>16</boundary> <boundary>18</boundary> <boundary>22</boundary> <boundary>23</boundary> <boundary>24</boundary> <boundary>25</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="8"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Fundament" net="false" union="false" voidref="10" progid="5" id="9"> <description/> <Classification>unassigned</Classification> <boundary>18</boundary> <boundary>19</boundary> <boundary>20</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="10"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" type="0" name="Tag" net="false" union="false" voidref="12" progid="6" id="11"> <description/> <Classification>unassigned</Classification> <boundary>14</boundary> <space transparent="true" type="1" name="Void" net="false" union="false" progid="1" id="12"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="8" id="13"> <edgeref>28</edgeref> <edgeref>34</edgeref> <edgeref>30</edgeref> <edgeref>26</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="9" id="14"> <edgeref>29</edgeref> <edgeref>34</edgeref> <edgeref>33</edgeref> <edgeref>32</edgeref> <back>11</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="12" id="15"> <edgeref>31</edgeref> <edgeref>32</edgeref> <edgeref>35</edgeref> <edgeref>27</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="21" id="16"> <edgeref>38</edgeref> <edgeref>41</edgeref> <edgeref>40</edgeref> <edgeref>39</edgeref> <back>5</back> <front>7</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="22" id="17"> <edgeref>40</edgeref> <edgeref>41</edgeref> <edgeref>36</edgeref> <edgeref>30</edgeref> <edgeref>29</edgeref> <edgeref>31</edgeref> <edgeref>37</edgeref> <edgeref>39</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="23" id="18"> <edgeref>38</edgeref> <edgeref>50</edgeref> <edgeref>44</edgeref> <edgeref>49</edgeref> <back>7</back> <front>9</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="19"> <edgeref>50</edgeref> <edgeref>43</edgeref> <edgeref>26</edgeref> <edgeref>36</edgeref> <back>9</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="25" id="20"> <edgeref>49</edgeref> <edgeref>42</edgeref> <edgeref>27</edgeref> <edgeref>37</edgeref> <back>3</back> <front>9</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="26" id="21"> <edgeref>45</edgeref> <edgeref>48</edgeref> <edgeref>46</edgeref> <edgeref>43</edgeref> <edgeref>28</edgeref> <edgeref>33</edgeref> <edgeref>35</edgeref> <edgeref>42</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="27" id="22"> <edgeref>45</edgeref> <edgeref>48</edgeref> <edgeref>46</edgeref> <edgeref>44</edgeref> <back>5</back> <front>7</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="28" id="23"> <edgeref>45</edgeref> <edgeref>47</edgeref> <edgeref>39</edgeref> <edgeref>49</edgeref> <back>7</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="29" id="24"> <edgeref>40</edgeref> <edgeref>51</edgeref> <edgeref>48</edgeref> <edgeref>47</edgeref> <back>3</back> <front>7</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="30" id="25"> <edgeref>46</edgeref> <edgeref>50</edgeref> <edgeref>41</edgeref> <edgeref>51</edgeref> <back>7</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge constructor="false" smooth="false" progid="1" id="26"> <from>55</from> <to>53</to> </edge> <edge constructor="false" smooth="false" progid="3" id="27"> <from>52</from> <to>54</to> </edge> <edge constructor="false" smooth="false" progid="5" id="28"> <from>53</from> <to>57</to> </edge> <edge constructor="false" smooth="false" progid="6" id="29"> <from>58</from> <to>59</to> </edge> <edge constructor="false" smooth="false" progid="7" id="30"> <from>55</from> <to>59</to> </edge> <edge constructor="false" smooth="false" progid="8" id="31"> <from>54</from> <to>58</to> </edge> <edge constructor="false" smooth="false" progid="9" id="32"> <from>56</from> <to>58</to> </edge> <edge constructor="false" smooth="false" progid="10" id="33"> <from>57</from> <to>56</to> </edge> <edge constructor="false" smooth="false" progid="11" id="34"> <from>59</from> <to>57</to> </edge> <edge constructor="false" smooth="false" progid="12" id="35"> <from>52</from> <to>56</to> </edge> <edge constructor="false" smooth="false" progid="14" id="36"> <from>61</from> <to>55</to> </edge> <edge constructor="false" smooth="false" progid="15" id="37"> <from>54</from> <to>63</to> </edge> <edge constructor="false" smooth="false" progid="16" id="38"> <from>63</from> <to>61</to> </edge> <edge constructor="false" smooth="false" progid="17" id="39"> <from>63</from> <to>60</to> </edge> <edge constructor="false" smooth="false" progid="18" id="40"> <from>60</from> <to>62</to> </edge> <edge constructor="false" smooth="false" progid="19" id="41"> <from>62</from> <to>61</to> </edge> <edge constructor="false" smooth="false" progid="21" id="42"> <from>66</from> <to>52</to> </edge> <edge constructor="false" smooth="false" progid="22" id="43"> <from>53</from> <to>67</to> </edge> <edge constructor="false" smooth="false" progid="23" id="44"> <from>67</from> <to>66</to> </edge> <edge constructor="false" smooth="false" progid="24" id="45"> <from>66</from> <to>64</to> </edge> <edge constructor="false" smooth="false" progid="25" id="46"> <from>65</from> <to>67</to> </edge> <edge constructor="false" smooth="false" progid="26" id="47"> <from>60</from> <to>64</to> </edge> <edge constructor="false" smooth="false" progid="27" id="48"> <from>64</from> <to>65</to> </edge> <edge constructor="false" smooth="false" progid="28" id="49"> <from>63</from> <to>66</to> </edge> <edge constructor="false" smooth="false" progid="29" id="50"> <from>61</from> <to>67</to> </edge> <edge constructor="false" smooth="false" progid="30" id="51"> <from>62</from> <to>65</to> </edge> <vertex z="0.0" x="5.9825522521" y="0.9931010076" progid="1" id="52"/> <vertex z="0.0" x="1.9825522521" y="0.9931010076" progid="2" id="53"/> <vertex z="0.0" x="5.9825522521" y="0.6031010076" progid="3" id="54"/> <vertex z="0.0" x="1.9825522521" y="0.6031010076" progid="4" id="55"/> <vertex z="3.0" x="5.9825522521" y="0.9931010076" progid="5" id="56"/> <vertex z="3.0" x="1.9825522521" y="0.9931010076" progid="6" id="57"/> <vertex z="3.0" x="5.9825522521" y="0.6031010076" progid="7" id="58"/> <vertex z="3.0" x="1.9825522521" y="0.6031010076" progid="8" id="59"/> <vertex z="2.0" x="4.9825522521" y="0.6031010076" progid="9" id="60"/> <vertex z="0.0" x="4.0725522521" y="0.6031010076" progid="10" id="61"/> <vertex z="2.0" x="4.0725522521" y="0.6031010076" progid="11" id="62"/> <vertex z="0.0" x="4.9825522521" y="0.6031010076" progid="12" id="63"/> <vertex z="2.0" x="4.9825522521" y="0.9931010076" progid="13" id="64"/> <vertex z="2.0" x="4.0725522521" y="0.9931010076" progid="14" id="65"/> <vertex z="0.0" x="4.9825522521" y="0.9931010076" progid="15" id="66"/> <vertex z="0.0" x="4.0725522521" y="0.9931010076" progid="16" id="67"/> </space> <material B="0.8035714" name="Void" R="0.91071427" G="0.8142857" id="73"/> <material B="0.9" name="Construction" R="0.9" G="0.9" id="74"/> <material B="0.7" name="Functional" R="0.96" G="0.87" id="75"/> <view name="(Current)" id="76"> <scalefactor>0</scalefactor> <camera z="7.185375626154643" x="9.70848491346647" y="-6.053452588523935"/> <center z="1.5" x="3.9825522521255654" y="0.7981010076152548"/> <roll z="0.9848077530122133" x="0.11135387508985581" y="-0.133244152252619"/> <focalwidth>35.0</focalwidth> <type>6</type> <hidden>9</hidden> <hidden>7</hidden> <hidden>5</hidden> </view> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> </bmodel> |
|
From: Michael L. <he...@us...> - 2008-02-06 14:41:50
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/walls In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6059/src/etc/walls Log Message: Directory /cvsroot/bprocessor/bprocessor/src/etc/walls added to the repository |
|
From: Michael L. <he...@us...> - 2008-02-05 14:21:16
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_3 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18404/src/etc/building_3 Modified Files: rooms.bp Log Message: Hidden status saved Index: rooms.bp =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/src/etc/building_3/rooms.bp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rooms.bp 5 Feb 2008 13:34:23 -0000 1.1 --- rooms.bp 5 Feb 2008 14:21:12 -0000 1.2 *************** *** 4,23 **** <cs>68</cs> <name>new project</name> ! <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="68" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ! <vertex z="0.0" x="0.0" y="0.0" id="69"/> <ijn> ! <vertex z="0.0" x="1.0" y="0.0" id="65"/> ! <vertex z="0.0" x="0.0" y="1.0" id="66"/> ! <vertex z="1.0" x="0.0" y="0.0" id="67"/> </ijn> </constructor> ! <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> ! <space transparent="true" net="false" type="1" voidref="4" union="false" name="Exteriør" progid="2" id="3"> <description/> <Classification>unassigned</Classification> --- 4,23 ---- <cs>68</cs> <name>new project</name> ! <space name="World" net="false" type="1" union="false" voidref="2" transparent="true" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="68" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ! <vertex x="0.0" z="0.0" y="0.0" id="69"/> <ijn> ! <vertex x="1.0" z="0.0" y="0.0" id="65"/> ! <vertex x="0.0" z="0.0" y="1.0" id="66"/> ! <vertex x="0.0" z="1.0" y="0.0" id="67"/> </ijn> </constructor> ! <space name="Void" net="false" type="1" union="false" transparent="true" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> ! <space name="Exteriør" net="false" type="1" union="false" voidref="4" transparent="true" progid="2" id="3"> <description/> <Classification>unassigned</Classification> *************** *** 26,35 **** <boundary>23</boundary> <boundary>24</boundary> ! <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space transparent="false" net="false" type="0" voidref="6" union="false" name="Vægsystem" progid="3" id="5"> <description/> <Classification>unassigned</Classification> --- 26,35 ---- <boundary>23</boundary> <boundary>24</boundary> ! <space name="Void" net="false" type="1" union="false" transparent="true" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space name="Vægsystem" net="false" type="0" union="false" voidref="6" transparent="false" progid="3" id="5"> <description/> <Classification>unassigned</Classification> *************** *** 44,53 **** <boundary>23</boundary> <boundary>24</boundary> ! <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="6"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space transparent="true" net="false" type="1" voidref="8" union="false" name="Værelse" progid="4" id="7"> <description/> <Classification>unassigned</Classification> --- 44,53 ---- <boundary>23</boundary> <boundary>24</boundary> ! <space name="Void" net="false" type="1" union="false" transparent="true" progid="1" id="6"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space name="Værelse" net="false" type="1" union="false" voidref="8" transparent="true" progid="4" id="7"> <description/> <Classification>unassigned</Classification> *************** *** 58,82 **** <boundary>20</boundary> <boundary>21</boundary> ! <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="8"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space transparent="false" net="false" type="0" voidref="10" union="false" name="Tag" progid="5" id="9"> <description/> <Classification>unassigned</Classification> <boundary>13</boundary> <boundary>14</boundary> ! <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="10"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space transparent="false" net="false" type="0" voidref="12" union="false" name="Gulv" progid="6" id="11"> <description/> <Classification>unassigned</Classification> <boundary>16</boundary> <boundary>17</boundary> ! <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="12"> <description/> <Classification>unassigned</Classification> --- 58,82 ---- <boundary>20</boundary> <boundary>21</boundary> ! <space name="Void" net="false" type="1" union="false" transparent="true" progid="1" id="8"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space name="Tag" net="false" type="0" union="false" voidref="10" transparent="false" progid="5" id="9"> <description/> <Classification>unassigned</Classification> <boundary>13</boundary> <boundary>14</boundary> ! <space name="Void" net="false" type="1" union="false" transparent="true" progid="1" id="10"> <description/> <Classification>unassigned</Classification> </space> </space> ! <space name="Gulv" net="false" type="0" union="false" voidref="12" transparent="false" progid="6" id="11"> <description/> <Classification>unassigned</Classification> <boundary>16</boundary> <boundary>17</boundary> ! <space name="Void" net="false" type="1" union="false" transparent="true" progid="1" id="12"> <description/> <Classification>unassigned</Classification> *************** *** 313,336 **** <to>62</to> </edge> ! <vertex z="0.0" x="9.6899503858" y="2.5372001518" progid="1" id="49"/> ! <vertex z="0.0" x="3.6899503858" y="10.5372001518" progid="2" id="50"/> ! <vertex z="0.0" x="9.6899503858" y="10.5372001518" progid="3" id="51"/> ! <vertex z="0.0" x="3.6899503858" y="2.5372001518" progid="4" id="52"/> ! <vertex z="0.0" x="3.2999503858" y="10.9272001518" progid="5" id="53"/> ! <vertex z="0.0" x="10.0799503858" y="10.9272001518" progid="6" id="54"/> ! <vertex z="0.0" x="3.2999503858" y="2.1472001518" progid="7" id="55"/> ! <vertex z="0.0" x="10.0799503858" y="2.1472001518" progid="8" id="56"/> ! <vertex z="3.0" x="10.0799503858" y="2.1472001518" progid="9" id="57"/> ! <vertex z="3.0" x="3.2999503858" y="10.9272001518" progid="10" id="58"/> ! <vertex z="3.0" x="3.6899503858" y="10.5372001518" progid="11" id="59"/> ! <vertex z="3.0" x="9.6899503858" y="2.5372001518" progid="12" id="60"/> ! <vertex z="3.0" x="3.2999503858" y="2.1472001518" progid="13" id="61"/> ! <vertex z="3.0" x="3.6899503858" y="2.5372001518" progid="14" id="62"/> ! <vertex z="3.0" x="9.6899503858" y="10.5372001518" progid="15" id="63"/> ! <vertex z="3.0" x="10.0799503858" y="10.9272001518" progid="16" id="64"/> </space> ! <material G="0.9" B="0.9" R="0.9" name="Construction" id="70"/> ! <material G="0.8142857" B="0.8035714" R="0.91071427" name="Void" id="71"/> ! <material G="0.87" B="0.7" R="0.96" name="Functional" id="72"/> <global> <key>brick</key> --- 313,347 ---- <to>62</to> </edge> ! <vertex x="9.6899503858" z="0.0" y="2.5372001518" progid="1" id="49"/> ! <vertex x="3.6899503858" z="0.0" y="10.5372001518" progid="2" id="50"/> ! <vertex x="9.6899503858" z="0.0" y="10.5372001518" progid="3" id="51"/> ! <vertex x="3.6899503858" z="0.0" y="2.5372001518" progid="4" id="52"/> ! <vertex x="3.2999503858" z="0.0" y="10.9272001518" progid="5" id="53"/> ! <vertex x="10.0799503858" z="0.0" y="10.9272001518" progid="6" id="54"/> ! <vertex x="3.2999503858" z="0.0" y="2.1472001518" progid="7" id="55"/> ! <vertex x="10.0799503858" z="0.0" y="2.1472001518" progid="8" id="56"/> ! <vertex x="10.0799503858" z="3.0" y="2.1472001518" progid="9" id="57"/> ! <vertex x="3.2999503858" z="3.0" y="10.9272001518" progid="10" id="58"/> ! <vertex x="3.6899503858" z="3.0" y="10.5372001518" progid="11" id="59"/> ! <vertex x="9.6899503858" z="3.0" y="2.5372001518" progid="12" id="60"/> ! <vertex x="3.2999503858" z="3.0" y="2.1472001518" progid="13" id="61"/> ! <vertex x="3.6899503858" z="3.0" y="2.5372001518" progid="14" id="62"/> ! <vertex x="9.6899503858" z="3.0" y="10.5372001518" progid="15" id="63"/> ! <vertex x="10.0799503858" z="3.0" y="10.9272001518" progid="16" id="64"/> </space> ! <material name="Void" R="0.91071427" G="0.8142857" B="0.8035714" id="70"/> ! <material name="Construction" R="0.9" G="0.9" B="0.9" id="71"/> ! <material name="Functional" R="0.96" G="0.87" B="0.7" id="72"/> ! <view name="(Current)" id="73"> ! <scalefactor>0</scalefactor> ! <camera z="18.419348896018494" x="19.518225698791" y="-12.613604829998838"/> ! <center z="2.0" x="6.0" y="3.0"/> ! <roll z="0.9975640502598244" x="0.045659474189527774" y="-0.052736875580097556"/> ! <focalwidth>35.0</focalwidth> ! <type>6</type> ! <hidden>9</hidden> ! <hidden>3</hidden> ! <hidden>7</hidden> ! </view> <global> <key>brick</key> |
|
From: Michael L. <he...@us...> - 2008-02-05 14:21:05
|
Update of /cvsroot/bprocessor/model/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18377/src/etc Modified Files: bprocessor.xsd Log Message: Hidden status saved Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** bprocessor.xsd 5 Feb 2008 13:34:20 -0000 1.41 --- bprocessor.xsd 5 Feb 2008 14:21:08 -0000 1.42 *************** *** 71,74 **** --- 71,75 ---- <xsd:element name="type" type="xsd:int" maxOccurs="1" minOccurs="1"/> <xsd:element name="clipplanes" type="ClipplaneType" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element name="hidden" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> |
|
From: Michael L. <he...@us...> - 2008-02-05 14:21:04
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18377/src/net/sourceforge/bprocessor/model Modified Files: Camera.java Persistence.java Log Message: Hidden status saved Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** Persistence.java 5 Feb 2008 13:34:20 -0000 1.74 --- Persistence.java 5 Feb 2008 14:21:08 -0000 1.75 *************** *** 166,170 **** CameraType current = document.getView(); if (current != null) { ! Project.getInstance().setCurrentCamera(internalizeCamera(current)); } } --- 166,172 ---- CameraType current = document.getView(); if (current != null) { ! Camera camera = internalizeCamera(current); ! internalizeReferences(camera, current, mapper); ! Project.getInstance().setCurrentCamera(camera); } } *************** *** 762,765 **** --- 764,771 ---- + private static void internalizeReferences(Camera object, CameraType xml, Map map) { + object.setHiddenGeometrics(asSet(xml.getHidden(), map)); + } + /** * *************** *** 855,859 **** { Camera current = Project.getInstance().getCurrentCamera(); ! document.setView(externalizeCamera(current)); } { --- 861,867 ---- { Camera current = Project.getInstance().getCurrentCamera(); ! CameraType xml = externalizeCamera(current); ! document.setView(xml); ! externalizeReferences(current, xml, mapper); } { *************** *** 1379,1382 **** --- 1387,1395 ---- } + + private static void externalizeReferences(Camera object, CameraType xml, Map map) { + xml.getHidden().addAll(ids(map, object.getHiddenGeometrics())); + } + /** * Externalize references Index: Camera.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Camera.java 8 Jan 2008 10:49:19 -0000 1.57 --- Camera.java 5 Feb 2008 14:21:08 -0000 1.58 *************** *** 140,143 **** --- 140,144 ---- this.addClipplane(clip.copy()); } + this.setHiddenGeometrics(new HashSet(other.getHiddenGeometrics())); } *************** *** 752,755 **** --- 753,764 ---- return hiddenGeometrics; } + + /** + * + * @param geometrics set of geometrics + */ + public void setHiddenGeometrics(Set<Geometric> geometrics) { + hiddenGeometrics = geometrics; + } /** |
|
From: Michael L. <he...@us...> - 2008-02-05 13:34:29
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32325/src/net/sourceforge/bprocessor/gl/tool Modified Files: ToolFactory.java Log Message: current view saved Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** ToolFactory.java 7 Jan 2008 15:23:55 -0000 1.103 --- ToolFactory.java 5 Feb 2008 13:34:32 -0000 1.104 *************** *** 232,235 **** --- 232,236 ---- Camera.makeTop(Project.getInstance().getCurrentCamera()); editor.repaint(); + Project.getInstance().checkpoint(); } }; *************** *** 247,250 **** --- 248,252 ---- } this.editor.repaint(); + Project.getInstance().checkpoint(); } }; |
|
From: Michael L. <he...@us...> - 2008-02-05 13:34:24
|
Update of /cvsroot/bprocessor/gui/src/gfx In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32305/src/gfx Added Files: coord-icon.png Log Message: current view saved --- NEW FILE: coord-icon.png --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2008-02-05 13:34:23
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32305/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java SpaceTreeView.java Log Message: current view saved Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** GenericTreeView.java 24 Jan 2008 10:35:38 -0000 1.140 --- GenericTreeView.java 5 Feb 2008 13:34:27 -0000 1.141 *************** *** 124,128 **** vertexgroupicon = loadIcon("Biconvertexgroup.gif"); genericgroupicon = loadIcon("Bicongenericgroup.gif"); ! constructoricon = loadIcon("constructor-icon.png"); constructorgroupicon = loadIcon("Biconconstructorgroup.gif"); constructionspaceicon = loadIcon("Biconconspace.gif"); --- 124,128 ---- vertexgroupicon = loadIcon("Biconvertexgroup.gif"); genericgroupicon = loadIcon("Bicongenericgroup.gif"); ! constructoricon = loadIcon("coord-icon.png"); constructorgroupicon = loadIcon("Biconconstructorgroup.gif"); constructionspaceicon = loadIcon("Biconconspace.gif"); Index: SpaceTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** SpaceTreeView.java 24 Jan 2008 10:35:39 -0000 1.30 --- SpaceTreeView.java 5 Feb 2008 13:34:27 -0000 1.31 *************** *** 30,41 **** public SpaceTreeView() { super(); ! Project p = Project.getInstance(); ! root.removeAllChildren(); ! root.add(new ProjectNode(p)); ! root.add(new ConstructorContainer("Constructors", p.getConstructors())); ! root.add(new MaterialContainer("Materials", p.getMaterials(), true)); ! root.add(new ComponentContainer("Catalog", p.getCatalogObjects())); ! model.nodeStructureChanged(root); ! Selection.primary().addObserver(new SelectionObserver()); } --- 30,44 ---- public SpaceTreeView() { super(); ! try { ! Project p = Project.getInstance(); ! root.removeAllChildren(); ! root.add(new ProjectNode(p)); ! root.add(new ConstructorContainer("Constructors", p.getConstructors())); ! root.add(new MaterialContainer("Materials", p.getMaterials(), true)); ! root.add(new ComponentContainer("Catalog", p.getCatalogObjects())); ! model.nodeStructureChanged(root); ! } catch (Exception error) { ! error.printStackTrace(); ! } Selection.primary().addObserver(new SelectionObserver()); } |
|
From: Michael L. <he...@us...> - 2008-02-05 13:34:19
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_3 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32297/src/etc/building_3 Added Files: rooms.bp ground.bp Log Message: current view saved --- NEW FILE: rooms.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>68</cs> <name>new project</name> <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="68" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="69"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="65"/> <vertex z="0.0" x="0.0" y="1.0" id="66"/> <vertex z="1.0" x="0.0" y="0.0" id="67"/> </ijn> </constructor> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> <space transparent="true" net="false" type="1" voidref="4" union="false" name="Exteriør" progid="2" id="3"> <description/> <Classification>unassigned</Classification> <boundary>19</boundary> <boundary>22</boundary> <boundary>23</boundary> <boundary>24</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" net="false" type="0" voidref="6" union="false" name="Vægsystem" progid="3" id="5"> <description/> <Classification>unassigned</Classification> <boundary>13</boundary> <boundary>15</boundary> <boundary>16</boundary> <boundary>18</boundary> <boundary>19</boundary> <boundary>20</boundary> <boundary>21</boundary> <boundary>22</boundary> <boundary>23</boundary> <boundary>24</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="6"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" net="false" type="1" voidref="8" union="false" name="Værelse" progid="4" id="7"> <description/> <Classification>unassigned</Classification> <boundary>14</boundary> <boundary>15</boundary> <boundary>17</boundary> <boundary>18</boundary> <boundary>20</boundary> <boundary>21</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="8"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" net="false" type="0" voidref="10" union="false" name="Tag" progid="5" id="9"> <description/> <Classification>unassigned</Classification> <boundary>13</boundary> <boundary>14</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="10"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" net="false" type="0" voidref="12" union="false" name="Gulv" progid="6" id="11"> <description/> <Classification>unassigned</Classification> <boundary>16</boundary> <boundary>17</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="12"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="13" id="13"> <edgeref>35</edgeref> <edgeref>44</edgeref> <edgeref>47</edgeref> <edgeref>40</edgeref> <hole>14</hole> <back>9</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="14" id="14"> <edgeref>33</edgeref> <edgeref>36</edgeref> <edgeref>37</edgeref> <edgeref>38</edgeref> <back>9</back> <front>7</front> <exterior>13</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="15" id="15"> <edgeref>33</edgeref> <edgeref>34</edgeref> <edgeref>26</edgeref> <edgeref>43</edgeref> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="16" id="16"> <edgeref>31</edgeref> <edgeref>32</edgeref> <edgeref>29</edgeref> <edgeref>30</edgeref> <hole>17</hole> <back>5</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="17" id="17"> <edgeref>27</edgeref> <edgeref>28</edgeref> <edgeref>25</edgeref> <edgeref>26</edgeref> <back>7</back> <front>11</front> <exterior>16</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="18" id="18"> <edgeref>27</edgeref> <edgeref>41</edgeref> <edgeref>36</edgeref> <edgeref>34</edgeref> <back>5</back> <front>7</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="19" id="19"> <edgeref>35</edgeref> <edgeref>45</edgeref> <edgeref>30</edgeref> <edgeref>39</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="20" id="20"> <edgeref>37</edgeref> <edgeref>48</edgeref> <edgeref>28</edgeref> <edgeref>41</edgeref> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="21" id="21"> <edgeref>38</edgeref> <edgeref>43</edgeref> <edgeref>25</edgeref> <edgeref>48</edgeref> <back>7</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="22" id="22"> <edgeref>31</edgeref> <edgeref>46</edgeref> <edgeref>44</edgeref> <edgeref>45</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="23" id="23"> <edgeref>39</edgeref> <edgeref>40</edgeref> <edgeref>42</edgeref> <edgeref>29</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="24"> <edgeref>42</edgeref> <edgeref>47</edgeref> <edgeref>46</edgeref> <edgeref>32</edgeref> <back>3</back> <front>5</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge smooth="false" constructor="false" progid="1" id="25"> <from>52</from> <to>50</to> </edge> <edge smooth="false" constructor="false" progid="2" id="26"> <from>50</from> <to>51</to> </edge> <edge smooth="false" constructor="false" progid="3" id="27"> <from>51</from> <to>49</to> </edge> <edge smooth="false" constructor="false" progid="4" id="28"> <from>49</from> <to>52</to> </edge> <edge smooth="false" constructor="false" progid="5" id="29"> <from>55</from> <to>53</to> </edge> <edge smooth="false" constructor="false" progid="6" id="30"> <from>53</from> <to>54</to> </edge> <edge smooth="false" constructor="false" progid="7" id="31"> <from>54</from> <to>56</to> </edge> <edge smooth="false" constructor="false" progid="8" id="32"> <from>56</from> <to>55</to> </edge> <edge smooth="false" constructor="false" progid="9" id="33"> <from>59</from> <to>63</to> </edge> <edge smooth="false" constructor="false" progid="10" id="34"> <from>51</from> <to>63</to> </edge> <edge smooth="false" constructor="false" progid="11" id="35"> <from>58</from> <to>64</to> </edge> <edge smooth="false" constructor="false" progid="12" id="36"> <from>63</from> <to>60</to> </edge> <edge smooth="false" constructor="false" progid="13" id="37"> <from>60</from> <to>62</to> </edge> <edge smooth="false" constructor="false" progid="14" id="38"> <from>62</from> <to>59</to> </edge> <edge smooth="false" constructor="false" progid="15" id="39"> <from>53</from> <to>58</to> </edge> <edge smooth="false" constructor="false" progid="16" id="40"> <from>61</from> <to>58</to> </edge> <edge smooth="false" constructor="false" progid="17" id="41"> <from>49</from> <to>60</to> </edge> <edge smooth="false" constructor="false" progid="18" id="42"> <from>55</from> <to>61</to> </edge> <edge smooth="false" constructor="false" progid="19" id="43"> <from>50</from> <to>59</to> </edge> <edge smooth="false" constructor="false" progid="20" id="44"> <from>64</from> <to>57</to> </edge> <edge smooth="false" constructor="false" progid="21" id="45"> <from>54</from> <to>64</to> </edge> <edge smooth="false" constructor="false" progid="22" id="46"> <from>56</from> <to>57</to> </edge> <edge smooth="false" constructor="false" progid="23" id="47"> <from>57</from> <to>61</to> </edge> <edge smooth="false" constructor="false" progid="24" id="48"> <from>52</from> <to>62</to> </edge> <vertex z="0.0" x="9.6899503858" y="2.5372001518" progid="1" id="49"/> <vertex z="0.0" x="3.6899503858" y="10.5372001518" progid="2" id="50"/> <vertex z="0.0" x="9.6899503858" y="10.5372001518" progid="3" id="51"/> <vertex z="0.0" x="3.6899503858" y="2.5372001518" progid="4" id="52"/> <vertex z="0.0" x="3.2999503858" y="10.9272001518" progid="5" id="53"/> <vertex z="0.0" x="10.0799503858" y="10.9272001518" progid="6" id="54"/> <vertex z="0.0" x="3.2999503858" y="2.1472001518" progid="7" id="55"/> <vertex z="0.0" x="10.0799503858" y="2.1472001518" progid="8" id="56"/> <vertex z="3.0" x="10.0799503858" y="2.1472001518" progid="9" id="57"/> <vertex z="3.0" x="3.2999503858" y="10.9272001518" progid="10" id="58"/> <vertex z="3.0" x="3.6899503858" y="10.5372001518" progid="11" id="59"/> <vertex z="3.0" x="9.6899503858" y="2.5372001518" progid="12" id="60"/> <vertex z="3.0" x="3.2999503858" y="2.1472001518" progid="13" id="61"/> <vertex z="3.0" x="3.6899503858" y="2.5372001518" progid="14" id="62"/> <vertex z="3.0" x="9.6899503858" y="10.5372001518" progid="15" id="63"/> <vertex z="3.0" x="10.0799503858" y="10.9272001518" progid="16" id="64"/> </space> <material G="0.9" B="0.9" R="0.9" name="Construction" id="70"/> <material G="0.8142857" B="0.8035714" R="0.91071427" name="Void" id="71"/> <material G="0.87" B="0.7" R="0.96" name="Functional" id="72"/> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> --- NEW FILE: ground.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>15</cs> <name>new project</name> <space type="1" transparent="true" name="World" union="false" net="false" voidref="2" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="15" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="16"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="12"/> <vertex z="0.0" x="0.0" y="1.0" id="13"/> <vertex z="1.0" x="0.0" y="0.0" id="14"/> </ijn> </constructor> <space type="1" transparent="true" name="Void" union="false" net="false" progid="1" id="2"> <description/> <Classification>unassigned</Classification> <boundary>3</boundary> </space> <surface progid="1" id="3"> <edgeref>4</edgeref> <edgeref>5</edgeref> <edgeref>6</edgeref> <edgeref>7</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge constructor="false" smooth="false" progid="1" id="4"> <from>11</from> <to>9</to> </edge> <edge constructor="false" smooth="false" progid="2" id="5"> <from>9</from> <to>10</to> </edge> <edge constructor="false" smooth="false" progid="3" id="6"> <from>10</from> <to>8</to> </edge> <edge constructor="false" smooth="false" progid="4" id="7"> <from>8</from> <to>11</to> </edge> <vertex z="0.0" x="9.6899503858" y="2.5372001518" progid="1" id="8"/> <vertex z="0.0" x="3.6899503858" y="10.5372001518" progid="2" id="9"/> <vertex z="0.0" x="9.6899503858" y="10.5372001518" progid="3" id="10"/> <vertex z="0.0" x="3.6899503858" y="2.5372001518" progid="4" id="11"/> </space> <material B="0.8035714" R="0.91071427" G="0.8142857" name="Void" id="17"/> <material B="0.7" R="0.96" G="0.87" name="Functional" id="18"/> <material B="0.9" R="0.9" G="0.9" name="Construction" id="19"/> <view name="(Current)" id="20"> <scalefactor>0</scalefactor> <camera x="1.2709491978992595" y="-10.645856337111232" z="17.75285349224298"/> <center x="6.0" y="3.0" z="2.0"/> <roll x="0.028539122407287565" y="0.082350725474144" z="0.9961946980917458"/> <focalwidth>35.0</focalwidth> <type>6</type> </view> <camera name="View 0" progid="0" id="21"> <scalefactor>0</scalefactor> <camera x="17.461905418860894" y="-11.107250055287361" z="24.374746504534958"/> <center x="8.227517984795073" y="4.887178157290256" z="2.364517704625392"/> <roll x="-0.38302222155948923" y="0.6634139481689394" z="0.6427876096865397"/> <focalwidth>35.0</focalwidth> <type>6</type> </camera> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> |
|
From: Michael L. <he...@us...> - 2008-02-05 13:34:17
|
Update of /cvsroot/bprocessor/model/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32279/src/etc Modified Files: bprocessor.xsd Log Message: current view saved Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** bprocessor.xsd 2 Dec 2007 12:02:14 -0000 1.40 --- bprocessor.xsd 5 Feb 2008 13:34:20 -0000 1.41 *************** *** 388,391 **** --- 388,392 ---- <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element name="view" type="CameraType" maxOccurs="1" minOccurs="0"/> <xsd:element name="camera" type="CameraType" maxOccurs="unbounded" minOccurs="0"/> <xsd:element name="global" type="MapElementType" maxOccurs="unbounded" minOccurs="0"/> |
|
From: Michael L. <he...@us...> - 2008-02-05 13:34:17
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32279/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: current view saved Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Persistence.java 30 Dec 2007 23:29:06 -0000 1.73 --- Persistence.java 5 Feb 2008 13:34:20 -0000 1.74 *************** *** 164,195 **** } { Iterator iter = document.getCamera().iterator(); while (iter.hasNext()) { ! CameraType ct = (CameraType) iter.next(); ! Camera cam = new Camera(); ! cam.setName(ct.getName()); ! TripletType campos = ct.getCamera(); ! cam.setCamera(new double[]{campos.getX(), campos.getY(), campos.getZ()}); ! TripletType cenpos = ct.getCenter(); ! cam.setCenter(new double[]{cenpos.getX(), cenpos.getY(), cenpos.getZ()}); ! TripletType up = ct.getRoll(); ! cam.setRoll(new double[]{up.getX(), up.getY(), up.getZ()}); ! cam.setFactor(ct.getScalefactor()); ! Collection clips = ct.getClipplanes(); ! Iterator clipit = clips.iterator(); ! while (clipit.hasNext()) { ! ClipplaneType cpt = (ClipplaneType)clipit.next(); ! CoordinateSystemType cst = cpt.getCoordinateSystem(); ! CoordinateSystem cs = internalizeCoordinateSystem(cst, new HashMap(), new LinkedList()); ! ClippingPlane cp = new ClippingPlane(cs); ! cp.setId(new Long(cpt.getId())); ! cp.setActive(cpt.isActive()); ! cp.setNumber(cpt.getNumber()); ! cp.setSlice(cpt.isSlice()); ! cam.addClipplane(cp); ! } ! cam.setFocalwidth(ct.getFocalwidth()); ! cam.setId(new Long(ct.getProgid())); ! cam.setType(ct.getType()); p.add(cam); } --- 164,177 ---- } { + CameraType current = document.getView(); + if (current != null) { + Project.getInstance().setCurrentCamera(internalizeCamera(current)); + } + } + { Iterator iter = document.getCamera().iterator(); while (iter.hasNext()) { ! CameraType current = (CameraType) iter.next(); ! Camera cam = internalizeCamera(current); p.add(cam); } *************** *** 230,233 **** --- 212,244 ---- } + private static Camera internalizeCamera(CameraType xml) { + Camera cam = new Camera(); + cam.setName(xml.getName()); + TripletType campos = xml.getCamera(); + cam.setCamera(new double[]{campos.getX(), campos.getY(), campos.getZ()}); + TripletType cenpos = xml.getCenter(); + cam.setCenter(new double[]{cenpos.getX(), cenpos.getY(), cenpos.getZ()}); + TripletType up = xml.getRoll(); + cam.setRoll(new double[]{up.getX(), up.getY(), up.getZ()}); + cam.setFactor(xml.getScalefactor()); + Collection clips = xml.getClipplanes(); + Iterator clipit = clips.iterator(); + while (clipit.hasNext()) { + ClipplaneType cpt = (ClipplaneType)clipit.next(); + CoordinateSystemType cst = cpt.getCoordinateSystem(); + CoordinateSystem cs = internalizeCoordinateSystem(cst, new HashMap(), new LinkedList()); + ClippingPlane cp = new ClippingPlane(cs); + cp.setId(new Long(cpt.getId())); + cp.setActive(cpt.isActive()); + cp.setNumber(cpt.getNumber()); + cp.setSlice(cpt.isSlice()); + cam.addClipplane(cp); + } + cam.setFocalwidth(xml.getFocalwidth()); + cam.setId(new Long(xml.getProgid())); + cam.setType(xml.getType()); + return cam; + } + private static Classification internalizeClassifaction(String string, int type) { Classification classification = null; *************** *** 843,891 **** document.setName(Project.getInstance().getName()); { Collection cams = document.getCamera(); Iterator iter = Project.getInstance().getCameras().iterator(); while (iter.hasNext()) { ! Camera c = (Camera) iter.next(); ! CameraType cam = new CameraTypeImpl(); ! cam.setName(c.getName()); ! TripletType campos = new TripletTypeImpl(); ! campos.setX(c.getCamera()[0]); ! campos.setY(c.getCamera()[1]); ! campos.setZ(c.getCamera()[2]); ! cam.setCamera(campos); ! TripletType cenpos = new TripletTypeImpl(); ! cenpos.setX(c.getCenter()[0]); ! cenpos.setY(c.getCenter()[1]); ! cenpos.setZ(c.getCenter()[2]); ! cam.setCenter(cenpos); ! TripletType up = new TripletTypeImpl(); ! up.setX(c.getRoll()[0]); ! up.setY(c.getRoll()[1]); ! up.setZ(c.getRoll()[2]); ! cam.setRoll(up); ! cam.setScalefactor((int)c.getFactor()); ! Collection clips = c.getClipplanes(); ! Iterator clipit = clips.iterator(); ! while (clipit.hasNext()) { ! ClippingPlane cp = (ClippingPlane)clipit.next(); ! ClipplaneType cpt = new ClipplaneTypeImpl(); ! CoordinateSystemType cst = ! externalizeCoordinateSystem(cp.getCoordinateSystem(), new HashMap()); ! cpt.setCoordinateSystem(cst); ! cpt.setId(counter++); ! if (cp.getId() != null) { ! cpt.setProgid(cp.getId().longValue()); ! } ! cpt.setNumber(cp.getNumber()); ! cpt.setSlice(cp.isSlice()); ! cpt.setActive(cp.isActive()); ! cam.getClipplanes().add(cpt); ! } ! cam.setFocalwidth(c.getFocalwidth()); ! if (c.getId() != null) { ! cam.setProgid(c.getId().longValue()); ! } ! cam.setId(counter++); ! cam.setType(c.getType()); cams.add(cam); } --- 854,866 ---- document.setName(Project.getInstance().getName()); { + Camera current = Project.getInstance().getCurrentCamera(); + document.setView(externalizeCamera(current)); + } + { Collection cams = document.getCamera(); Iterator iter = Project.getInstance().getCameras().iterator(); while (iter.hasNext()) { ! Camera current = (Camera) iter.next(); ! CameraType cam = externalizeCamera(current); cams.add(cam); } *************** *** 933,936 **** --- 908,957 ---- } + + private static CameraType externalizeCamera(Camera c) { + CameraType xml = new CameraTypeImpl(); + xml.setName(c.getName()); + TripletType campos = new TripletTypeImpl(); + campos.setX(c.getCamera()[0]); + campos.setY(c.getCamera()[1]); + campos.setZ(c.getCamera()[2]); + xml.setCamera(campos); + TripletType cenpos = new TripletTypeImpl(); + cenpos.setX(c.getCenter()[0]); + cenpos.setY(c.getCenter()[1]); + cenpos.setZ(c.getCenter()[2]); + xml.setCenter(cenpos); + TripletType up = new TripletTypeImpl(); + up.setX(c.getRoll()[0]); + up.setY(c.getRoll()[1]); + up.setZ(c.getRoll()[2]); + xml.setRoll(up); + xml.setScalefactor((int)c.getFactor()); + Collection clips = c.getClipplanes(); + Iterator clipit = clips.iterator(); + while (clipit.hasNext()) { + ClippingPlane cp = (ClippingPlane)clipit.next(); + ClipplaneType cpt = new ClipplaneTypeImpl(); + CoordinateSystemType cst = + externalizeCoordinateSystem(cp.getCoordinateSystem(), new HashMap()); + cpt.setCoordinateSystem(cst); + cpt.setId(counter++); + if (cp.getId() != null) { + cpt.setProgid(cp.getId().longValue()); + } + cpt.setNumber(cp.getNumber()); + cpt.setSlice(cp.isSlice()); + cpt.setActive(cp.isActive()); + xml.getClipplanes().add(cpt); + } + xml.setFocalwidth(c.getFocalwidth()); + if (c.getId() != null) { + xml.setProgid(c.getId().longValue()); + } + xml.setId(counter++); + xml.setType(c.getType()); + return xml; + } + /** * Save the modellor |
|
From: Michael L. <he...@us...> - 2008-02-05 13:34:08
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_3 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32252/src/etc/building_3 Log Message: Directory /cvsroot/bprocessor/bprocessor/src/etc/building_3 added to the repository |
|
From: Michael L. <he...@us...> - 2008-02-05 08:30:10
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_1 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10960/src/etc/building_1 Log Message: Directory /cvsroot/bprocessor/bprocessor/src/etc/building_1 added to the repository |
|
From: Michael L. <he...@us...> - 2008-02-05 08:30:10
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_2 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10960/src/etc/building_2 Log Message: Directory /cvsroot/bprocessor/bprocessor/src/etc/building_2 added to the repository |
|
From: Michael L. <he...@us...> - 2008-02-05 08:30:10
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_2 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10982/src/etc/building_2 Added Files: openings.bp rooms.bp ground.bp Log Message: Cases --- NEW FILE: rooms.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>124</cs> <name>new project</name> <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="124" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="125"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="121"/> <vertex z="0.0" x="0.0" y="1.0" id="122"/> <vertex z="1.0" x="0.0" y="0.0" id="123"/> </ijn> </constructor> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> <space transparent="false" net="false" type="0" voidref="4" union="false" name="Vægsystem" progid="5" id="3"> <description/> <Classification>unassigned</Classification> <boundary>17</boundary> <boundary>19</boundary> <boundary>20</boundary> <boundary>22</boundary> <boundary>23</boundary> <boundary>24</boundary> <boundary>26</boundary> <boundary>27</boundary> <boundary>29</boundary> <boundary>31</boundary> <boundary>32</boundary> <boundary>33</boundary> <boundary>34</boundary> <boundary>35</boundary> <boundary>36</boundary> <boundary>37</boundary> <boundary>39</boundary> <boundary>40</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" net="false" type="1" voidref="6" union="false" name="Værelse" progid="6" id="5"> <description/> <Classification>unassigned</Classification> <boundary>19</boundary> <boundary>21</boundary> <boundary>24</boundary> <boundary>25</boundary> <boundary>29</boundary> <boundary>36</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="6"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" net="false" type="1" voidref="8" union="false" name="Køkken" progid="7" id="7"> <description/> <Classification>unassigned</Classification> <boundary>22</boundary> <boundary>27</boundary> <boundary>30</boundary> <boundary>32</boundary> <boundary>38</boundary> <boundary>39</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="8"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" net="false" type="1" voidref="10" union="false" name="Bad" progid="8" id="9"> <description/> <Classification>unassigned</Classification> <boundary>17</boundary> <boundary>18</boundary> <boundary>23</boundary> <boundary>28</boundary> <boundary>31</boundary> <boundary>37</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="10"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="true" net="false" type="1" voidref="12" union="false" name="Exteriør" progid="9" id="11"> <description/> <Classification>unassigned</Classification> <boundary>20</boundary> <boundary>26</boundary> <boundary>34</boundary> <boundary>40</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="12"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" net="false" type="0" voidref="14" union="false" name="Tagsystem" progid="10" id="13"> <description/> <Classification>unassigned</Classification> <boundary>21</boundary> <boundary>28</boundary> <boundary>33</boundary> <boundary>38</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="14"> <description/> <Classification>unassigned</Classification> </space> </space> <space transparent="false" net="false" type="0" voidref="16" union="false" name="Fundamentsystem" progid="11" id="15"> <description/> <Classification>unassigned</Classification> <boundary>18</boundary> <boundary>25</boundary> <boundary>30</boundary> <boundary>35</boundary> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="16"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="1" id="17"> <edgeref>59</edgeref> <edgeref>46</edgeref> <edgeref>60</edgeref> <edgeref>41</edgeref> <back>9</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="2" id="18"> <edgeref>54</edgeref> <edgeref>45</edgeref> <edgeref>41</edgeref> <edgeref>52</edgeref> <back>9</back> <front>15</front> <exterior>35</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="3" id="19"> <edgeref>58</edgeref> <edgeref>63</edgeref> <edgeref>55</edgeref> <edgeref>82</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="4" id="20"> <edgeref>80</edgeref> <edgeref>70</edgeref> <edgeref>56</edgeref> <edgeref>42</edgeref> <back>3</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="5" id="21"> <edgeref>57</edgeref> <edgeref>63</edgeref> <edgeref>64</edgeref> <edgeref>85</edgeref> <back>5</back> <front>13</front> <exterior>33</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="6" id="22"> <edgeref>69</edgeref> <edgeref>77</edgeref> <edgeref>51</edgeref> <edgeref>50</edgeref> <back>7</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="7" id="23"> <edgeref>60</edgeref> <edgeref>67</edgeref> <edgeref>43</edgeref> <edgeref>52</edgeref> <back>9</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="8" id="24"> <edgeref>44</edgeref> <edgeref>64</edgeref> <edgeref>58</edgeref> <edgeref>66</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="9" id="25"> <edgeref>75</edgeref> <edgeref>66</edgeref> <edgeref>82</edgeref> <edgeref>72</edgeref> <back>5</back> <front>15</front> <exterior>35</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="10" id="26"> <edgeref>81</edgeref> <edgeref>53</edgeref> <edgeref>80</edgeref> <edgeref>86</edgeref> <back>3</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="11" id="27"> <edgeref>51</edgeref> <edgeref>73</edgeref> <edgeref>71</edgeref> <edgeref>84</edgeref> <back>7</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="12" id="28"> <edgeref>67</edgeref> <edgeref>46</edgeref> <edgeref>65</edgeref> <edgeref>49</edgeref> <back>9</back> <front>13</front> <exterior>33</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="13" id="29"> <edgeref>61</edgeref> <edgeref>85</edgeref> <edgeref>44</edgeref> <edgeref>75</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="14" id="30"> <edgeref>62</edgeref> <edgeref>87</edgeref> <edgeref>50</edgeref> <edgeref>84</edgeref> <back>7</back> <front>15</front> <exterior>35</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="15" id="31"> <edgeref>43</edgeref> <edgeref>49</edgeref> <edgeref>68</edgeref> <edgeref>54</edgeref> <back>9</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="16" id="32"> <edgeref>71</edgeref> <edgeref>76</edgeref> <edgeref>74</edgeref> <edgeref>62</edgeref> <back>7</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="17" id="33"> <edgeref>70</edgeref> <edgeref>53</edgeref> <edgeref>48</edgeref> <edgeref>88</edgeref> <hole>21</hole> <hole>28</hole> <hole>38</hole> <back>3</back> <front>13</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="18" id="34"> <edgeref>78</edgeref> <edgeref>48</edgeref> <edgeref>81</edgeref> <edgeref>47</edgeref> <back>3</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="19" id="35"> <edgeref>83</edgeref> <edgeref>47</edgeref> <edgeref>86</edgeref> <edgeref>42</edgeref> <hole>18</hole> <hole>25</hole> <hole>30</hole> <back>3</back> <front>15</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="20" id="36"> <edgeref>55</edgeref> <edgeref>57</edgeref> <edgeref>61</edgeref> <edgeref>72</edgeref> <back>5</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="21" id="37"> <edgeref>68</edgeref> <edgeref>65</edgeref> <edgeref>59</edgeref> <edgeref>45</edgeref> <back>9</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="22" id="38"> <edgeref>73</edgeref> <edgeref>77</edgeref> <edgeref>79</edgeref> <edgeref>76</edgeref> <back>7</back> <front>13</front> <exterior>33</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="23" id="39"> <edgeref>74</edgeref> <edgeref>79</edgeref> <edgeref>69</edgeref> <edgeref>87</edgeref> <back>7</back> <front>3</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="40"> <edgeref>56</edgeref> <edgeref>88</edgeref> <edgeref>78</edgeref> <edgeref>83</edgeref> <back>3</back> <front>11</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge smooth="false" constructor="false" progid="1" id="41"> <from>91</from> <to>103</to> </edge> <edge smooth="false" constructor="false" progid="2" id="42"> <from>107</from> <to>119</to> </edge> <edge smooth="false" constructor="false" progid="3" id="43"> <from>117</from> <to>92</to> </edge> <edge smooth="false" constructor="false" progid="4" id="44"> <from>115</from> <to>120</to> </edge> <edge smooth="false" constructor="false" progid="5" id="45"> <from>114</from> <to>91</to> </edge> <edge smooth="false" constructor="false" progid="6" id="46"> <from>112</from> <to>113</to> </edge> <edge smooth="false" constructor="false" progid="7" id="47"> <from>100</from> <to>95</to> </edge> <edge smooth="false" constructor="false" progid="8" id="48"> <from>98</from> <to>96</to> </edge> <edge smooth="false" constructor="false" progid="9" id="49"> <from>92</from> <to>93</to> </edge> <edge smooth="false" constructor="false" progid="10" id="50"> <from>102</from> <to>101</to> </edge> <edge smooth="false" constructor="false" progid="11" id="51"> <from>101</from> <to>118</to> </edge> <edge smooth="false" constructor="false" progid="12" id="52"> <from>103</from> <to>117</to> </edge> <edge smooth="false" constructor="false" progid="13" id="53"> <from>96</from> <to>104</to> </edge> <edge smooth="false" constructor="false" progid="14" id="54"> <from>117</from> <to>114</to> </edge> <edge smooth="false" constructor="false" progid="15" id="55"> <from>111</from> <to>90</to> </edge> <edge smooth="false" constructor="false" progid="16" id="56"> <from>119</from> <to>97</to> </edge> <edge smooth="false" constructor="false" progid="17" id="57"> <from>90</from> <to>110</to> </edge> <edge smooth="false" constructor="false" progid="18" id="58"> <from>105</from> <to>109</to> </edge> <edge smooth="false" constructor="false" progid="19" id="59"> <from>91</from> <to>112</to> </edge> <edge smooth="false" constructor="false" progid="20" id="60"> <from>103</from> <to>113</to> </edge> <edge smooth="false" constructor="false" progid="21" id="61"> <from>106</from> <to>110</to> </edge> <edge smooth="false" constructor="false" progid="22" id="62"> <from>89</from> <to>99</to> </edge> <edge smooth="false" constructor="false" progid="23" id="63"> <from>109</from> <to>90</to> </edge> <edge smooth="false" constructor="false" progid="24" id="64"> <from>120</from> <to>109</to> </edge> <edge smooth="false" constructor="false" progid="25" id="65"> <from>93</from> <to>112</to> </edge> <edge smooth="false" constructor="false" progid="26" id="66"> <from>115</from> <to>105</to> </edge> <edge smooth="false" constructor="false" progid="27" id="67"> <from>113</from> <to>92</to> </edge> <edge smooth="false" constructor="false" progid="28" id="68"> <from>114</from> <to>93</to> </edge> <edge smooth="false" constructor="false" progid="29" id="69"> <from>102</from> <to>116</to> </edge> <edge smooth="false" constructor="false" progid="30" id="70"> <from>104</from> <to>97</to> </edge> <edge smooth="false" constructor="false" progid="31" id="71"> <from>89</from> <to>94</to> </edge> <edge smooth="false" constructor="false" progid="32" id="72"> <from>111</from> <to>106</to> </edge> <edge smooth="false" constructor="false" progid="33" id="73"> <from>118</from> <to>94</to> </edge> <edge smooth="false" constructor="false" progid="34" id="74"> <from>99</from> <to>108</to> </edge> <edge smooth="false" constructor="false" progid="35" id="75"> <from>106</from> <to>115</to> </edge> <edge smooth="false" constructor="false" progid="36" id="76"> <from>94</from> <to>108</to> </edge> <edge smooth="false" constructor="false" progid="37" id="77"> <from>116</from> <to>118</to> </edge> <edge smooth="false" constructor="false" progid="38" id="78"> <from>100</from> <to>98</to> </edge> <edge smooth="false" constructor="false" progid="39" id="79"> <from>108</from> <to>116</to> </edge> <edge smooth="false" constructor="false" progid="40" id="80"> <from>107</from> <to>104</to> </edge> <edge smooth="false" constructor="false" progid="41" id="81"> <from>95</from> <to>96</to> </edge> <edge smooth="false" constructor="false" progid="42" id="82"> <from>105</from> <to>111</to> </edge> <edge smooth="false" constructor="false" progid="43" id="83"> <from>119</from> <to>100</to> </edge> <edge smooth="false" constructor="false" progid="44" id="84"> <from>101</from> <to>89</to> </edge> <edge smooth="false" constructor="false" progid="45" id="85"> <from>110</from> <to>120</to> </edge> <edge smooth="false" constructor="false" progid="46" id="86"> <from>95</from> <to>107</to> </edge> <edge smooth="false" constructor="false" progid="47" id="87"> <from>99</from> <to>102</to> </edge> <edge smooth="false" constructor="false" progid="48" id="88"> <from>97</from> <to>98</to> </edge> <vertex z="0.0" x="2.7907620244" y="16.4647110738" progid="1" id="89"/> <vertex z="3.0" x="2.7907620244" y="13.4097110738" progid="2" id="90"/> <vertex z="0.0" x="8.7907620244" y="13.5197110738" progid="3" id="91"/> <vertex z="3.0" x="6.8457620244" y="16.4647110738" progid="4" id="92"/> <vertex z="3.0" x="8.7907620244" y="16.4647110738" progid="5" id="93"/> <vertex z="3.0" x="2.7907620244" y="16.4647110738" progid="6" id="94"/> <vertex z="0.0" x="2.4007620244" y="8.0747110738" progid="7" id="95"/> <vertex z="3.0" x="2.4007620244" y="8.0747110738" progid="8" id="96"/> <vertex z="3.0" x="9.1807620244" y="16.8547110738" progid="9" id="97"/> <vertex z="3.0" x="9.1807620244" y="8.0747110738" progid="10" id="98"/> <vertex z="0.0" x="6.7357620244" y="16.4647110738" progid="11" id="99"/> <vertex z="0.0" x="9.1807620244" y="8.0747110738" progid="12" id="100"/> <vertex z="0.0" x="2.7907620244" y="13.5197110738" progid="13" id="101"/> <vertex z="0.0" x="6.7357620244" y="13.5197110738" progid="14" id="102"/> <vertex z="0.0" x="6.8457620244" y="13.5197110738" progid="15" id="103"/> <vertex z="3.0" x="2.4007620244" y="16.8547110738" progid="16" id="104"/> <vertex z="0.0" x="2.7907620244" y="8.4647110738" progid="17" id="105"/> <vertex z="0.0" x="8.7907620244" y="13.4097110738" progid="18" id="106"/> <vertex z="0.0" x="2.4007620244" y="16.8547110738" progid="19" id="107"/> <vertex z="3.0" x="6.7357620244" y="16.4647110738" progid="20" id="108"/> <vertex z="3.0" x="2.7907620244" y="8.4647110738" progid="21" id="109"/> <vertex z="3.0" x="8.7907620244" y="13.4097110738" progid="22" id="110"/> <vertex z="0.0" x="2.7907620244" y="13.4097110738" progid="23" id="111"/> <vertex z="3.0" x="8.7907620244" y="13.5197110738" progid="24" id="112"/> <vertex z="3.0" x="6.8457620244" y="13.5197110738" progid="25" id="113"/> <vertex z="0.0" x="8.7907620244" y="16.4647110738" progid="26" id="114"/> <vertex z="0.0" x="8.7907620244" y="8.4647110738" progid="27" id="115"/> <vertex z="3.0" x="6.7357620244" y="13.5197110738" progid="28" id="116"/> <vertex z="0.0" x="6.8457620244" y="16.4647110738" progid="29" id="117"/> <vertex z="3.0" x="2.7907620244" y="13.5197110738" progid="30" id="118"/> <vertex z="0.0" x="9.1807620244" y="16.8547110738" progid="31" id="119"/> <vertex z="3.0" x="8.7907620244" y="8.4647110738" progid="32" id="120"/> </space> <material G="0.87" B="0.7" R="0.96" name="Functional" id="126"/> <material G="0.8142857" B="0.8035714" R="0.91071427" name="Void" id="127"/> <material G="0.9" B="0.9" R="0.9" name="Construction" id="128"/> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> --- NEW FILE: ground.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>31</cs> <name>new project</name> <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="31" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="32"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="28"/> <vertex z="0.0" x="0.0" y="1.0" id="29"/> <vertex z="1.0" x="0.0" y="0.0" id="30"/> </ijn> </constructor> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> <boundary>5</boundary> <boundary>6</boundary> <boundary>7</boundary> </space> <space transparent="false" net="false" type="0" voidref="4" union="true" name="Union" progid="2" id="3"> <description/> <Classification>unassigned</Classification> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="23" id="5"> <edgeref>12</edgeref> <edgeref>10</edgeref> <edgeref>11</edgeref> <edgeref>13</edgeref> <edgeref>17</edgeref> <edgeref>16</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="6"> <edgeref>15</edgeref> <edgeref>13</edgeref> <edgeref>9</edgeref> <edgeref>18</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="27" id="7"> <edgeref>8</edgeref> <edgeref>17</edgeref> <edgeref>15</edgeref> <edgeref>14</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge smooth="false" constructor="false" progid="31" id="8"> <from>27</from> <to>20</to> </edge> <edge smooth="false" constructor="false" progid="32" id="9"> <from>23</from> <to>21</to> </edge> <edge smooth="false" constructor="false" progid="35" id="10"> <from>26</from> <to>19</to> </edge> <edge smooth="false" constructor="false" progid="37" id="11"> <from>19</from> <to>23</to> </edge> <edge smooth="false" constructor="false" progid="40" id="12"> <from>25</from> <to>26</to> </edge> <edge smooth="false" constructor="false" progid="42" id="13"> <from>23</from> <to>22</to> </edge> <edge smooth="false" constructor="false" progid="43" id="14"> <from>24</from> <to>27</to> </edge> <edge smooth="false" constructor="false" progid="44" id="15"> <from>24</from> <to>22</to> </edge> <edge smooth="false" constructor="false" progid="47" id="16"> <from>20</from> <to>25</to> </edge> <edge smooth="false" constructor="false" progid="48" id="17"> <from>22</from> <to>20</to> </edge> <edge smooth="false" constructor="false" progid="51" id="18"> <from>21</from> <to>24</to> </edge> <vertex z="0.0" x="2.7907620244" y="8.4647110738" progid="21" id="19"/> <vertex z="0.0" x="8.7907620244" y="13.4647110738" progid="24" id="20"/> <vertex z="0.0" x="2.7907620244" y="16.4647110738" progid="25" id="21"/> <vertex z="0.0" x="6.7907620244" y="13.4647110738" progid="26" id="22"/> <vertex z="0.0" x="2.7907620244" y="13.4647110738" progid="27" id="23"/> <vertex z="0.0" x="6.7907620244" y="16.4647110738" progid="30" id="24"/> <vertex z="0.0" x="8.7907620244" y="11.4647110738" progid="32" id="25"/> <vertex z="0.0" x="8.7907620244" y="8.4647110738" progid="34" id="26"/> <vertex z="0.0" x="8.7907620244" y="16.4647110738" progid="35" id="27"/> </space> <material G="0.8142857" B="0.8035714" R="0.91071427" name="Void" id="33"/> <material G="0.9" B="0.9" R="0.9" name="Construction" id="34"/> <material G="0.87" B="0.7" R="0.96" name="Functional" id="35"/> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> --- NEW FILE: openings.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>292</cs> <name>new project</name> <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="292" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="293"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="289"/> <vertex z="0.0" x="0.0" y="1.0" id="290"/> <vertex z="1.0" x="0.0" y="0.0" id="291"/> </ijn> </constructor> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> [...1479 lines suppressed...] <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> |
|
From: Michael L. <he...@us...> - 2008-02-05 08:30:10
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_1 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10982/src/etc/building_1 Added Files: ground.bp openings.bp rooms.bp Log Message: Cases --- NEW FILE: rooms.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>236</cs> <name>new project</name> <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="236" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="237"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="233"/> <vertex z="0.0" x="0.0" y="1.0" id="234"/> <vertex z="1.0" x="0.0" y="0.0" id="235"/> </ijn> </constructor> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> [...1191 lines suppressed...] <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> --- NEW FILE: ground.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>53</cs> <name>new project</name> <space net="false" name="World" type="1" transparent="true" voidref="2" union="false" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="53" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex x="0.0" z="0.0" y="0.0" id="54"/> <ijn> <vertex x="1.0" z="0.0" y="0.0" id="50"/> <vertex x="0.0" z="0.0" y="1.0" id="51"/> <vertex x="0.0" z="1.0" y="0.0" id="52"/> </ijn> </constructor> <space net="false" name="Void" type="1" transparent="true" union="false" progid="1" id="2"> <description/> <Classification>unassigned</Classification> <boundary>5</boundary> <boundary>6</boundary> <boundary>7</boundary> <boundary>8</boundary> <boundary>9</boundary> <boundary>10</boundary> <boundary>11</boundary> </space> <space net="false" name="Union" type="0" transparent="false" voidref="4" union="true" progid="2" id="3"> <description/> <Classification>unassigned</Classification> <space net="false" name="Void" type="1" transparent="true" union="false" progid="1" id="4"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="21" id="5"> <edgeref>14</edgeref> <edgeref>15</edgeref> <edgeref>27</edgeref> <edgeref>19</edgeref> <edgeref>31</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="22" id="6"> <edgeref>26</edgeref> <edgeref>31</edgeref> <edgeref>22</edgeref> <edgeref>28</edgeref> <edgeref>12</edgeref> <edgeref>17</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="23" id="7"> <edgeref>21</edgeref> <edgeref>16</edgeref> <edgeref>18</edgeref> <edgeref>23</edgeref> <edgeref>29</edgeref> <edgeref>28</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="8"> <edgeref>25</edgeref> <edgeref>23</edgeref> <edgeref>13</edgeref> <edgeref>32</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="25" id="9"> <edgeref>26</edgeref> <edgeref>14</edgeref> <edgeref>20</edgeref> <edgeref>33</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="26" id="10"> <edgeref>19</edgeref> <edgeref>30</edgeref> <edgeref>21</edgeref> <edgeref>22</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="27" id="11"> <edgeref>12</edgeref> <edgeref>29</edgeref> <edgeref>25</edgeref> <edgeref>24</edgeref> <back>2</back> <front>2</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge constructor="false" smooth="false" progid="31" id="12"> <from>48</from> <to>37</to> </edge> <edge constructor="false" smooth="false" progid="32" id="13"> <from>40</from> <to>38</to> </edge> <edge constructor="false" smooth="false" progid="33" id="14"> <from>36</from> <to>44</to> </edge> <edge constructor="false" smooth="false" progid="34" id="15"> <from>44</from> <to>42</to> </edge> <edge constructor="false" smooth="false" progid="35" id="16"> <from>47</from> <to>34</to> </edge> <edge constructor="false" smooth="false" progid="36" id="17"> <from>48</from> <to>35</to> </edge> <edge constructor="false" smooth="false" progid="37" id="18"> <from>34</from> <to>40</to> </edge> <edge constructor="false" smooth="false" progid="38" id="19"> <from>49</from> <to>46</to> </edge> <edge constructor="false" smooth="false" progid="39" id="20"> <from>41</from> <to>44</to> </edge> <edge constructor="false" smooth="false" progid="40" id="21"> <from>45</from> <to>47</to> </edge> <edge constructor="false" smooth="false" progid="41" id="22"> <from>45</from> <to>49</to> </edge> <edge constructor="false" smooth="false" progid="42" id="23"> <from>40</from> <to>39</to> </edge> <edge constructor="false" smooth="false" progid="43" id="24"> <from>43</from> <to>48</to> </edge> <edge constructor="false" smooth="false" progid="44" id="25"> <from>43</from> <to>39</to> </edge> <edge constructor="false" smooth="false" progid="45" id="26"> <from>35</from> <to>36</to> </edge> <edge constructor="false" smooth="false" progid="46" id="27"> <from>42</from> <to>46</to> </edge> <edge constructor="false" smooth="false" progid="47" id="28"> <from>37</from> <to>45</to> </edge> <edge constructor="false" smooth="false" progid="48" id="29"> <from>39</from> <to>37</to> </edge> <edge constructor="false" smooth="false" progid="49" id="30"> <from>46</from> <to>47</to> </edge> <edge constructor="false" smooth="false" progid="50" id="31"> <from>36</from> <to>49</to> </edge> <edge constructor="false" smooth="false" progid="51" id="32"> <from>38</from> <to>43</to> </edge> <edge constructor="false" smooth="false" progid="52" id="33"> <from>35</from> <to>41</to> </edge> <vertex x="2.7907620244" z="0.0" y="8.4647110738" progid="21" id="34"/> <vertex x="10.7907620244" z="0.0" y="16.4647110738" progid="22" id="35"/> <vertex x="10.7907620244" z="0.0" y="13.4647110738" progid="23" id="36"/> <vertex x="8.7907620244" z="0.0" y="13.4647110738" progid="24" id="37"/> <vertex x="2.7907620244" z="0.0" y="16.4647110738" progid="25" id="38"/> <vertex x="6.7907620244" z="0.0" y="13.4647110738" progid="26" id="39"/> <vertex x="2.7907620244" z="0.0" y="13.4647110738" progid="27" id="40"/> <vertex x="14.7907620244" z="0.0" y="16.4647110738" progid="28" id="41"/> <vertex x="14.7907620244" z="0.0" y="8.4647110738" progid="29" id="42"/> <vertex x="6.7907620244" z="0.0" y="16.4647110738" progid="30" id="43"/> <vertex x="14.7907620244" z="0.0" y="13.4647110738" progid="31" id="44"/> <vertex x="8.7907620244" z="0.0" y="11.4647110738" progid="32" id="45"/> <vertex x="10.7907620244" z="0.0" y="8.4647110738" progid="33" id="46"/> <vertex x="8.7907620244" z="0.0" y="8.4647110738" progid="34" id="47"/> <vertex x="8.7907620244" z="0.0" y="16.4647110738" progid="35" id="48"/> <vertex x="10.7907620244" z="0.0" y="11.4647110738" progid="36" id="49"/> </space> <material G="0.9" B="0.9" R="0.9" name="Construction" id="55"/> <material G="0.8142857" B="0.8035714" R="0.91071427" name="Void" id="56"/> <material G="0.87" B="0.7" R="0.96" name="Functional" id="57"/> <global> <key>brick</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.12</double> </value> </global> <global> <key>isolation</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.1</double> </value> </global> <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> --- NEW FILE: openings.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>685</cs> <name>new project</name> <space transparent="true" net="false" type="1" voidref="2" union="false" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="685" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" x="0.0" y="0.0" id="686"/> <ijn> <vertex z="0.0" x="1.0" y="0.0" id="682"/> <vertex z="0.0" x="0.0" y="1.0" id="683"/> <vertex z="1.0" x="0.0" y="0.0" id="684"/> </ijn> </constructor> <space transparent="true" net="false" type="1" union="false" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> [...3504 lines suppressed...] <global> <key>pi</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>3.141592653589793</double> </value> </global> <global> <key>roof</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.07</double> </value> </global> <global> <key>wall</key> <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <double>0.15</double> </value> </global> </bmodel> |
|
From: Michael L. <he...@us...> - 2008-02-05 08:29:57
|
Update of /cvsroot/bprocessor/bprocessor/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10960/src/etc Log Message: Directory /cvsroot/bprocessor/bprocessor/src/etc added to the repository |
|
From: Michael L. <he...@us...> - 2008-01-31 14:32:15
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1479/src/net/sourceforge/bprocessor/model Modified Files: SpaceAnalysis.java Log Message: Fixed bug in space-analysis Index: SpaceAnalysis.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SpaceAnalysis.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SpaceAnalysis.java 25 Jan 2008 13:40:10 -0000 1.11 --- SpaceAnalysis.java 31 Jan 2008 14:32:12 -0000 1.12 *************** *** 143,170 **** } if (side < 0) { if (angle > maximum) { maximum = angle; selected = current; - Surface exterior = selected.getExterior(); - if (exterior != null) { - if (angle < Math.PI) { - angle = angle + Math.PI; - selected = null; - maximum = angle; - } - } } } else { if (angle < minimum) { minimum = angle; selected = current; - Surface exterior = selected.getExterior(); - if (exterior != null) { - if (angle > Math.PI) { - angle = angle - Math.PI; - selected = null; - minimum = angle; - } - } } } --- 143,168 ---- } if (side < 0) { + Surface exterior = current.getExterior(); + if (exterior != null) { + if (angle < Math.PI) { + angle = angle + Math.PI; + current = null; + } + } if (angle > maximum) { maximum = angle; selected = current; } } else { + Surface exterior = current.getExterior(); + if (exterior != null) { + if (angle > Math.PI) { + angle = angle - Math.PI; + current = null; + } + } if (angle < minimum) { minimum = angle; selected = current; } } |
