[Bprocessor-commit] model/src/etc bprocessor.xsd,1.32,1.33

[rimestad <rim...@us...>]

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

Modified Files:
	bprocessor.xsd 
Log Message:
Changed material to be placed in the project not in the space, later on there should be a material attached to a space though to make things easier. Made the change to the persistence and all using classes as well

Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** bprocessor.xsd	11 Oct 2007 10:21:46 -0000	1.32
--- bprocessor.xsd	15 Oct 2007 12:41:24 -0000	1.33
***************
*** 156,163 ****
      <xsd:complexContent>
        <xsd:extension base="EntityType">
  	      <xsd:attribute name="name" type="xsd:string" use="required"/>
! 	      <xsd:attribute name="R" type="xsd:float" use="required"/>
!         <xsd:attribute name="G" type="xsd:float" use="required"/>          
!         <xsd:attribute name="B" type="xsd:float" use="required"/>    
  	    </xsd:extension>
      </xsd:complexContent>
--- 156,171 ----
      <xsd:complexContent>
        <xsd:extension base="EntityType">
+       	<xsd:sequence>
+           <xsd:element name="ambientColor" type="TripletType" maxOccurs="1" minOccurs="0"/>
+        		<xsd:element name="specularColor" type="TripletType" maxOccurs="1" minOccurs="0"/>
+        		<xsd:element name="diffuseColor" type="TripletType" maxOccurs="1" minOccurs="0"/>
+        	</xsd:sequence>
  	      <xsd:attribute name="name" type="xsd:string" use="required"/>
! 	      <xsd:attribute name="R" type="xsd:float" use="optional"/>
!         <xsd:attribute name="G" type="xsd:float" use="optional"/>          
!         <xsd:attribute name="B" type="xsd:float" use="optional"/>
!        	<xsd:attribute name="alpha" type="xsd:double" use="optional"/>
!        	<xsd:attribute name="shininess" type="xsd:double" use="optional"/>
!        	<xsd:attribute name="illumination" type="xsd:double" use="optional"/>
  	    </xsd:extension>
      </xsd:complexContent>
***************
*** 374,378 ****
          <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>
          <xsd:element name="camera" type="CameraType" maxOccurs="unbounded" minOccurs="0"/>
!         <xsd:element name="global" type="MapElementType" maxOccurs="unbounded" minOccurs="0"/>      
        </xsd:sequence>
      </xsd:complexType>
--- 382,386 ----
          <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>
          <xsd:element name="camera" type="CameraType" maxOccurs="unbounded" minOccurs="0"/>
!         <xsd:element name="global" type="MapElementType" maxOccurs="unbounded" minOccurs="0"/>
        </xsd:sequence>
      </xsd:complexType>