bprocessor-commit Mailing List for B-processor (Page 16)
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...> - 2009-08-28 12:58:54
|
Update of /cvsroot/bprocessor/bprocessor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11706 Modified Files: .classpath Added Files: b-processor-export.mtl house.obj b-processor-export.obj house.mtl Log Message: --- NEW FILE: house.obj --- mtllib house.mtl v 9.05 0.08 -4.0 v 2.05 2.02 -8.55 v 2.05 0.07 -8.5 v 7.8479541854 1.01 -3.0428069991 v 9.5609064357 0.99 -6.1809875279 v 1.1916904618 1.05 -10.3418376786 v 0.675 0.07 -9.8 v 8.95 0.07 -3.45 v 6.95 2.07 -7.65 v 7.6 0.07 -9.8 v 6.95 0.07 -7.65 v 0.725 2.02 -9.8 v 9.5899999932 0.99 -4.5799999686 v 6.528664882 0.99 -7.4161879658 v 1.95 2.02 -9.25 v 8.95 0.07 -6.05 v 1.425 0.08 -10.0 v 7.05 2.02 -6.2 [...1865 lines suppressed...] f 614 367 500 f 614 303 367 f 343 420 303 f 420 378 303 f 303 378 367 f 378 238 367 f 343 614 193 f 343 303 614 f 238 263 500 f 238 500 367 f 193 470 420 f 193 420 343 f 420 470 580 f 420 580 378 f 263 378 580 f 193 614 470 f 263 238 378 f 614 500 580 f 470 614 580 f 580 500 263 --- NEW FILE: b-processor-export.mtl --- newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Floor Ka 0.2 0.2 0.2 Kd 0.84705883 0.827451 0.8039216 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Wall Ka 0.2 0.2 0.2 Kd 0.8235294 0.60784316 0.1254902 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Frame Ka 0.2 0.2 0.2 Kd 0.46666667 0.101960786 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl DoorA Ka 0.2 0.2 0.2 Kd 0.7058824 0.25490198 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Paint Ka 0.2 0.2 0.2 Kd 0.84705883 0.827451 0.8039216 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Glass Ka 0.2 0.2 0.2 Kd 0.8 0.8 0.8 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Metal Ka 0.2 0.2 0.2 Kd 0.8 0.8 0.8 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 --- NEW FILE: house.mtl --- newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark Ka 0.2 0.2 0.2 Kd 0.12156863 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark brown Ka 0.2 0.2 0.2 Kd 0.46666667 0.101960786 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Black Ka 0.2 0.2 0.2 Kd 0.0 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Light Brown Ka 0.2 0.2 0.2 Kd 0.7058824 0.25490198 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl White Ka 0.2 0.2 0.2 Kd 0.84705883 0.827451 0.8039216 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Yellow Ka 0.2 0.2 0.2 Kd 0.8235294 0.60784316 0.1254902 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark Ka 0.2 0.2 0.2 Kd 0.12156863 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark brown Ka 0.2 0.2 0.2 Kd 0.46666667 0.101960786 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Black Ka 0.2 0.2 0.2 Kd 0.0 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Light Brown Ka 0.2 0.2 0.2 Kd 0.7058824 0.25490198 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl White Ka 0.2 0.2 0.2 Kd 0.84705883 0.827451 0.8039216 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Yellow Ka 0.2 0.2 0.2 Kd 0.8235294 0.60784316 0.1254902 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Glass Ka 0.2 0.2 0.2 Kd 0.8 0.8 0.8 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Metal Ka 0.2 0.2 0.2 Kd 0.8 0.8 0.8 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 --- NEW FILE: b-processor-export.obj --- mtllib b-processor-export.mtl v 2.5561879594 1.01 -8.8186648744 v 7.6 0.07 -10.0 v 9.04 0.08 -6.0 v 7.05 0.0 -0.2 v 6.95 0.07 -6.25 v 8.3075735931 2.02 -3.5024264069 v 8.95 2.07 -5.25 v 1.1916904618 1.92 -10.3418376786 v 2.4571930085 0.99 -8.8893755504 v 9.6937336888 1.01 -6.0716398219 v 6.96 2.02 -5.5 v 1.219974729 2.02 -10.4549747646 v 8.95 2.8 -8.05 v 6.641801965 0.99 -5.9596194192 v 9.05 0.07 -0.2 v 7.05 0.07 -6.25 v 12.0 0.0 -10.0 v 7.05 0.07 -7.95 [...1865 lines suppressed...] f 304 370 472 f 304 472 607 f 220 304 211 f 304 607 211 f 211 607 83 f 607 187 83 f 587 518 370 f 370 518 472 f 518 525 472 f 472 525 305 f 587 370 304 f 587 304 220 f 518 83 525 f 518 211 83 f 187 305 525 f 305 607 472 f 187 525 83 f 220 518 587 f 305 187 607 f 220 211 518 Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .classpath 25 May 2009 12:00:49 -0000 1.4 --- .classpath 28 Aug 2009 12:58:43 -0000 1.5 *************** *** 2,6 **** <classpath> <classpathentry excluding="etc/" kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/> <classpathentry kind="lib" path="/gl/src/gfx"/> <classpathentry kind="lib" path="/gui/src/gfx"/> --- 2,5 ---- |
|
From: Michael L. <he...@us...> - 2009-08-28 12:58:52
|
Update of /cvsroot/bprocessor/bprocessor/components/basic In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11706/components/basic Modified Files: house.bp Added Files: door.bp Log Message: Index: house.bp =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/components/basic/house.bp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** house.bp 30 Jun 2009 11:34:42 -0000 1.1 --- house.bp 28 Aug 2009 12:58:42 -0000 1.2 *************** *** 1,330 **** <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> ! <active>3</active> ! <cs>725</cs> <name>New Project</name> ! <space net="false" voidref="2" type="1" union="false" transparent="true" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> ! <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="725" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ! <vertex z="0.0" y="0.0" x="0.0" id="726"/> [...15888 lines suppressed...] - <vertex z="0.0" y="0.1000000015" x="0.9000000134" progid="34" id="897"/> - <vertex z="0.04" y="0.1000000015" x="1.2000000179" progid="35" id="898"/> - <vertex z="0.04" y="0.400000006" x="1.6000000238" progid="36" id="899"/> - <vertex z="0.04" y="0.3000000045" x="0.7000000104" progid="37" id="900"/> - <vertex z="0.0" y="0.0" x="0.0" progid="38" id="901"/> - <vertex z="0.04" y="0.1000000015" x="0.1000000015" progid="39" id="902"/> - <vertex z="0.0" y="0.1000000015" x="1.3000000194" progid="40" id="903"/> - <vertex z="0.0" y="0.3000000045" x="1.5000000224" progid="41" id="904"/> - <vertex z="0.0" y="0.3000000045" x="0.6000000089" progid="42" id="905"/> - <vertex z="0.0" y="0.0" x="1.6000000238" progid="43" id="906"/> - <vertex z="0.0" y="0.3000000045" x="1.2000000179" progid="44" id="907"/> - <vertex z="0.04" y="0.3000000045" x="0.9000000134" progid="45" id="908"/> - <vertex z="0.0" y="0.1000000015" x="1.0000000149" progid="46" id="909"/> - <vertex z="0.04" y="0.1000000015" x="0.400000006" progid="47" id="910"/> - <vertex z="0.0" y="0.3000000045" x="0.9000000134" progid="48" id="911"/> - </space> - </catalogObjects> </bmodel> --- 11447,11450 ---- --- NEW FILE: door.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>6</cs> <name>New Project</name> <space transparent="true" voidref="2" name="World" type="1" union="false" net="false" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" active="true" editable="true" progid="1" id="6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" y="0.0" x="0.0" id="7"/> <ijn> <vertex z="0.0" y="0.0" x="1.0" id="3"/> <vertex z="0.0" y="1.0" x="0.0" id="4"/> <vertex z="1.0" y="0.0" x="0.0" id="5"/> </ijn> </constructor> <constructor xsi:type="GridType" size="40.0" distance="1.0" active="false" editable="true" progid="2" id="8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" y="0.0" x="0.0" id="9"/> </constructor> [...3293 lines suppressed...] <from>669</from> <to>673</to> </edge> <edge smooth="false" constructor="false" progid="12" id="667"> <from>670</from> <to>675</to> </edge> <vertex z="-0.01" y="0.01" x="0.05" progid="1" id="668"/> <vertex z="-0.01" y="1.95" x="0.05" progid="2" id="669"/> <vertex z="-0.01" y="0.01" x="0.75" progid="3" id="670"/> <vertex z="-0.01" y="1.95" x="0.75" progid="4" id="671"/> <vertex z="-0.07" y="1.95" x="0.75" progid="5" id="672"/> <vertex z="-0.07" y="1.95" x="0.05" progid="6" id="673"/> <vertex z="-0.07" y="0.01" x="0.05" progid="7" id="674"/> <vertex z="-0.07" y="0.01" x="0.75" progid="8" id="675"/> </space> </space> </catalogObjects> </bmodel> |
|
From: Michael L. <he...@us...> - 2009-06-30 11:53:31
|
Update of /cvsroot/bprocessor/bprocessor/components/basic In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28680/components/basic Added Files: house.bp Log Message: House under construction Swapping z and y axis in obj export --- NEW FILE: house.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>3</active> <cs>725</cs> <name>New Project</name> <space net="false" voidref="2" type="1" union="false" transparent="true" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="725" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" y="0.0" x="0.0" id="726"/> <ijn> <vertex z="0.0" y="0.0" x="1.0" id="722"/> <vertex z="0.0" y="1.0" x="0.0" id="723"/> <vertex z="1.0" y="0.0" x="0.0" id="724"/> </ijn> </constructor> <constructor xsi:type="GridType" size="40.0" distance="1.0" editable="true" active="false" progid="2" id="727" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" y="0.0" x="0.0" id="728"/> </constructor> [...4624 lines suppressed...] <vertex z="0.0" y="0.1000000015" x="1.2000000179" progid="33" id="896"/> <vertex z="0.0" y="0.1000000015" x="0.9000000134" progid="34" id="897"/> <vertex z="0.04" y="0.1000000015" x="1.2000000179" progid="35" id="898"/> <vertex z="0.04" y="0.400000006" x="1.6000000238" progid="36" id="899"/> <vertex z="0.04" y="0.3000000045" x="0.7000000104" progid="37" id="900"/> <vertex z="0.0" y="0.0" x="0.0" progid="38" id="901"/> <vertex z="0.04" y="0.1000000015" x="0.1000000015" progid="39" id="902"/> <vertex z="0.0" y="0.1000000015" x="1.3000000194" progid="40" id="903"/> <vertex z="0.0" y="0.3000000045" x="1.5000000224" progid="41" id="904"/> <vertex z="0.0" y="0.3000000045" x="0.6000000089" progid="42" id="905"/> <vertex z="0.0" y="0.0" x="1.6000000238" progid="43" id="906"/> <vertex z="0.0" y="0.3000000045" x="1.2000000179" progid="44" id="907"/> <vertex z="0.04" y="0.3000000045" x="0.9000000134" progid="45" id="908"/> <vertex z="0.0" y="0.1000000015" x="1.0000000149" progid="46" id="909"/> <vertex z="0.04" y="0.1000000015" x="0.400000006" progid="47" id="910"/> <vertex z="0.0" y="0.3000000045" x="0.9000000134" progid="48" id="911"/> </space> </catalogObjects> </bmodel> |
|
From: Michael L. <he...@us...> - 2009-06-30 11:35:13
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28698/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: House under construction Swapping z and y axis in obj export Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.242 retrieving revision 1.243 diff -C2 -d -r1.242 -r1.243 *** Space.java 29 Jun 2009 08:37:37 -0000 1.242 --- Space.java 30 Jun 2009 11:34:45 -0000 1.243 *************** *** 70,74 **** vmap.put(current, count++); out.println("v " + current.getX() + ! " " + current.getY() + " " + current.getZ()); } for (Space container : containers) { --- 70,74 ---- vmap.put(current, count++); out.println("v " + current.getX() + ! " " + current.getZ() + " " + (-current.getY())); } for (Space container : containers) { |
|
From: Michael L. <he...@us...> - 2009-06-29 10:57:51
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv679/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: Names Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** PopupMenu.java 29 Jun 2009 08:37:43 -0000 1.35 --- PopupMenu.java 29 Jun 2009 10:57:48 -0000 1.36 *************** *** 637,641 **** HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Space union = Space.createUnion("Union"); for (Vertex current : copy.vertices()) { union.add(current); --- 637,641 ---- HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Space union = Space.createUnion(""); for (Vertex current : copy.vertices()) { union.add(current); |
|
From: Michael L. <he...@us...> - 2009-06-29 10:57:49
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv666/src/net/sourceforge/bprocessor/model Modified Files: Item.java Log Message: Names Index: Item.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Item.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Item.java 25 Jun 2009 22:17:30 -0000 1.1 --- Item.java 29 Jun 2009 10:57:45 -0000 1.2 *************** *** 660,684 **** String res; int lvl = getLevel(); switch (lvl) { case ELEMENT_LEVEL: ! res = "Elm"; break; case PART_LEVEL: ! res = "Prt"; break; case SPACE_LEVEL: ! res = "Spc"; break; case PROJECT_LEVEL: ! res = "Proj"; break; default: ! res = "Unk"; break; } if (isUnion()) { ! return res + " Union " + id; } else { ! return res + id; } } --- 660,687 ---- String res; int lvl = getLevel(); + if (isUnion()) { + lvl++; + } switch (lvl) { case ELEMENT_LEVEL: ! res = "Element"; break; case PART_LEVEL: ! res = "Part"; break; case SPACE_LEVEL: ! res = "Space"; break; case PROJECT_LEVEL: ! res = "Project"; break; default: ! res = "Object"; break; } if (isUnion()) { ! return res + " Union #" + id; } else { ! return res + " #" + id; } } |
|
From: Michael L. <he...@us...> - 2009-06-29 09:42:31
|
Update of /cvsroot/bprocessor/bprocessor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21915 Removed Files: appartment.mtl b-processor-export.mtl simple.mtl Log Message: --- b-processor-export.mtl DELETED --- --- simple.mtl DELETED --- --- appartment.mtl DELETED --- |
|
From: Michael L. <he...@us...> - 2009-06-29 09:42:30
|
Update of /cvsroot/bprocessor/build In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21898 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** build.xml 29 Jun 2009 09:35:35 -0000 1.34 --- build.xml 29 Jun 2009 09:42:26 -0000 1.35 *************** *** 56,59 **** --- 56,60 ---- <include name="components/*.bpl"/> <include name="components/obj/**/*.obj"/> + <include name="components/obj/**/*.mtl"/> <include name="components/basic/*.bp"/> </fileset> |
|
From: Michael L. <he...@us...> - 2009-06-29 09:41:39
|
Update of /cvsroot/bprocessor/bprocessor/components/obj/kirkland In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21700/components/obj/kirkland Added Files: toilet.obj Log Message: --- NEW FILE: toilet.obj --- # Alias OBJ Model File # Exported from SketchUp, (c) 2000-2006 Google, Inc. # File units = inches mtllib toilet.mtl g Mesh1 Lid1 Toilet2 Toilet1 Model usemtl FrontColor v 16.6635 35.8378 -1.5972 vt -18.2144 1.70383e-15 vn -0.991445 6.0797e-17 -0.130526 v 16.655 35.8378 -1.46667 vt -18.0836 1.70383e-15 vn -0.999777 6.13079e-17 0.021133 v 16.655 36.5878 -1.46667 vt -18.0836 0.75 v 16.6635 36.5878 -1.5972 vt -18.2144 0.75 [...22246 lines suppressed...] vt -14.446 3.55271e-15 vn -0.640039 0 -0.768342 vt -13.1657 3.55271e-15 vt -13.1657 0.5 vt -14.446 0.5 f 2161/9452/3322 2163/9453/3321 2049/9454/3321 2047/9455/3322 vt -14.5877 3.55271e-15 vn -0.67572 6.15636e-18 -0.737158 vt -14.229 3.55271e-15 vt -14.229 0.5 vt -14.5877 0.5 f 2160/9456/3323 2161/9457/3322 2047/9458/3322 2043/9459/3323 vt -14.2958 1.89758e-15 vt -13.9349 3.67393e-15 vt -13.9349 0.5 vt -14.2958 0.5 f 2158/9460/3080 2160/9461/3323 2043/9462/3323 2042/9463/3080 |
|
From: Michael L. <he...@us...> - 2009-06-29 09:41:39
|
Update of /cvsroot/bprocessor/bprocessor/components/obj/kohler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21700/components/obj/kohler Added Files: 4886.obj 1721.obj 895.obj Log Message: --- NEW FILE: 895.obj --- # Alias OBJ Model File # Exported from SketchUp, (c) 2000-2006 Google, Inc. # File units = inches mtllib 895.mtl g Mesh1 object__1 Group Model usemtl FrontColor v -0.797769 -1.36419 2.21175 vt 15.2039 15.8434 vn 0.0320421 0.125119 0.991624 v -31.1861 -1.47941 2.22453 vt -15.1844 15.7275 vn -0.00741271 0.100948 0.994864 v -0.817412 -1.47962 2.22456 vt 15.1843 15.7273 vn 0.0124535 0.0965688 0.995248 f 1/1/1 2/2/2 3/3/3 [...77427 lines suppressed...] vt 3.64634 15.9365 vn -0.00954756 -0.142109 -0.989805 f 5472/33422/16073 5473/33423/16074 5592/33424/16075 vt 3.6383 15.4629 vt -3.82437 15.6013 vt -3.7017 15.429 vn 0.0123131 -0.172617 -0.984912 f 5592/33425/16075 5473/33426/15711 5474/33427/16076 vt 3.77143 13.7783 vt 3.64478 13.8987 vt -3.69522 13.8644 f 5475/33428/15716 5592/33429/16075 5474/33430/15713 vt -11.1359 -3.58962 vt -11.1803 -3.62808 vt -11.1365 -3.67332 f 5429/33431/15583 5430/33432/15586 5428/33433/15580 --- NEW FILE: 1721.obj --- # Alias OBJ Model File # Exported from SketchUp, (c) 2000-2006 Google, Inc. # File units = inches mtllib 1721.mtl g Mesh1 G_1729_GEN_PC Model usemtl FrontColor v -10.8949 0.974638 -3.30584 vt -0.57 -3.2555 vn -0.999734 0.0229749 -0.00224165 v -10.8949 0.163857 -3.30584 vt -1.38078 -3.2555 vn -0.99971 -0.0223622 -0.00889026 v -10.8948 0.163842 -0.0564225 vt -1.38078 -6.50492 vn -0.980387 -0.0085739 0.196897 f 1/1/1 2/2/2 3/3/3 [...31952 lines suppressed...] vt -2.26942 7.68337 vn -0.777697 0.625979 -0.0577739 vt -6.51787 7.68796 f 29/13765/6720 23/13766/6721 24/13767/47 vt -1.45907 5.40176 vt -0.290797 7.80798 vt -0.46637 9.90185 f 38/13768/72 35/13769/67 26/13770/115 vt -0.436045 9.7186 vt -0.632587 9.88791 vt -0.457071 7.79404 f 27/13771/64 26/13772/115 35/13773/67 vt -5.61986 8.59294 vt -5.50443 8.51781 vt -5.51862 8.63967 f 27/13774/64 30/13775/59 28/13776/60 --- NEW FILE: 4886.obj --- # Alias OBJ Model File # Exported from SketchUp, (c) 2000-2006 Google, Inc. # File units = inches mtllib 4886.mtl g Mesh1 F4886 Model usemtl FrontColor v -3.68184 15.2373 2.42246 vt 4.39449 29.669 vn -0.76088 -0.604089 -0.236935 v -3.62058 15.1822 -0.660123 vt 1.31175 29.5929 vn -0.769052 -0.635538 0.068188 v -3.6075 15.1824 2.38095 vt 4.35281 29.5766 vn -0.366658 -0.861982 -0.35007 f 1/1/1 2/2/2 3/3/3 [...36530 lines suppressed...] f 2632/15835/7509 2635/15836/7509 2636/15837/7509 vt 15.3214 24.8952 vn 0.130267 0.0523563 0.990096 vt 14.6985 25.1104 vt 15.2154 19.3236 f 2635/15838/7510 2632/15839/7510 1002/15840/7510 vt -0.772058 24.8969 vn 0.0285121 -0.999593 -6.52596e-07 vt -0.803327 24.6619 vt 0.772036 24.8969 f 2636/15841/7511 2635/15842/7511 2633/15843/7511 vt -0.772577 16.1688 vt 0.741913 15.5547 vt 0.771516 16.1688 vn 0.999391 0.0349007 -1.21295e-06 f 2633/15844/7502 2632/15845/7502 2636/15846/7512 |
|
From: Michael L. <he...@us...> - 2009-06-29 09:35:38
|
Update of /cvsroot/bprocessor/build In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20825 Modified Files: build.xml Log Message: perpos file Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** build.xml 29 Jun 2009 09:27:26 -0000 1.33 --- build.xml 29 Jun 2009 09:35:35 -0000 1.34 *************** *** 124,127 **** --- 124,130 ---- <fileset dir="${tools.dir}/postgresql"/> </copy> + <copy todir="${release.dir}/library"> + <fileset dir="${tools.dir}/perpos"/> + </copy> <copy todir="${release.dir}/plugin"> <fileset dir="${gl.dir}/dist"> |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:33
|
Update of /cvsroot/bprocessor/bprocessor/components/basic In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19403/components/basic Added Files: colors.bp Log Message: Some components --- NEW FILE: colors.bp --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <bmodel> <active>1</active> <cs>6</cs> <name>New Project</name> <space type="1" union="false" net="false" transparent="true" voidref="2" name="World" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" y="0.0" x="0.0" id="7"/> <ijn> <vertex z="0.0" y="0.0" x="1.0" id="3"/> <vertex z="0.0" y="1.0" x="0.0" id="4"/> <vertex z="1.0" y="0.0" x="0.0" id="5"/> </ijn> </constructor> <constructor xsi:type="GridType" distance="0.1" size="40.0" editable="true" active="false" progid="2" id="8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <vertex z="0.0" y="0.0" x="0.0" id="9"/> </constructor> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="2"> <description/> <Classification>unassigned</Classification> </space> </space> <material G="0.9" name="Functional" R="0.9" B="0.9" id="10"/> <material G="0.87" name="Construction" R="0.96" B="0.7" id="11"/> <material G="0.8142857" name="Void" R="0.91071427" B="0.8035714" id="12"/> <material G="0.0" name="Dark" R="0.12156863" B="0.0" id="13"/> <material G="0.101960786" name="Dark brown" R="0.46666667" B="0.0" id="14"/> <material G="0.0" name="Black" R="0.0" B="0.0" id="15"/> <material G="0.25490198" name="Light Brown" R="0.7058824" B="0.0" id="16"/> <material G="0.827451" name="White" R="0.84705883" B="0.8039216" id="17"/> <material G="0.60784316" name="Yellow" R="0.8235294" B="0.1254902" id="18"/> <view name="(Current)" id="190"> <scalefactor>21</scalefactor> <camera z="1.8155340541262965" y="-0.9472045581726889" x="1.9399458041063138"/> <center z="-0.011454667589679002" y="0.6188304328338226" x="0.9989770499913039"/> <roll z="0.7071067811865508" y="0.6061088109378358" x="-0.36418691533816844"/> <focalwidth>35.0</focalwidth> <type>6</type> <hidden>22</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> <catalogObjects locked="false" useableLevels="0" version="n/a" name="Color palette" author="n/a" progid="1" id="19"> <space type="0" union="true" net="false" transparent="false" voidref="21" name="Color palette" id="20"> <description/> <Classification>unassigned</Classification> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="21"> <description/> <Classification>unassigned</Classification> <boundary>36</boundary> <boundary>37</boundary> <boundary>38</boundary> <boundary>40</boundary> <boundary>41</boundary> <boundary>42</boundary> <boundary>44</boundary> <boundary>45</boundary> <boundary>51</boundary> <boundary>55</boundary> <boundary>56</boundary> <boundary>58</boundary> <boundary>60</boundary> <boundary>62</boundary> <boundary>64</boundary> <boundary>69</boundary> </space> <space type="0" union="false" insideMaterial="15" net="false" transparent="false" voidref="23" name="Black" progid="2" id="22"> <description>Color palette </description> <Classification>unassigned</Classification> <boundary>34</boundary> <boundary>35</boundary> <boundary>39</boundary> <boundary>40</boundary> <boundary>42</boundary> <boundary>43</boundary> <boundary>44</boundary> <boundary>46</boundary> <boundary>47</boundary> <boundary>48</boundary> <boundary>49</boundary> <boundary>50</boundary> <boundary>52</boundary> <boundary>53</boundary> <boundary>54</boundary> <boundary>57</boundary> <boundary>58</boundary> <boundary>59</boundary> <boundary>60</boundary> <boundary>61</boundary> <boundary>63</boundary> <boundary>64</boundary> <boundary>65</boundary> <boundary>66</boundary> <boundary>67</boundary> <boundary>68</boundary> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="23"> <description/> <Classification>unassigned</Classification> </space> </space> <space type="0" union="false" insideMaterial="16" net="false" transparent="false" voidref="25" name="Light Brown" progid="3" id="24"> <description>Light brown </description> <Classification>unassigned</Classification> <boundary>36</boundary> <boundary>43</boundary> <boundary>45</boundary> <boundary>53</boundary> <boundary>63</boundary> <boundary>67</boundary> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="25"> <description/> <Classification>unassigned</Classification> </space> </space> <space type="0" union="false" insideMaterial="17" net="false" transparent="false" voidref="27" name="White" progid="4" id="26"> <description>White </description> <Classification>unassigned</Classification> <boundary>35</boundary> <boundary>41</boundary> <boundary>46</boundary> <boundary>48</boundary> <boundary>55</boundary> <boundary>68</boundary> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="27"> <description/> <Classification>unassigned</Classification> </space> </space> <space type="0" union="false" insideMaterial="18" net="false" transparent="false" voidref="29" name="Yellow" progid="5" id="28"> <description>Yellow </description> <Classification>unassigned</Classification> <boundary>47</boundary> <boundary>49</boundary> <boundary>51</boundary> <boundary>52</boundary> <boundary>59</boundary> <boundary>69</boundary> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="29"> <description/> <Classification>unassigned</Classification> </space> </space> <space type="0" union="false" insideMaterial="13" net="false" transparent="false" voidref="31" name="Dark" progid="6" id="30"> <description>Dark </description> <Classification>unassigned</Classification> <boundary>38</boundary> <boundary>39</boundary> <boundary>54</boundary> <boundary>61</boundary> <boundary>62</boundary> <boundary>65</boundary> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="31"> <description/> <Classification>unassigned</Classification> </space> </space> <space type="0" union="false" insideMaterial="14" net="false" transparent="false" voidref="33" name="Dark Brown" progid="7" id="32"> <description>Dark brown </description> <Classification>unassigned</Classification> <boundary>34</boundary> <boundary>37</boundary> <boundary>50</boundary> <boundary>56</boundary> <boundary>57</boundary> <boundary>66</boundary> <space type="1" union="false" net="false" transparent="true" name="Void" progid="1" id="33"> <description/> <Classification>unassigned</Classification> </space> </space> <surface progid="1" id="34"> <edgeref>71</edgeref> <edgeref>112</edgeref> <edgeref>80</edgeref> <edgeref>128</edgeref> <back>32</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="2" id="35"> <edgeref>74</edgeref> <edgeref>116</edgeref> <edgeref>89</edgeref> <edgeref>86</edgeref> <back>22</back> <front>26</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="3" id="36"> <edgeref>82</edgeref> <edgeref>124</edgeref> <edgeref>113</edgeref> <edgeref>93</edgeref> <back>24</back> <front>21</front> <exterior>40</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="4" id="37"> <edgeref>71</edgeref> <edgeref>132</edgeref> <edgeref>95</edgeref> <edgeref>75</edgeref> <back>21</back> <front>32</front> <exterior>44</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="5" id="38"> <edgeref>81</edgeref> <edgeref>119</edgeref> <edgeref>104</edgeref> <edgeref>98</edgeref> <back>21</back> <front>30</front> <exterior>44</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="6" id="39"> <edgeref>72</edgeref> <edgeref>119</edgeref> <edgeref>137</edgeref> <edgeref>77</edgeref> <back>22</back> <front>30</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="7" id="40"> <edgeref>79</edgeref> <edgeref>136</edgeref> <edgeref>126</edgeref> <edgeref>84</edgeref> <hole>36</hole> <hole>51</hole> <hole>55</hole> <hole>56</hole> <hole>62</hole> <back>22</back> <front>21</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="8" id="41"> <edgeref>97</edgeref> <edgeref>129</edgeref> <edgeref>123</edgeref> <edgeref>116</edgeref> <back>21</back> <front>26</front> <exterior>44</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="9" id="42"> <edgeref>73</edgeref> <edgeref>139</edgeref> <edgeref>105</edgeref> <edgeref>126</edgeref> <back>22</back> <front>21</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="10" id="43"> <edgeref>82</edgeref> <edgeref>135</edgeref> <edgeref>100</edgeref> <edgeref>108</edgeref> <back>22</back> <front>24</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="11" id="44"> <edgeref>92</edgeref> <edgeref>115</edgeref> <edgeref>139</edgeref> <edgeref>114</edgeref> <hole>37</hole> <hole>38</hole> <hole>41</hole> <hole>45</hole> <hole>69</hole> <back>21</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="12" id="45"> <edgeref>101</edgeref> <edgeref>100</edgeref> <edgeref>122</edgeref> <edgeref>117</edgeref> <back>21</back> <front>24</front> <exterior>44</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="13" id="46"> <edgeref>89</edgeref> <edgeref>123</edgeref> <edgeref>131</edgeref> <edgeref>106</edgeref> <back>22</back> <front>26</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="14" id="47"> <edgeref>83</edgeref> <edgeref>91</edgeref> <edgeref>96</edgeref> <edgeref>109</edgeref> <back>28</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="15" id="48"> <edgeref>74</edgeref> <edgeref>97</edgeref> <edgeref>118</edgeref> <edgeref>127</edgeref> <back>26</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="16" id="49"> <edgeref>70</edgeref> <edgeref>111</edgeref> <edgeref>125</edgeref> <edgeref>110</edgeref> <back>28</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="17" id="50"> <edgeref>88</edgeref> <edgeref>103</edgeref> <edgeref>95</edgeref> <edgeref>141</edgeref> <back>22</back> <front>32</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="18" id="51"> <edgeref>96</edgeref> <edgeref>134</edgeref> <edgeref>110</edgeref> <edgeref>107</edgeref> <back>28</back> <front>21</front> <exterior>40</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="19" id="52"> <edgeref>70</edgeref> <edgeref>85</edgeref> <edgeref>91</edgeref> <edgeref>134</edgeref> <back>22</back> <front>28</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="20" id="53"> <edgeref>102</edgeref> <edgeref>117</edgeref> <edgeref>133</edgeref> <edgeref>113</edgeref> <back>22</back> <front>24</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="21" id="54"> <edgeref>94</edgeref> <edgeref>98</edgeref> <edgeref>130</edgeref> <edgeref>99</edgeref> <back>30</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="22" id="55"> <edgeref>76</edgeref> <edgeref>106</edgeref> <edgeref>86</edgeref> <edgeref>127</edgeref> <back>26</back> <front>21</front> <exterior>40</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="23" id="56"> <edgeref>80</edgeref> <edgeref>90</edgeref> <edgeref>88</edgeref> <edgeref>138</edgeref> <back>32</back> <front>21</front> <exterior>40</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="24" id="57"> <edgeref>90</edgeref> <edgeref>141</edgeref> <edgeref>132</edgeref> <edgeref>112</edgeref> <back>22</back> <front>32</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="25" id="58"> <edgeref>78</edgeref> <edgeref>114</edgeref> <edgeref>105</edgeref> <edgeref>84</edgeref> <back>21</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="26" id="59"> <edgeref>107</edgeref> <edgeref>109</edgeref> <edgeref>120</edgeref> <edgeref>125</edgeref> <back>22</back> <front>28</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="27" id="60"> <edgeref>78</edgeref> <edgeref>92</edgeref> <edgeref>121</edgeref> <edgeref>79</edgeref> <back>22</back> <front>21</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="28" id="61"> <edgeref>81</edgeref> <edgeref>137</edgeref> <edgeref>140</edgeref> <edgeref>130</edgeref> <back>30</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="29" id="62"> <edgeref>87</edgeref> <edgeref>99</edgeref> <edgeref>140</edgeref> <edgeref>77</edgeref> <back>30</back> <front>21</front> <exterior>40</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="30" id="63"> <edgeref>122</edgeref> <edgeref>133</edgeref> <edgeref>124</edgeref> <edgeref>135</edgeref> <back>24</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="31" id="64"> <edgeref>73</edgeref> <edgeref>115</edgeref> <edgeref>121</edgeref> <edgeref>136</edgeref> <back>21</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="32" id="65"> <edgeref>72</edgeref> <edgeref>104</edgeref> <edgeref>94</edgeref> <edgeref>87</edgeref> <back>30</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="33" id="66"> <edgeref>75</edgeref> <edgeref>128</edgeref> <edgeref>138</edgeref> <edgeref>103</edgeref> <back>32</back> <front>22</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="34" id="67"> <edgeref>93</edgeref> <edgeref>108</edgeref> <edgeref>101</edgeref> <edgeref>102</edgeref> <back>22</back> <front>24</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="35" id="68"> <edgeref>76</edgeref> <edgeref>131</edgeref> <edgeref>129</edgeref> <edgeref>118</edgeref> <back>22</back> <front>26</front> <exterior>0</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <surface progid="36" id="69"> <edgeref>83</edgeref> <edgeref>85</edgeref> <edgeref>111</edgeref> <edgeref>120</edgeref> <back>21</back> <front>28</front> <exterior>44</exterior> <frontMaterial>0</frontMaterial> <backMaterial>0</backMaterial> </surface> <edge constructor="false" smooth="false" progid="1" id="70"> <from>145</from> <to>154</to> </edge> <edge constructor="false" smooth="false" progid="2" id="71"> <from>162</from> <to>169</to> </edge> <edge constructor="false" smooth="false" progid="3" id="72"> <from>148</from> <to>146</to> </edge> <edge constructor="false" smooth="false" progid="4" id="73"> <from>152</from> <to>160</to> </edge> <edge constructor="false" smooth="false" progid="5" id="74"> <from>174</from> <to>176</to> </edge> <edge constructor="false" smooth="false" progid="6" id="75"> <from>164</from> <to>162</to> </edge> <edge constructor="false" smooth="false" progid="7" id="76"> <from>187</from> <to>170</to> </edge> <edge constructor="false" smooth="false" progid="8" id="77"> <from>148</from> <to>171</to> </edge> <edge constructor="false" smooth="false" progid="9" id="78"> <from>184</from> <to>143</to> </edge> <edge constructor="false" smooth="false" progid="10" id="79"> <from>184</from> <to>179</to> </edge> <edge constructor="false" smooth="false" progid="11" id="80"> <from>183</from> <to>155</to> </edge> <edge constructor="false" smooth="false" progid="12" id="81"> <from>172</from> <to>142</to> </edge> <edge constructor="false" smooth="false" progid="13" id="82"> <from>149</from> <to>189</to> </edge> <edge constructor="false" smooth="false" progid="14" id="83"> <from>156</from> <to>168</to> </edge> <edge constructor="false" smooth="false" progid="15" id="84"> <from>157</from> <to>184</to> </edge> <edge constructor="false" smooth="false" progid="16" id="85"> <from>168</from> <to>154</to> </edge> <edge constructor="false" smooth="false" progid="17" id="86"> <from>185</from> <to>174</to> </edge> <edge constructor="false" smooth="false" progid="18" id="87"> <from>161</from> <to>148</to> </edge> <edge constructor="false" smooth="false" progid="19" id="88"> <from>150</from> <to>165</to> </edge> <edge constructor="false" smooth="false" progid="20" id="89"> <from>185</from> <to>167</to> </edge> <edge constructor="false" smooth="false" progid="21" id="90"> <from>155</from> <to>150</to> </edge> <edge constructor="false" smooth="false" progid="22" id="91"> <from>181</from> <to>168</to> </edge> <edge constructor="false" smooth="false" progid="23" id="92"> <from>143</from> <to>158</to> </edge> <edge constructor="false" smooth="false" progid="24" id="93"> <from>153</from> <to>149</to> </edge> <edge constructor="false" smooth="false" progid="25" id="94"> <from>161</from> <to>180</to> </edge> <edge constructor="false" smooth="false" progid="26" id="95"> <from>188</from> <to>164</to> </edge> <edge constructor="false" smooth="false" progid="27" id="96"> <from>144</from> <to>181</to> </edge> <edge constructor="false" smooth="false" progid="28" id="97"> <from>176</from> <to>151</to> </edge> <edge constructor="false" smooth="false" progid="29" id="98"> <from>180</from> <to>172</to> </edge> <edge constructor="false" smooth="false" progid="30" id="99"> <from>163</from> <to>161</to> </edge> <edge constructor="false" smooth="false" progid="31" id="100"> <from>178</from> <to>186</to> </edge> <edge constructor="false" smooth="false" progid="32" id="101"> <from>173</from> <to>178</to> </edge> <edge constructor="false" smooth="false" progid="33" id="102"> <from>153</from> <to>173</to> </edge> <edge constructor="false" smooth="false" progid="34" id="103"> <from>165</from> <to>164</to> </edge> <edge constructor="false" smooth="false" progid="35" id="104"> <from>146</from> <to>180</to> </edge> <edge constructor="false" smooth="false" progid="36" id="105"> <from>157</from> <to>177</to> </edge> <edge constructor="false" smooth="false" progid="37" id="106"> <from>170</from> <to>185</to> </edge> <edge constructor="false" smooth="false" progid="38" id="107"> <from>182</from> <to>144</to> </edge> <edge constructor="false" smooth="false" progid="39" id="108"> <from>149</from> <to>178</to> </edge> <edge constructor="false" smooth="false" progid="40" id="109"> <from>144</from> <to>156</to> </edge> <edge constructor="false" smooth="false" progid="41" id="110"> <from>145</from> <to>182</to> </edge> <edge constructor="false" smooth="false" progid="42" id="111"> <from>154</from> <to>166</to> </edge> <edge constructor="false" smooth="false" progid="43" id="112"> <from>155</from> <to>169</to> </edge> <edge constructor="false" smooth="false" progid="44" id="113"> <from>175</from> <to>153</to> </edge> <edge constructor="false" smooth="false" progid="45" id="114"> <from>177</from> <to>143</to> </edge> <edge constructor="false" smooth="false" progid="46" id="115"> <from>158</from> <to>160</to> </edge> <edge constructor="false" smooth="false" progid="47" id="116"> <from>167</from> <to>176</to> </edge> <edge constructor="false" smooth="false" progid="48" id="117"> <from>147</from> <to>173</to> </edge> <edge constructor="false" smooth="false" progid="49" id="118"> <from>187</from> <to>151</to> </edge> <edge constructor="false" smooth="false" progid="50" id="119"> <from>142</from> <to>146</to> </edge> <edge constructor="false" smooth="false" progid="51" id="120"> <from>166</from> <to>156</to> </edge> <edge constructor="false" smooth="false" progid="52" id="121"> <from>179</from> <to>158</to> </edge> <edge constructor="false" smooth="false" progid="53" id="122"> <from>186</from> <to>147</to> </edge> <edge constructor="false" smooth="false" progid="54" id="123"> <from>159</from> <to>167</to> </edge> <edge constructor="false" smooth="false" progid="55" id="124"> <from>189</from> <to>175</to> </edge> <edge constructor="false" smooth="false" progid="56" id="125"> <from>182</from> <to>166</to> </edge> <edge constructor="false" smooth="false" progid="57" id="126"> <from>152</from> <to>157</to> </edge> <edge constructor="false" smooth="false" progid="58" id="127"> <from>174</from> <to>187</to> </edge> <edge constructor="false" smooth="false" progid="59" id="128"> <from>183</from> <to>162</to> </edge> <edge constructor="false" smooth="false" progid="60" id="129"> <from>151</from> <to>159</to> </edge> <edge constructor="false" smooth="false" progid="61" id="130"> <from>163</from> <to>172</to> </edge> <edge constructor="false" smooth="false" progid="62" id="131"> <from>170</from> <to>159</to> </edge> <edge constructor="false" smooth="false" progid="63" id="132"> <from>169</from> <to>188</to> </edge> <edge constructor="false" smooth="false" progid="64" id="133"> <from>175</from> <to>147</to> </edge> <edge constructor="false" smooth="false" progid="65" id="134"> <from>181</from> <to>145</to> </edge> <edge constructor="false" smooth="false" progid="66" id="135"> <from>189</from> <to>186</to> </edge> <edge constructor="false" smooth="false" progid="67" id="136"> <from>179</from> <to>152</to> </edge> <edge constructor="false" smooth="false" progid="68" id="137"> <from>171</from> <to>142</to> </edge> <edge constructor="false" smooth="false" progid="69" id="138"> <from>165</from> <to>183</to> </edge> <edge constructor="false" smooth="false" progid="70" id="139"> <from>160</from> <to>177</to> </edge> <edge constructor="false" smooth="false" progid="71" id="140"> <from>171</from> <to>163</to> </edge> <edge constructor="false" smooth="false" progid="72" id="141"> <from>150</from> <to>188</to> </edge> <vertex z="0.04" y="0.3000000045" x="0.3000000045" progid="1" id="142"/> <vertex z="0.04" y="0.0" x="1.6000000238" progid="2" id="143"/> <vertex z="0.0" y="0.1000000015" x="1.5000000224" progid="3" id="144"/> <vertex z="0.0" y="0.3000000045" x="1.3000000194" progid="4" id="145"/> <vertex z="0.04" y="0.1000000015" x="0.3000000045" progid="5" id="146"/> <vertex z="0.04" y="0.1000000015" x="0.9000000134" progid="6" id="147"/> <vertex z="0.0" y="0.1000000015" x="0.3000000045" progid="7" id="148"/> <vertex z="0.0" y="0.3000000045" x="0.7000000104" progid="8" id="149"/> <vertex z="0.0" y="0.1000000015" x="0.400000006" progid="9" id="150"/> <vertex z="0.04" y="0.1000000015" x="1.0000000149" progid="10" id="151"/> <vertex z="0.0" y="0.4" x="0.0" progid="11" id="152"/> <vertex z="0.0" y="0.1000000015" x="0.7000000104" progid="12" id="153"/> <vertex z="0.04" y="0.3000000045" x="1.3000000194" progid="13" id="154"/> <vertex z="0.0" y="0.1000000015" x="0.6000000089" progid="14" id="155"/> <vertex z="0.04" y="0.1000000015" x="1.5000000224" progid="15" id="156"/> <vertex z="0.0" y="0.400000006" x="1.6000000238" progid="16" id="157"/> <vertex z="0.04" y="0.0" x="0.0" progid="17" id="158"/> <vertex z="0.04" y="0.3000000045" x="1.0000000149" progid="18" id="159"/> <vertex z="0.04" y="0.4" x="0.0" progid="19" id="160"/> <vertex z="0.0" y="0.1000000015" x="0.1000000015" progid="20" id="161"/> <vertex z="0.04" y="0.3000000045" x="0.6000000089" progid="21" id="162"/> <vertex z="0.0" y="0.3000000045" x="0.1000000015" progid="22" id="163"/> <vertex z="0.04" y="0.3000000045" x="0.400000006" progid="23" id="164"/> <vertex z="0.0" y="0.3000000045" x="0.400000006" progid="24" id="165"/> <vertex z="0.04" y="0.3000000045" x="1.5000000224" progid="25" id="166"/> <vertex z="0.04" y="0.3000000045" x="1.2000000179" progid="26" id="167"/> <vertex z="0.04" y="0.1000000015" x="1.3000000194" progid="27" id="168"/> <vertex z="0.04" y="0.1000000015" x="0.6000000089" progid="28" id="169"/> <vertex z="0.0" y="0.3000000045" x="1.0000000149" progid="29" id="170"/> <vertex z="0.0" y="0.3000000045" x="0.3000000045" progid="30" id="171"/> <vertex z="0.04" y="0.3000000045" x="0.1000000015" progid="31" id="172"/> <vertex z="0.04" y="0.1000000015" x="0.7000000104" progid="32" id="173"/> <vertex z="0.0" y="0.1000000015" x="1.2000000179" progid="33" id="174"/> <vertex z="0.0" y="0.1000000015" x="0.9000000134" progid="34" id="175"/> <vertex z="0.04" y="0.1000000015" x="1.2000000179" progid="35" id="176"/> <vertex z="0.04" y="0.400000006" x="1.6000000238" progid="36" id="177"/> <vertex z="0.04" y="0.3000000045" x="0.7000000104" progid="37" id="178"/> <vertex z="0.0" y="0.0" x="0.0" progid="38" id="179"/> <vertex z="0.04" y="0.1000000015" x="0.1000000015" progid="39" id="180"/> <vertex z="0.0" y="0.1000000015" x="1.3000000194" progid="40" id="181"/> <vertex z="0.0" y="0.3000000045" x="1.5000000224" progid="41" id="182"/> <vertex z="0.0" y="0.3000000045" x="0.6000000089" progid="42" id="183"/> <vertex z="0.0" y="0.0" x="1.6000000238" progid="43" id="184"/> <vertex z="0.0" y="0.3000000045" x="1.2000000179" progid="44" id="185"/> <vertex z="0.04" y="0.3000000045" x="0.9000000134" progid="45" id="186"/> <vertex z="0.0" y="0.1000000015" x="1.0000000149" progid="46" id="187"/> <vertex z="0.04" y="0.1000000015" x="0.400000006" progid="47" id="188"/> <vertex z="0.0" y="0.3000000045" x="0.9000000134" progid="48" id="189"/> </space> </catalogObjects> </bmodel> |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:32
|
Update of /cvsroot/bprocessor/bprocessor/components/obj/kirkland In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19403/components/obj/kirkland Added Files: toilet.mtl Log Message: Some components --- NEW FILE: toilet.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 1.000000 1.000000 1.000000 Ks 0.330000 0.330000 0.330000 newmtl Color_000 Ka 0.000000 0.000000 0.000000 Kd 1.000000 1.000000 1.000000 Ks 0.330000 0.330000 0.330000 |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:32
|
Update of /cvsroot/bprocessor/bprocessor/components/obj/kohler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19403/components/obj/kohler Added Files: 895.mtl 4886.mtl 1721.mtl Log Message: Some components --- NEW FILE: 1721.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 0.882353 0.882353 0.784314 Ks 0.330000 0.330000 0.330000 --- NEW FILE: 4886.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 0.882353 0.882353 0.784314 Ks 0.330000 0.330000 0.330000 --- NEW FILE: 895.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 0.882353 0.882353 0.784314 Ks 0.330000 0.330000 0.330000 |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:32
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/obj/kohler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19403/src/etc/obj/kohler Removed Files: 1721.mtl 4886.mtl 895.mtl Log Message: Some components --- 1721.mtl DELETED --- --- 4886.mtl DELETED --- --- 895.mtl DELETED --- |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:32
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/obj/kirkland In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19403/src/etc/obj/kirkland Removed Files: toilet.mtl Log Message: Some components --- toilet.mtl DELETED --- |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:31
|
Update of /cvsroot/bprocessor/build In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19387 Modified Files: build.xml Log Message: Some components Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** build.xml 23 Nov 2007 10:27:29 -0000 1.32 --- build.xml 29 Jun 2009 09:27:26 -0000 1.33 *************** *** 55,58 **** --- 55,60 ---- <include name="*.xml"/> <include name="components/*.bpl"/> + <include name="components/obj/**/*.obj"/> + <include name="components/basic/*.bp"/> </fileset> </copy> |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:27
|
Update of /cvsroot/bprocessor/bprocessor/components/obj/kirkland In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19336/components/obj/kirkland Log Message: Directory /cvsroot/bprocessor/bprocessor/components/obj/kirkland added to the repository |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:27
|
Update of /cvsroot/bprocessor/bprocessor/components/obj In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19336/components/obj Log Message: Directory /cvsroot/bprocessor/bprocessor/components/obj added to the repository |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:26
|
Update of /cvsroot/bprocessor/bprocessor/components/obj/kohler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19336/components/obj/kohler Log Message: Directory /cvsroot/bprocessor/bprocessor/components/obj/kohler added to the repository |
|
From: Michael L. <he...@us...> - 2009-06-29 09:27:26
|
Update of /cvsroot/bprocessor/bprocessor/components/basic In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19336/components/basic Log Message: Directory /cvsroot/bprocessor/bprocessor/components/basic added to the repository |
|
From: Michael L. <he...@us...> - 2009-06-29 08:37:47
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10829/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: Handling of instances Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** PopupMenu.java 26 Jun 2009 15:39:13 -0000 1.34 --- PopupMenu.java 29 Jun 2009 08:37:43 -0000 1.35 *************** *** 300,303 **** --- 300,322 ---- menu.add(action); } + { + AbstractAction action = new CollectionMenuAction(s, "Remove Instances") { + public void actionPerformed(ActionEvent event) { + List<Space> spaces = new LinkedList(col); + for (Space space : spaces) { + List<Instance> instances = space.collectInstances(); + for (Instance current : instances) { + Space duplicate = current.duplicate(); + Space owner = current.getOwner(); + owner.add(duplicate); + current.delete(); + } + } + Project.getInstance().changed(Project.getInstance()); + Project.getInstance().checkpoint(); + } + }; + menu.add(action); + } if (s.size() == 1) { // Some options do only apply to one space |
|
From: Michael L. <he...@us...> - 2009-06-29 08:37:44
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10814/src/net/sourceforge/bprocessor/gui/actions Modified Files: FileImportActionListener.java Log Message: Handling of instances Index: FileImportActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** FileImportActionListener.java 25 Jun 2009 23:28:46 -0000 1.26 --- FileImportActionListener.java 29 Jun 2009 08:37:40 -0000 1.27 *************** *** 15,18 **** --- 15,19 ---- import java.io.FileInputStream; import java.io.InputStreamReader; + import java.util.HashMap; import javax.swing.BoxLayout; *************** *** 26,29 **** --- 27,34 ---- import net.sourceforge.bprocessor.gui.GUI; + import net.sourceforge.bprocessor.model.Component; + import net.sourceforge.bprocessor.model.Document; + import net.sourceforge.bprocessor.model.Material; + import net.sourceforge.bprocessor.model.Persistence; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; *************** *** 41,44 **** --- 46,51 ---- private CVSinfo info = null; + private FileFilter bpFilter; + private FileFilter objFilter; *************** *** 61,64 **** --- 68,82 ---- info = new CVSinfo(loadChooser); loadChooser.setAccessory(info); + bpFilter = new FileFilter() { + @Override + public boolean accept(File f) { + return f.isDirectory() || f.getName().endsWith(".bp"); + } + + @Override + public String getDescription() { + return "bp - B-processor format"; + } + }; objFilter = new FileFilter() { @Override *************** *** 93,100 **** } }; loadChooser.addChoosableFileFilter(csvFilter); loadChooser.addChoosableFileFilter(objFilter); loadChooser.addChoosableFileFilter(dgnFilter); ! loadChooser.setFileFilter(csvFilter); } --- 111,119 ---- } }; + loadChooser.addChoosableFileFilter(bpFilter); loadChooser.addChoosableFileFilter(csvFilter); loadChooser.addChoosableFileFilter(objFilter); loadChooser.addChoosableFileFilter(dgnFilter); ! loadChooser.setFileFilter(bpFilter); } *************** *** 120,129 **** try { Space s = Space.createUnion(lfile.getName()); - //Component lo = new Component(Byte.MAX_VALUE, lfile, s); ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), info.objPanel.getDirection(), info.objPanel.getCalcNormals()); ! Project.getInstance().getActiveSpace().add(s); ! //s.computeEnvelope(); ! //Project.getInstance().addLibraryObject(lo); Project.getInstance().changed(s); Project.getInstance().checkpoint(); --- 139,146 ---- try { Space s = Space.createUnion(lfile.getName()); ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), info.objPanel.getDirection(), info.objPanel.getCalcNormals()); ! Component lo = new Component(Byte.MAX_VALUE, lfile, s); ! Project.getInstance().addCalalogObject(lo); Project.getInstance().changed(s); Project.getInstance().checkpoint(); *************** *** 131,134 **** --- 148,168 ---- log.error("Could not open file: " + lfile, ex); } + } else if (lfile.getName().endsWith(".bp")) { + try { + Document document = Persistence.load(lfile); + Space union = Space.createUnion("Import"); + document.getWorld().copyInterior(new HashMap(), union); + Project.getInstance().world().add(union); + for (Material current : document.getMaterials()) { + Project.getInstance().add(current); + } + for (Component current : document.getComponents()) { + Project.getInstance().addCalalogObject(current); + } + + Project.getInstance().changed(Project.getInstance()); + } catch (Exception ex) { + log.error("Could not open file: " + lfile, ex); + } } else if (lfile.getName().endsWith(".dgn")) { try { |
|
From: Michael L. <he...@us...> - 2009-06-29 08:37:40
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10801/src/net/sourceforge/bprocessor/model Modified Files: Instance.java Space.java Project.java Persistence.java Added Files: Document.java Log Message: Handling of instances Index: Instance.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Instance.java 26 Jun 2009 12:39:50 -0000 1.10 --- Instance.java 29 Jun 2009 08:37:37 -0000 1.11 *************** *** 8,12 **** --- 8,14 ---- package net.sourceforge.bprocessor.model; + import java.util.ArrayList; import java.util.Collection; + import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; *************** *** 127,130 **** --- 129,146 ---- return copy; } + + /** + * + * @return duplicate of this space + */ + public Space duplicate() { + Space duplicate = proto.copy(new HashMap()); + List<Vertex> vertices = new ArrayList(duplicate.collect()); + anchor.unTranslateIt(vertices); + for (Vertex current : vertices) { + current.update(); + } + return duplicate; + } } Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** Persistence.java 25 Jun 2009 22:17:30 -0000 1.80 --- Persistence.java 29 Jun 2009 08:37:37 -0000 1.81 *************** *** 85,89 **** import java.io.OutputStream; import java.util.Collection; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; --- 85,88 ---- *************** *** 118,183 **** private Persistence() { } /** ! * This method internalizes a b-processor document ! * @param document XML */ ! public static void internalize(Bmodel document) { HashMap mapper = new HashMap(); Collection xmls = new LinkedList(); ! ! Space world = internalizeContainer(null, ! (SpaceType) document.getSpace().iterator().next(), mapper, xmls); ! ! Project p = Project.getInstance(); ! p.getMaterials().clear(); ! p.getConstructors().clear(); ! p.setWorld(world); ! p.setActiveCoordinateSystem( ! (CoordinateSystem) get(document.getCs(), mapper)); ! p.setActiveSpace((Space) get(document.getActive(), mapper)); ! p.setName(document.getName()); ! p.changed(p); { List<Attribute> attributes = new LinkedList<Attribute>(); ! for (Object o : document.getGlobal()) { ! if (o instanceof MapElementType) { ! MapElementType elem = (MapElementType)o; ! attributes.add(internalizeKeyValue(elem, mapper)); ! } } ! Collections.sort(attributes, new Attribute.AttributeComparator()); ! Project.getInstance().getGlobals().setAttributes(attributes); } { ! Iterator iter = document.getMaterial().iterator(); while (iter.hasNext()) { MaterialType current = (MaterialType) iter.next(); ! p.add(internalizeMaterial(current, mapper, xmls)); } } { ! p.getCatalogObjects().clear(); ! for (Object o : document.getCatalogObjects()) { ! LibObjType lot = (LibObjType)o; ! Component lo = internalizeLibraryObj(lot, mapper, xmls); ! p.addCalalogObject(lo); } } { ! CameraType current = document.getView(); if (current != null) { Camera camera = internalizeCamera(current); internalizeReferences(camera, current, mapper); ! Project.getInstance().setCurrentCamera(camera); } } { ! Iterator iter = document.getCamera().iterator(); while (iter.hasNext()) { CameraType current = (CameraType) iter.next(); ! Camera cam = internalizeCamera(current); ! p.add(cam); } } { --- 117,206 ---- private Persistence() { } + + /** + * This method loads the Bmodel document from a file + * @param file The input file + * @exception Exception Thrown if an exception occurs + * @return document + */ + public static Document load(File file) throws Exception { + FileInputStream fis = new FileInputStream(file); + Bmodel bp = (Bmodel)loadFile(fis); + fis.close(); + return internalize(bp); + } + /** ! * This method loads the Bmodel document from a file ! * @param is The input stream ! * @return The loaded object (xml document) ! * @exception Exception Thrown if an exception occurs */ ! private static Object loadFile(InputStream is) throws Exception { ! JAXBContext jc = JAXBContext.newInstance("net.sourceforge.bprocessor.model.xml"); ! Unmarshaller u = jc.createUnmarshaller(); ! return u.unmarshal(is); ! } ! ! /** ! * ! * @param xml XML ! * @return document ! */ ! public static Document internalize(Bmodel xml) { ! Document document = new Document(); HashMap mapper = new HashMap(); Collection xmls = new LinkedList(); ! { ! Space world = internalizeContainer(null, ! (SpaceType) xml.getSpace().iterator().next(), mapper, xmls); ! document.setWorld(world); ! } { List<Attribute> attributes = new LinkedList<Attribute>(); ! Iterator iter = xml.getGlobal().iterator(); ! while (iter.hasNext()) { ! MapElementType current = (MapElementType) iter.next(); ! attributes.add(internalizeKeyValue(current, mapper)); } ! document.setAttributes(attributes); } { ! List<Material> materials = new LinkedList(); ! Iterator iter = xml.getMaterial().iterator(); while (iter.hasNext()) { MaterialType current = (MaterialType) iter.next(); ! materials.add(internalizeMaterial(current, mapper, xmls)); } + document.setMaterials(materials); } { ! List<Component> components = new LinkedList(); ! Iterator iter = xml.getCatalogObjects().iterator(); ! while (iter.hasNext()) { ! LibObjType current = (LibObjType)iter.next(); ! Component component = internalizeLibraryObj(current, mapper, xmls); ! components.add(component); } + document.setComponents(components); } { ! CameraType current = xml.getView(); if (current != null) { Camera camera = internalizeCamera(current); internalizeReferences(camera, current, mapper); ! document.setView(camera); } } { ! List<Camera> cameras = new LinkedList(); ! Iterator iter = xml.getCamera().iterator(); while (iter.hasNext()) { CameraType current = (CameraType) iter.next(); ! Camera camera = internalizeCamera(current); ! cameras.add(camera); } + document.setCameras(cameras); } { *************** *** 189,217 **** } } ! } ! ! /** ! * This method loads the Bmodel document from a file ! * @param file The input file ! * @exception Exception Thrown if an exception occurs ! */ ! public static void load(File file) throws Exception { ! FileInputStream fis = new FileInputStream(file); ! Bmodel bp = (Bmodel)loadFile(fis); ! internalize(bp); ! fis.close(); ! } ! ! ! /** ! * This method loads the Bmodel document from a file ! * @param is The input stream ! * @return The loaded object (xml document) ! * @exception Exception Thrown if an exception occurs ! */ ! private static Object loadFile(InputStream is) throws Exception { ! JAXBContext jc = JAXBContext.newInstance("net.sourceforge.bprocessor.model.xml"); ! Unmarshaller u = jc.createUnmarshaller(); ! return u.unmarshal(is); } --- 212,219 ---- } } ! document.setActiveSystem((CoordinateSystem) get(xml.getCs(), mapper)); ! document.setActiveSpace((Space) get(xml.getActive(), mapper)); ! document.setName(xml.getName()); ! return document; } Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.241 retrieving revision 1.242 diff -C2 -d -r1.241 -r1.242 *** Space.java 26 Jun 2009 15:39:10 -0000 1.241 --- Space.java 29 Jun 2009 08:37:37 -0000 1.242 *************** *** 1672,1674 **** --- 1672,1740 ---- export(containers, out); } + + /** + * Collect spaces + * @return spaces + */ + public List<Instance> collectInstances() { + List<Instance> spaces = new LinkedList(); + for (Item current : getElements()) { + if (current instanceof Space) { + Space space = (Space) current; + space.collectInstances(spaces); + } else { + Instance instance = (Instance) current; + spaces.add(instance); + } + } + return spaces; + } + /** + * Collect spaces + * @param spaces Spaces + */ + public void collectInstances(Collection<Instance> spaces) { + if (isUnion()) { + for (Item item : getElements()) { + if (item instanceof Space) { + Space space = (Space) item; + space.collectInstances(spaces); + } else { + Instance instance = (Instance) item; + spaces.add(instance); + } + } + } + } + + /** + * Collect spaces + * @return spaces + */ + public List<Space> collectSpaces() { + List<Space> spaces = new LinkedList(); + for (Item current : getElements()) { + if (current instanceof Space) { + Space space = (Space) current; + space.collectSpaces(spaces); + } + } + return spaces; + } + /** + * Collect spaces + * @param spaces Spaces + */ + public void collectSpaces(Collection<Space> spaces) { + if (isUnion()) { + for (Item item : getElements()) { + if (item instanceof Space) { + Space space = (Space) item; + space.collectSpaces(spaces); + } + } + } else { + spaces.add(this); + } + } } --- NEW FILE: Document.java --- //--------------------------------------------------------------------------------- // $Id: Document.java,v 1.1 2009/06/29 08:37:37 henryml Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; import java.util.List; /** * */ public class Document { private String name; private Space world; private Space activeSpace; private CoordinateSystem activeSystem; private List<Attribute> attributes; private List<Material> materials; private List<Component> components; private Camera view; private List<Camera> cameras; /** * * @param value String */ public void setName(String value) { name = value; } /** * * @return name */ public String getName() { return name; } /** * * @param value Space */ public void setWorld(Space value) { world = value; } /** * * @return world */ public Space getWorld() { return world; } /** * * @param value Space */ public void setActiveSpace(Space value) { activeSpace = value; } /** * * @return active space */ public Space getActiveSpace() { return activeSpace; } /** * * @param value CoordinateSystem */ public void setActiveSystem(CoordinateSystem value) { activeSystem = value; } /** * * @return active coordinate system */ public CoordinateSystem getActiveSystem() { return activeSystem; } /** * * @param value Attributes */ public void setAttributes(List<Attribute> value) { attributes = value; } /** * * @return attributes */ public List<Attribute> getAttribues() { return attributes; } /** * * @param value List of Materials */ public void setMaterials(List<Material> value) { materials = value; } /** * * @return materials */ public List<Material> getMaterials() { return materials; } /** * * @param value Active camera */ public void setView(Camera value) { view = value; } /** * * @return active camera */ public Camera getView() { return view; } /** * * @param value List of cameras */ public void setCameras(List<Camera> value) { cameras = value; } /** * * @return cameras */ public List<Camera> getCameras() { return cameras; } /** * * @param value List of components */ public void setComponents(List<Component> value) { components = value; } /** * * @return List of components */ public List<Component> getComponents() { return components; } } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.179 retrieving revision 1.180 diff -C2 -d -r1.179 -r1.180 *** Project.java 25 Jun 2009 22:17:30 -0000 1.179 --- Project.java 29 Jun 2009 08:37:37 -0000 1.180 *************** *** 851,857 **** public void setState(Bmodel state) { clear(); ! Persistence.internalize(state); } ! /** * Reset the state to currentState --- 851,882 ---- public void setState(Bmodel state) { clear(); ! Document document = Persistence.internalize(state); ! setDocument(document); } ! ! /** ! * ! * @param document Document ! */ ! public void setDocument(Document document) { ! setWorld(document.getWorld()); ! setActiveCoordinateSystem(document.getActiveSystem()); ! setActiveSpace(document.getActiveSpace()); ! setName(document.getName()); ! setCurrentCamera(document.getView()); ! getGlobals().setAttributes(document.getAttribues()); ! for (Material current : document.getMaterials()) { ! add(current); ! } ! for (Component current : document.getComponents()) { ! addCalalogObject(current); ! } ! for (Camera current : document.getCameras()) { ! add(current); ! } ! ! changed(this); ! } ! /** * Reset the state to currentState *************** *** 910,914 **** Selection.primary().clear(); reset(); ! Persistence.load(file); makeClean(); resetHistory(); --- 935,940 ---- Selection.primary().clear(); reset(); ! Document document = Persistence.load(file); ! setDocument(document); makeClean(); resetHistory(); *************** *** 947,962 **** */ public Collection getConstructors() { ! Collection res = new HashSet(); ! Collection spaces = getSpaces(); ! Iterator iter = spaces.iterator(); ! while (iter.hasNext()) { ! Object current = iter.next(); ! if (current instanceof Space) { ! Space space = (Space) current; ! res.addAll(space.getConstructors()); ! } ! } ! res.addAll(world.getConstructors()); ! return res; } --- 973,977 ---- */ public Collection getConstructors() { ! return world.getConstructors(); } *************** *** 1660,1670 **** public void exportOBJ(OutputStream out) { PrintStream printer = new PrintStream(out); List<Space> constructs = new LinkedList(); ! for (Item current : world.getElements()) { ! if (current instanceof Space) { ! if (!current.isVoid() && current.isConstructionSpace()) { ! Space container = (Space) current; ! constructs.add(container); ! } } } --- 1675,1684 ---- public void exportOBJ(OutputStream out) { PrintStream printer = new PrintStream(out); + List<Space> spaces = world.collectSpaces(); + List<Space> constructs = new LinkedList(); ! for (Space current : spaces) { ! if (!current.isVoid() && current.isConstructionSpace()) { ! constructs.add(current); } } |
|
From: Michael L. <he...@us...> - 2009-06-29 08:37:36
|
Update of /cvsroot/bprocessor/bprocessor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10788 Added Files: appartment.mtl b-processor-export.mtl simple.mtl Log Message: Handling of instances --- NEW FILE: b-processor-export.mtl --- newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark Ka 0.2 0.2 0.2 Kd 0.12156863 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark brown Ka 0.2 0.2 0.2 Kd 0.46666667 0.101960786 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Black Ka 0.2 0.2 0.2 Kd 0.0 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Light Brown Ka 0.2 0.2 0.2 Kd 0.7058824 0.25490198 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl White Ka 0.2 0.2 0.2 Kd 0.84705883 0.827451 0.8039216 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Yellow Ka 0.2 0.2 0.2 Kd 0.8235294 0.60784316 0.1254902 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 --- NEW FILE: simple.mtl --- newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark Ka 0.2 0.2 0.2 Kd 0.12156863 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark brown Ka 0.2 0.2 0.2 Kd 0.46666667 0.101960786 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Black Ka 0.2 0.2 0.2 Kd 0.0 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Light Brown Ka 0.2 0.2 0.2 Kd 0.7058824 0.25490198 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl White Ka 0.2 0.2 0.2 Kd 0.84705883 0.827451 0.8039216 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Yellow Ka 0.2 0.2 0.2 Kd 0.8235294 0.60784316 0.1254902 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 --- NEW FILE: appartment.mtl --- newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Functional Ka 0.2 0.2 0.2 Kd 0.9 0.9 0.9 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Construction Ka 0.2 0.2 0.2 Kd 0.96 0.87 0.7 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Void Ka 0.2 0.2 0.2 Kd 0.91071427 0.8142857 0.8035714 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark Ka 0.2 0.2 0.2 Kd 0.12156863 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Dark brown Ka 0.2 0.2 0.2 Kd 0.46666667 0.101960786 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Black Ka 0.2 0.2 0.2 Kd 0.0 0.0 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Light Brown Ka 0.2 0.2 0.2 Kd 0.7058824 0.25490198 0.0 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl White Ka 0.2 0.2 0.2 Kd 0.84705883 0.827451 0.8039216 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 newmtl Yellow Ka 0.2 0.2 0.2 Kd 0.8235294 0.60784316 0.1254902 Ks 1.0 1.0 1.0 d 1.0 Ns 0.0 illum 0 |
