Update of /cvsroot/epfl/tgtools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12007
Modified Files:
Convert.java
Log Message:
et encore une modif...
Index: Convert.java
===================================================================
RCS file: /cvsroot/epfl/tgtools/Convert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Convert.java 22 Nov 2004 12:43:18 -0000 1.2
--- Convert.java 22 Nov 2004 13:52:12 -0000 1.3
***************
*** 154,163 ****
s = s.replaceAll("\\)", " )");
// s = s.replaceAll(" ", "_");
! s = s.replaceAll("( -?\\d+){8}", " 0 0 0 0.500000 0.500000 0 0 0");
! if(s.indexOf("vaxis") != -1 || s.indexOf("uaxis") != -1 || s.indexOf("material") != -1
! || s.indexOf("plane") != -1 || s.indexOf("side") != -1
! || s.indexOf("solid") != -1 || s.indexOf("[") != -1
|| s.indexOf("]") != -1
! || (s.indexOf("\"") != -1 && s.indexOf("classname") == -1) ) {
System.out.println("---------\n"+s);
System.exit(0);
--- 154,169 ----
s = s.replaceAll("\\)", " )");
// s = s.replaceAll(" ", "_");
! s = s.replaceAll("( -?\\d+\\.?\\d*){8}", " 0 0 0 0.500000 0.500000 0 0 0");
! if(s.indexOf("vaxis") != -1
! || s.indexOf("uaxis") != -1
! || s.indexOf("material") != -1
! || s.indexOf("plane") != -1
! || s.indexOf("side") != -1
! || s.indexOf("solid") != -1
! || s.indexOf("[") != -1
|| s.indexOf("]") != -1
! || (s.indexOf("\"") != -1 && s.indexOf("classname") == -1)
! // && !s.matches("\\{|\\}|(\\(( -?\\d+.?\\d*){3} \\) ){3} \\w*\\/\\w* ( -?\\d+){8}")
! ) {
System.out.println("---------\n"+s);
System.exit(0);
|