bprocessor-commit

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4449/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	ImportFileReader.java FileImportActionListener.java 
Log Message:
new space-select tool

Index: FileImportActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FileImportActionListener.java	3 Nov 2008 14:26:21 -0000	1.23
--- FileImportActionListener.java	19 Jun 2009 13:32:32 -0000	1.24
***************
*** 26,30 ****
  
  import net.sourceforge.bprocessor.gui.GUI;
- import net.sourceforge.bprocessor.model.Component;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Container;
--- 26,29 ----
***************
*** 123,131 ****
          try {
            Container 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());
            //s.computeEnvelope();
!           Project.getInstance().addLibraryObject(lo);
            Project.getInstance().changed(s);
            Project.getInstance().checkpoint();
--- 122,131 ----
          try {
            Container 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();

Index: ImportFileReader.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ImportFileReader.java	3 Nov 2008 13:14:12 -0000	1.19
--- ImportFileReader.java	19 Jun 2009 13:32:32 -0000	1.20
***************
*** 175,179 ****
            surfaces.add(s);
            if (currentMaterial == null) {
!             currentMaterial = new Material("Object", new float[]{0f, 0.9f, 0f});
              materialMap.put("default", currentMaterial);
            }
--- 175,179 ----
            surfaces.add(s);
            if (currentMaterial == null) {
!             currentMaterial = new Material("Object", new float[]{0.9f, 0.9f, 0.9f});
              materialMap.put("default", currentMaterial);
            }