[Bprocessor-commit] model/src/etc bprocessor.xsd,1.11,1.12

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/model/src/etc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16195/src/etc

Modified Files:
	bprocessor.xsd 
Log Message:
Materials can now be saved and loaded, and there is a "global" monitoring of all materials.

Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** bprocessor.xsd	7 May 2006 09:35:07 -0000	1.11
--- bprocessor.xsd	15 May 2006 10:29:56 -0000	1.12
***************
*** 29,32 ****
--- 29,33 ----
            <xsd:element ref="edge" maxOccurs="unbounded" minOccurs="0"/>
            <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
+           <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>         
          </xsd:sequence>
        </xsd:extension>
***************
*** 41,49 ****
  	      <xsd:element name="edgeref" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/>
  	      <xsd:element name="hole" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/>
! 	      <xsd:element name="back" type="xsd:long" maxOccurs="1" minOccurs="0"/>
  	      <xsd:element name="front" type="xsd:long" maxOccurs="1" minOccurs="0"/>
! 	      <xsd:element name="exterior" type="xsd:long" maxOccurs="1" minOccurs="0"/>
  	    </xsd:sequence>
! 	 		</xsd:extension>
      </xsd:complexContent>
    </xsd:complexType>
--- 42,52 ----
  	      <xsd:element name="edgeref" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/>
  	      <xsd:element name="hole" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/>
! 	      <xsd:element name="back" type="xsd:long" maxOccurs="1" minOccurs="0"/>	      
  	      <xsd:element name="front" type="xsd:long" maxOccurs="1" minOccurs="0"/>
! 	      <xsd:element name="exterior" type="xsd:long" maxOccurs="1" minOccurs="0"/>    
! 	      <xsd:element name="frontMaterial" type="xsd:long" maxOccurs="1" minOccurs="0"/> 	        
! 	      <xsd:element name="backMaterial" type="xsd:long" maxOccurs="1" minOccurs="0"/> 
  	    </xsd:sequence>
! 	 </xsd:extension>
      </xsd:complexContent>
    </xsd:complexType>
***************
*** 72,75 ****
--- 75,92 ----
      </xsd:complexContent>
    </xsd:complexType>
+   
+   <xsd:complexType name="MaterialType">
+     <xsd:complexContent>
+       <xsd:extension base="EntityType">
+ 	    <xsd:sequence>
+ 	      <xsd:element name="name" type="xsd:string" maxOccurs="1" minOccurs="0"/>
+           <xsd:element name="R" type="xsd:float" maxOccurs="1" minOccurs="0"/>
+           <xsd:element name="G" type="xsd:float" maxOccurs="1" minOccurs="0"/>          
+           <xsd:element name="B" type="xsd:float" maxOccurs="1" minOccurs="0"/>          
+ 	    </xsd:sequence>
+ 	  </xsd:extension>
+     </xsd:complexContent>
+   </xsd:complexType>
+ 
  
    <!-- Element definitions -->
***************
*** 78,81 ****
--- 95,99 ----
    <xsd:element name="edge" type="EdgeType"/>
    <xsd:element name="vertex" type="VertexType"/>
+   <xsd:element name="material" type="MaterialType"/>
  
    <!-- Main element -->
***************
*** 88,91 ****
--- 106,110 ----
          <xsd:element ref="edge" maxOccurs="unbounded" minOccurs="0"/>
          <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
+         <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>      
        </xsd:sequence>
      </xsd:complexType>