diff options
author | Sean Dague | 2008-07-03 18:25:18 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-03 18:25:18 +0000 |
commit | f0f1e00ec389c54c69c65fb2590b91d46cab6068 (patch) | |
tree | 3ac500a92862b2d5596ba3f6fd7cd257de25d536 /OpenSim/Data/NHibernate/Resources | |
parent | playing with multicolumn mapping of vectors using a custom type (diff) | |
download | opensim-SC-f0f1e00ec389c54c69c65fb2590b91d46cab6068.zip opensim-SC-f0f1e00ec389c54c69c65fb2590b91d46cab6068.tar.gz opensim-SC-f0f1e00ec389c54c69c65fb2590b91d46cab6068.tar.bz2 opensim-SC-f0f1e00ec389c54c69c65fb2590b91d46cab6068.tar.xz |
add a couple of LL conversion properties to SOP. I'll wait to clean
up the sit target usage until the sit target fix patch goes in, but it should
be cleaned.
Get prims table mappings to the point where nhibernate likes them enough
to start.
Remove field from asset mapping so it will start
Diffstat (limited to 'OpenSim/Data/NHibernate/Resources')
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml | 1 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | 71 |
2 files changed, 43 insertions, 29 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml index 60fc146..f6b648a 100644 --- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml | |||
@@ -5,7 +5,6 @@ | |||
5 | <generator class="assigned" /> | 5 | <generator class="assigned" /> |
6 | </id> | 6 | </id> |
7 | <property name="Type" type="System.SByte" /> | 7 | <property name="Type" type="System.SByte" /> |
8 | <property name="InvType" type="System.SByte" /> | ||
9 | <property name="Name" type="String" length="64" /> | 8 | <property name="Name" type="String" length="64" /> |
10 | <property name="Description" type="String" length="64" /> | 9 | <property name="Description" type="String" length="64" /> |
11 | <property name="Local" type="boolean" /> | 10 | <property name="Local" type="boolean" /> |
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml index 17f7a49..a443a8f 100644 --- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | |||
@@ -29,34 +29,49 @@ | |||
29 | <column name="PositionY" /> | 29 | <column name="PositionY" /> |
30 | <column name="PositionZ" /> | 30 | <column name="PositionZ" /> |
31 | </property> | 31 | </property> |
32 | 32 | ||
33 | <property name="GroupPosition.X" column="GroupPositionX" type="Single" /> | 33 | <property name="GroupPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > |
34 | <property name="GroupPosition.Y" column="GroupPositionY" type="Single" /> | 34 | <column name="GroupPositionX" /> |
35 | <property name="GroupPosition.Z" column="GroupPositionZ" type="Single" /> | 35 | <column name="GroupPositionY" /> |
36 | <column name="GroupPositionZ" /> | ||
37 | </property> | ||
38 | |||
39 | <property name="Velocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > | ||
40 | <column name="VelocityX" /> | ||
41 | <column name="VelocityY" /> | ||
42 | <column name="VelocityZ" /> | ||
43 | </property> | ||
44 | |||
45 | <property name="AngularVelocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > | ||
46 | <column name="AngularVelocityX" /> | ||
47 | <column name="AngularVelocityY" /> | ||
48 | <column name="AngularVelocityZ" /> | ||
49 | </property> | ||
50 | |||
51 | <property name="Acceleration" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > | ||
52 | <column name="AccelerationX" /> | ||
53 | <column name="AccelerationY" /> | ||
54 | <column name="AccelerationZ" /> | ||
55 | </property> | ||
56 | |||
57 | <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > | ||
58 | <column name="SitTargetPosX" /> | ||
59 | <column name="SitTargetPosY" /> | ||
60 | <column name="SitTargetPosZ" /> | ||
61 | </property> | ||
62 | |||
63 | <property name="RotationOffset" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" > | ||
64 | <column name="RotationX" /> | ||
65 | <column name="RotationY" /> | ||
66 | <column name="RotationZ" /> | ||
67 | <column name="RotationW" /> | ||
68 | </property> | ||
36 | 69 | ||
37 | <property name="Velocity.X" column="VelocityX" type="Single" /> | 70 | <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" > |
38 | <property name="Velocity.Y" column="VelocityY" type="Single" /> | 71 | <column name="SitTargetOrientX" /> |
39 | <property name="Velocity.Z" column="VelocityZ" type="Single" /> | 72 | <column name="SitTargetOrientY" /> |
40 | 73 | <column name="SitTargetOrientZ" /> | |
41 | <property name="AngularVelocity.X" column="AngularVelocityX" type="Single" /> | 74 | <column name="SitTargetOrientW" /> |
42 | <property name="AngularVelocity.Y" column="AngularVelocityY" type="Single" /> | 75 | </property> |
43 | <property name="AngularVelocity.Z" column="AngularVelocityZ" type="Single" /> | ||
44 | |||
45 | <property name="Acceleration.X" column="AccelerationX" type="Single" /> | ||
46 | <property name="Acceleration.Y" column="AccelerationY" type="Single" /> | ||
47 | <property name="Acceleration.Z" column="AccelerationZ" type="Single" /> | ||
48 | |||
49 | <property name="Rotation.X" column="RotationX" type="Single" /> | ||
50 | <property name="Rotation.Y" column="RotationY" type="Single" /> | ||
51 | <property name="Rotation.Z" column="RotationZ" type="Single" /> | ||
52 | <property name="Rotation.W" column="RotationW" type="Single" /> | ||
53 | |||
54 | <property name="sitTargetPos.X" column="sitTargetPosX" type="Single" /> | ||
55 | <property name="sitTargetPos.Y" column="sitTargetPosY" type="Single" /> | ||
56 | <property name="sitTargetPos.Z" column="sitTargetPosZ" type="Single" /> | ||
57 | <property name="SiteTargetOrient.X" column="SiteTargetOrientX" type="Single" /> | ||
58 | <property name="SiteTargetOrient.Y" column="SiteTargetOrientY" type="Single" /> | ||
59 | <property name="SiteTargetOrient.Z" column="SiteTargetOrientZ" type="Single" /> | ||
60 | <property name="SiteTargetOrient.W" column="SiteTargetOrientW" type="Single" /> | ||
61 | </class> | 76 | </class> |
62 | </hibernate-mapping> \ No newline at end of file | 77 | </hibernate-mapping> \ No newline at end of file |