Menu
▾
▴
[X3d-commits] SF.net SVN: x3d:[2601] www.web3d.org/specifications
|
From: <bru...@us...> - 2008-08-04 23:48:29
|
Revision: 2601
http://x3d.svn.sourceforge.net/x3d/?rev=2601&view=rev
Author: brutzman
Date: 2008-08-04 23:48:36 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Follower corrections
Modified Paths:
--------------
www.web3d.org/specifications/x3d-3.0.dtd
www.web3d.org/specifications/x3d-3.1.dtd
www.web3d.org/specifications/x3d-3.2.dtd
www.web3d.org/specifications/x3d-3.2.xsd
www.web3d.org/specifications/x3d-dtd-changelog.txt
www.web3d.org/specifications/x3d-schema-changelog.txt
Modified: www.web3d.org/specifications/x3d-3.0.dtd
===================================================================
--- www.web3d.org/specifications/x3d-3.0.dtd 2008-08-04 23:47:14 UTC (rev 2600)
+++ www.web3d.org/specifications/x3d-3.0.dtd 2008-08-04 23:48:36 UTC (rev 2601)
@@ -6,7 +6,6 @@
# current version: 3.0.2
#
# created: 30 April 2005
-# revised: 4 May 2008
#
# Author: Don Brutzman
#
@@ -284,7 +283,7 @@
<!ENTITY % ProtoNodes " %OtherLeafNodes;|%AppearanceNodes;|%AppearanceChildNodes;|%BehaviorLeafNodes;|%BindableNodes;|%FontStyleNodes;|%GeometricPropertyNodes;|%GeometryNodes;|%GroupingNodes;|%MetadataNodes;|%SceneLeafNodes;|Contour2D|ContourPolyline2D|ProtoDeclare|ExternProtoDeclare|ProtoInstance " >
]]>
-<!ENTITY % ChildrenNodes " %BehaviorLeafNodes;|%BindableNodes;|%GroupingNodes;|%SceneLeafNodes;|ROUTE|EXPORT|IMPORT " >
+<!ENTITY % ChildrenNodes " %BehaviorLeafNodes;|%BindableNodes;|%GroupingNodes;|%SceneLeafNodes;|ProtoDeclare|ExternProtoDeclare|ROUTE|EXPORT|IMPORT " >
<![%InterchangeProfile;[
<!ENTITY % SceneNodes " %ChildrenNodes;|%WildcardNodes; " >
Modified: www.web3d.org/specifications/x3d-3.1.dtd
===================================================================
--- www.web3d.org/specifications/x3d-3.1.dtd 2008-08-04 23:47:14 UTC (rev 2600)
+++ www.web3d.org/specifications/x3d-3.1.dtd 2008-08-04 23:48:36 UTC (rev 2601)
@@ -6,7 +6,6 @@
# current version: 3.1.2
#
# created: 30 April 2005
-# revised: 9 October 2007
#
# Author: Don Brutzman
#
@@ -328,7 +327,7 @@
<!ENTITY % ProtoNodes " %OtherLeafNodes;|%AppearanceNodes;|%AppearanceChildNodes;|%BehaviorLeafNodes;|%BindableNodes;|%CubeMapTextureNodes;|%FontStyleNodes;|%ComposedGeometryNodes;|%GeometryNodes;|%GroupingNodes;|ShaderPart|ShaderProgram|%MetadataNodes;|%SceneLeafNodes;|%Texture3DTextureNodes;|%Texture3DTextureTransformNodes;|Contour2D|ContourPolyline2D|ProtoDeclare|ExternProtoDeclare|ProtoInstance " >
]]>
-<!ENTITY % ChildrenNodes " %BehaviorLeafNodes;|%BindableNodes;|%GroupingNodes;|%SceneLeafNodes;|ROUTE|EXPORT|IMPORT " >
+<!ENTITY % ChildrenNodes " %BehaviorLeafNodes;|%BindableNodes;|%GroupingNodes;|%SceneLeafNodes;|ProtoDeclare|ExternProtoDeclare|ROUTE|EXPORT|IMPORT " >
<![%InterchangeProfile;[
<!ENTITY % SceneNodes " %ChildrenNodes;|%WildcardNodes; " >
Modified: www.web3d.org/specifications/x3d-3.2.dtd
===================================================================
--- www.web3d.org/specifications/x3d-3.2.dtd 2008-08-04 23:47:14 UTC (rev 2600)
+++ www.web3d.org/specifications/x3d-3.2.dtd 2008-08-04 23:48:36 UTC (rev 2601)
@@ -6,7 +6,6 @@
# current version: 3.2.2
#
# created: 30 April 2005
-# revised: 4 May 2008
#
# Author: Don Brutzman
#
@@ -16,7 +15,7 @@
# http://www.web3d.org/specifications/x3d-3.2-Web3dExtensionsPrivate.dtd
#
# X3D Revision DTDs:
-# http://www.web3d.org/x3d/content/x3d-3.2.
+# http://www.web3d.org/x3d/content/x3d-3.2.dtd
# http://www.web3d.org/x3d/content/x3d-3.2-Web3dExtensionsPublic.dtd
# http://www.web3d.org/x3d/content/x3d-3.2-Web3dExtensionsPrivate.dtd
#
@@ -177,6 +176,9 @@
<!ENTITY % Texture3DTextureCoordinateNodes " TextureCoordinate3D|TextureCoordinate4D| " >
<!ENTITY % Texture3DTextureTransformNodes " TextureMatrixTransform|TextureTransform3D " >
]]>
+<![%FollowersComponent;[
+<!ENTITY % FollowerNodes "ColorDamper|CoordinateDamper|OrientationChaser|OrientationDamper|PositionChaser|PositionChaser2D|PositionDamper|PositionDamper2D|ScalarChaser|TexCoordDamper2D" >
+]]>
<![%Web3dExtensionComponent;[
<!--
<!ENTITY % Web3dExtensionGeometryNodes " XvlShell|" >
@@ -203,6 +205,7 @@
<!ENTITY % Texture3DTextureNodes "">
<!ENTITY % Texture3DTextureCoordinateNodes "">
<!ENTITY % Texture3DTextureTransformNodes "">
+<!ENTITY % FollowerNodes "">
<!ENTITY % Web3dExtensionGroupingNodes "">
<!ENTITY % Web3dExtensionGeometryNodes "">
<!-- no further content-model extensions needed -->
@@ -322,9 +325,9 @@
<!ENTITY % MetadataNodes " %MetadataNodeExtensions; MetadataDouble|MetadataFloat|MetadataInteger|MetadataSet|MetadataString ">
-<!ENTITY % ProtoNodes " %OtherLeafNodes;|%AppearanceNodes;|%AppearanceChildNodes;|%BehaviorLeafNodes;|%BindableNodes;|%CubeMapTextureNodes;|%FontStyleNodes;|%ComposedGeometryNodes;|%GeometryNodes;|%GroupingNodes;|ShaderPart|ShaderProgram|%MetadataNodes;|%SceneLeafNodes;|%Texture3DTextureNodes;|%Texture3DTextureTransformNodes;|Contour2D|ContourPolyline2D|ProtoDeclare|ExternProtoDeclare|ProtoInstance " >
+<!ENTITY % ProtoNodes " %OtherLeafNodes;|%AppearanceNodes;|%AppearanceChildNodes;|%BehaviorLeafNodes;|%BindableNodes;|%CubeMapTextureNodes;|%FontStyleNodes;|%ComposedGeometryNodes;|%GeometryNodes;|%GroupingNodes;|ShaderPart|ShaderProgram|%MetadataNodes;|%SceneLeafNodes;|%Texture3DTextureNodes;|%Texture3DTextureTransformNodes;|Contour2D|ContourPolyline2D|%FollowerNodes;|ProtoDeclare|ExternProtoDeclare|ProtoInstance " >
]]>
-<!ENTITY % ChildrenNodes " %BehaviorLeafNodes;|%BindableNodes;|%GroupingNodes;|%SceneLeafNodes;|ROUTE|EXPORT|IMPORT ">
+<!ENTITY % ChildrenNodes " %BehaviorLeafNodes;|%BindableNodes;|%GroupingNodes;|%SceneLeafNodes;|%FollowerNodes;|ProtoDeclare|ExternProtoDeclare|ROUTE|EXPORT|IMPORT ">
<![%InterchangeProfile;[
<!ENTITY % SceneNodes " %ChildrenNodes;|%WildcardNodes; " >
]]>
Modified: www.web3d.org/specifications/x3d-3.2.xsd
===================================================================
--- www.web3d.org/specifications/x3d-3.2.xsd 2008-08-04 23:47:14 UTC (rev 2600)
+++ www.web3d.org/specifications/x3d-3.2.xsd 2008-08-04 23:48:36 UTC (rev 2601)
@@ -2463,6 +2463,16 @@
<xs:element ref="CADLayer"/>
<xs:element ref="OrthoViewpoint"/>
<xs:element ref="ViewpointGroup"/>
+ <xs:element ref="ColorDamper"/>
+ <xs:element ref="CoordinateDamper"/>
+ <xs:element ref="OrientationChaser"/>
+ <xs:element ref="OrientationDamper"/>
+ <xs:element ref="PositionChaser"/>
+ <xs:element ref="PositionChaser2D"/>
+ <xs:element ref="PositionDamper"/>
+ <xs:element ref="PositionDamper2D"/>
+ <xs:element ref="ScalarChaser"/>
+ <xs:element ref="TexCoordDamper2D"/>
</xs:choice>
</xs:group>
<xs:group name="ChildContentModelDIS">
@@ -9435,7 +9445,6 @@
<xs:extension base="X3DFollowerNode">
<xs:attribute name="duration" type="SFTime" default="0"/>
</xs:extension>
- <!-- TODO duration needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
<xs:complexType name="X3DDamperNode" abstract="true" mixed="false">
@@ -9452,8 +9461,6 @@
</xs:simpleType>
</xs:attribute>
</xs:extension>
- <!-- TODO tau needs initial value in spec and here -->
- <!-- TODO order needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
<xs:complexType name="X3DFollowerNode" abstract="true" mixed="false">
@@ -9472,8 +9479,6 @@
<xs:attribute name="initialDestination" type="SFColor" default="0.8 0.8 0.8"/>
<xs:attribute name="initialValue" type="SFColor" default="0.8 0.8 0.8"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -9502,8 +9507,6 @@
<xs:attribute name="initialDestination" type="SFRotation" default="0 1 0 0"/>
<xs:attribute name="initialValue" type="SFRotation" default="0 1 0 0"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -9518,8 +9521,6 @@
<xs:attribute name="initialDestination" type="SFVec3f" default="0 0 0"/>
<xs:attribute name="initialValue" type="SFVec3f" default="0 0 0"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -9534,12 +9535,10 @@
<xs:attribute name="initialDestination" type="SFVec2f" default="0 0"/>
<xs:attribute name="initialValue" type="SFVec2f" default="0 0"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
- <xs:element name="TexCoordDamper">
+ <xs:element name="TexCoordDamper2D">
<xs:annotation>
<xs:appinfo/>
<xs:documentation/>
@@ -9564,8 +9563,6 @@
<xs:attribute name="initialDestination" type="SFRotation" default="0 1 0 0"/>
<xs:attribute name="initialValue" type="SFRotation" default="0 1 0 0"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -9580,8 +9577,6 @@
<xs:attribute name="initialDestination" type="SFVec3f" default="0 0 0"/>
<xs:attribute name="initialValue" type="SFVec3f" default="0 0 0"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -9596,8 +9591,6 @@
<xs:attribute name="initialDestination" type="SFVec2f" default="0 0"/>
<xs:attribute name="initialValue" type="SFVec2f" default="0 0"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -9612,8 +9605,6 @@
<xs:attribute name="initialDestination" type="SFFloat" default="0"/>
<xs:attribute name="initialValue" type="SFFloat" default="0"/>
</xs:extension>
- <!-- TODO initialDestination needs initial value in spec and here -->
- <!-- TODO initialValue needs initial value in spec and here -->
</xs:complexContent>
</xs:complexType>
</xs:element>
Modified: www.web3d.org/specifications/x3d-dtd-changelog.txt
===================================================================
--- www.web3d.org/specifications/x3d-dtd-changelog.txt 2008-08-04 23:47:14 UTC (rev 2600)
+++ www.web3d.org/specifications/x3d-dtd-changelog.txt 2008-08-04 23:48:36 UTC (rev 2601)
@@ -52,6 +52,12 @@
- Need to integrate content models with %LayeringComponent; %LayoutComponent; %RigidBodyPhysiscsComponent; %PickingSensorComponent; %FollowersComponent; %ParticleSystemsComponent;
- stricter control of containerField values appears possible because default and allowed values can be overriden when using field/fieldValue elements
+4 August 2008, yoo, brutzman
+- rename TexCoordDamper to TexCoordDamper2D (v3.2)
+- added follower nodes (Chaser and Damper nodes) to ProtoNodes
+ (Full profile) to permit validation (v3.2)
+- added ProtoDeclare|ExternProtoDeclare|ProtoInstance to ChildrenNodes
+
21 July 2008, brutzman
- rename Image3DTexture to ImageTexture3D
Modified: www.web3d.org/specifications/x3d-schema-changelog.txt
===================================================================
--- www.web3d.org/specifications/x3d-schema-changelog.txt 2008-08-04 23:47:14 UTC (rev 2600)
+++ www.web3d.org/specifications/x3d-schema-changelog.txt 2008-08-04 23:48:36 UTC (rev 2601)
@@ -91,6 +91,13 @@
- TODO: need to fix containerField default for Viewport to be viewport
- TODO: need to fix containerField default for Layout to be layout
+4 August 2008, yoo, brutzman
+- rename TexCoordDamper to TexCoordDamper2D
+- added follower nodes (Chaser and Damper nodes) to ChildContentModelFull
+ (Full profile) to permit validation
+- remove resolved TODO comments from Chaser component nodes
+- correct specification url in annotations throughout
+
18 July 2008, brutzman
- remove following illegal watchList child nodes from X3DNetworkSensorNode to fix LoadSensor validation:
Anchor GeoMetadata Script ProtoInstance
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
