- Timestamp:
- 10/20/07 18:11:52 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/Carsten_PtrWork/Source/Contrib/Manipulators/OSGManipulatorBase.cpp
r965 r976 95 95 \***************************************************************************/ 96 96 97 /*! \var Node PtrManipulatorBase::_sfTarget97 /*! \var NodeInternalRefPtr ManipulatorBase::_sfTarget 98 98 99 99 */ 100 100 101 /*! \var Node PtrManipulatorBase::_sfActiveSubHandle101 /*! \var NodeInternalRefPtr ManipulatorBase::_sfActiveSubHandle 102 102 the active sub handle 103 103 */ … … 107 107 */ 108 108 109 /*! \var Viewport PtrManipulatorBase::_sfViewport109 /*! \var ViewportInternalRefPtr ManipulatorBase::_sfViewport 110 110 111 111 */ … … 119 119 */ 120 120 121 /*! \var Node PtrManipulatorBase::_sfHandleXNode121 /*! \var NodeInternalRefPtr ManipulatorBase::_sfHandleXNode 122 122 The node for the x-handle geometry 123 123 */ 124 124 125 /*! \var Node PtrManipulatorBase::_sfHandleYNode125 /*! \var NodeInternalRefPtr ManipulatorBase::_sfHandleYNode 126 126 The node for the y-handle geometry 127 127 */ 128 128 129 /*! \var Node PtrManipulatorBase::_sfHandleZNode129 /*! \var NodeInternalRefPtr ManipulatorBase::_sfHandleZNode 130 130 The node for the z-handle geometry 131 131 */ 132 132 133 /*! \var Node PtrManipulatorBase::_sfTransXNode133 /*! \var NodeInternalRefPtr ManipulatorBase::_sfTransXNode 134 134 The node for the x-handle transform 135 135 */ 136 136 137 /*! \var Node PtrManipulatorBase::_sfTransYNode137 /*! \var NodeInternalRefPtr ManipulatorBase::_sfTransYNode 138 138 The node for the y-handle transform 139 139 */ 140 140 141 /*! \var Node PtrManipulatorBase::_sfTransZNode141 /*! \var NodeInternalRefPtr ManipulatorBase::_sfTransZNode 142 142 The node for the z-handle transform 143 143 */ 144 144 145 /*! \var Material PtrManipulatorBase::_sfMaterialX145 /*! \var MaterialInternalRefPtr ManipulatorBase::_sfMaterialX 146 146 material for the x-axis geometry 147 147 */ 148 148 149 /*! \var Material PtrManipulatorBase::_sfMaterialY149 /*! \var MaterialInternalRefPtr ManipulatorBase::_sfMaterialY 150 150 material for the y-axis geometry 151 151 */ 152 152 153 /*! \var Material PtrManipulatorBase::_sfMaterialZ153 /*! \var MaterialInternalRefPtr ManipulatorBase::_sfMaterialZ 154 154 material for the z-axis geometry 155 155 */ 156 156 157 /*! \var Node PtrManipulatorBase::_sfAxisLinesN157 /*! \var NodeInternalRefPtr ManipulatorBase::_sfAxisLinesN 158 158 159 159 */ … … 165 165 166 166 167 pDesc = new SFNode Ptr::Description(168 SFNode Ptr::getClassType(),167 pDesc = new SFNodeInternalRefPtr::Description( 168 SFNodeInternalRefPtr::getClassType(), 169 169 "target", 170 170 "", … … 177 177 oType.addInitialDesc(pDesc); 178 178 179 pDesc = new SFNode Ptr::Description(180 SFNode Ptr::getClassType(),179 pDesc = new SFNodeInternalRefPtr::Description( 180 SFNodeInternalRefPtr::getClassType(), 181 181 "activeSubHandle", 182 182 "the active sub handle\n", … … 201 201 oType.addInitialDesc(pDesc); 202 202 203 pDesc = new SFViewport Ptr::Description(204 SFViewport Ptr::getClassType(),203 pDesc = new SFViewportInternalRefPtr::Description( 204 SFViewportInternalRefPtr::getClassType(), 205 205 "viewport", 206 206 "", … … 237 237 oType.addInitialDesc(pDesc); 238 238 239 pDesc = new SFNode Ptr::Description(240 SFNode Ptr::getClassType(),239 pDesc = new SFNodeInternalRefPtr::Description( 240 SFNodeInternalRefPtr::getClassType(), 241 241 "handleXNode", 242 242 "The node for the x-handle geometry\n", … … 249 249 oType.addInitialDesc(pDesc); 250 250 251 pDesc = new SFNode Ptr::Description(252 SFNode Ptr::getClassType(),251 pDesc = new SFNodeInternalRefPtr::Description( 252 SFNodeInternalRefPtr::getClassType(), 253 253 "handleYNode", 254 254 "The node for the y-handle geometry\n", … … 261 261 oType.addInitialDesc(pDesc); 262 262 263 pDesc = new SFNode Ptr::Description(264 SFNode Ptr::getClassType(),263 pDesc = new SFNodeInternalRefPtr::Description( 264 SFNodeInternalRefPtr::getClassType(), 265 265 "handleZNode", 266 266 "The node for the z-handle geometry\n", … … 273 273 oType.addInitialDesc(pDesc); 274 274 275 pDesc = new SFNode Ptr::Description(276 SFNode Ptr::getClassType(),275 pDesc = new SFNodeInternalRefPtr::Description( 276 SFNodeInternalRefPtr::getClassType(), 277 277 "transXNode", 278 278 "The node for the x-handle transform\n", … … 285 285 oType.addInitialDesc(pDesc); 286 286 287 pDesc = new SFNode Ptr::Description(288 SFNode Ptr::getClassType(),287 pDesc = new SFNodeInternalRefPtr::Description( 288 SFNodeInternalRefPtr::getClassType(), 289 289 "transYNode", 290 290 "The node for the y-handle transform\n", … … 297 297 oType.addInitialDesc(pDesc); 298 298 299 pDesc = new SFNode Ptr::Description(300 SFNode Ptr::getClassType(),299 pDesc = new SFNodeInternalRefPtr::Description( 300 SFNodeInternalRefPtr::getClassType(), 301 301 "transZNode", 302 302 "The node for the z-handle transform\n", … … 309 309 oType.addInitialDesc(pDesc); 310 310 311 pDesc = new SFMaterial Ptr::Description(312 SFMaterial Ptr::getClassType(),311 pDesc = new SFMaterialInternalRefPtr::Description( 312 SFMaterialInternalRefPtr::getClassType(), 313 313 "materialX", 314 314 "material for the x-axis geometry\n", … … 321 321 oType.addInitialDesc(pDesc); 322 322 323 pDesc = new SFMaterial Ptr::Description(324 SFMaterial Ptr::getClassType(),323 pDesc = new SFMaterialInternalRefPtr::Description( 324 SFMaterialInternalRefPtr::getClassType(), 325 325 "materialY", 326 326 "material for the y-axis geometry\n", … … 333 333 oType.addInitialDesc(pDesc); 334 334 335 pDesc = new SFMaterial Ptr::Description(336 SFMaterial Ptr::getClassType(),335 pDesc = new SFMaterialInternalRefPtr::Description( 336 SFMaterialInternalRefPtr::getClassType(), 337 337 "materialZ", 338 338 "material for the z-axis geometry\n", … … 345 345 oType.addInitialDesc(pDesc); 346 346 347 pDesc = new SFNode Ptr::Description(348 SFNode Ptr::getClassType(),347 pDesc = new SFNodeInternalRefPtr::Description( 348 SFNodeInternalRefPtr::getClassType(), 349 349 "axisLinesN", 350 350 "", … … 386 386 "\t\tname=\"target\"\n" 387 387 " category=\"pointer\"\n" 388 "\t\ttype=\"Node Ptr\"\n"388 "\t\ttype=\"Node\"\n" 389 389 "\t\tcardinality=\"single\"\n" 390 390 "\t\tvisibility=\"external\"\n" … … 395 395 "\t\tname=\"activeSubHandle\"\n" 396 396 " category=\"pointer\"\n" 397 "\t\ttype=\"Node Ptr\"\n"397 "\t\ttype=\"Node\"\n" 398 398 "\t\tcardinality=\"single\"\n" 399 399 "\t\tvisibility=\"internal\"\n" … … 414 414 "\t\tname=\"viewport\"\n" 415 415 " category=\"pointer\"\n" 416 "\t\ttype=\"Viewport Ptr\"\n"416 "\t\ttype=\"Viewport\"\n" 417 417 "\t\tcardinality=\"single\"\n" 418 418 "\t\tvisibility=\"internal\"\n" … … 443 443 "\t\tname=\"handleXNode\"\n" 444 444 " category=\"pointer\"\n" 445 "\t\ttype=\"Node Ptr\"\n"445 "\t\ttype=\"Node\"\n" 446 446 "\t\tcardinality=\"single\"\n" 447 447 "\t\tvisibility=\"internal\"\n" … … 453 453 "\t\tname=\"handleYNode\"\n" 454 454 " category=\"pointer\"\n" 455 "\t\ttype=\"Node Ptr\"\n"455 "\t\ttype=\"Node\"\n" 456 456 "\t\tcardinality=\"single\"\n" 457 457 "\t\tvisibility=\"internal\"\n" … … 463 463 "\t\tname=\"handleZNode\"\n" 464 464 " category=\"pointer\"\n" 465 "\t\ttype=\"Node Ptr\"\n"465 "\t\ttype=\"Node\"\n" 466 466 "\t\tcardinality=\"single\"\n" 467 467 "\t\tvisibility=\"internal\"\n" … … 473 473 "\t\tname=\"transXNode\"\n" 474 474 " category=\"pointer\"\n" 475 "\t\ttype=\"Node Ptr\"\n"475 "\t\ttype=\"Node\"\n" 476 476 "\t\tcardinality=\"single\"\n" 477 477 "\t\tvisibility=\"internal\"\n" … … 483 483 "\t\tname=\"transYNode\"\n" 484 484 " category=\"pointer\"\n" 485 "\t\ttype=\"Node Ptr\"\n"485 "\t\ttype=\"Node\"\n" 486 486 "\t\tcardinality=\"single\"\n" 487 487 "\t\tvisibility=\"internal\"\n" … … 493 493 "\t\tname=\"transZNode\"\n" 494 494 " category=\"pointer\"\n" 495 "\t\ttype=\"Node Ptr\"\n"495 "\t\ttype=\"Node\"\n" 496 496 "\t\tcardinality=\"single\"\n" 497 497 "\t\tvisibility=\"internal\"\n" … … 503 503 "\t\tname=\"materialX\"\n" 504 504 " category=\"pointer\"\n" 505 "\t\ttype=\"Material Ptr\"\n"505 "\t\ttype=\"Material\"\n" 506 506 "\t\tcardinality=\"single\"\n" 507 507 "\t\tvisibility=\"internal\"\n" … … 514 514 "\t\tname=\"materialY\"\n" 515 515 " category=\"pointer\"\n" 516 "\t\ttype=\"Material Ptr\"\n"516 "\t\ttype=\"Material\"\n" 517 517 "\t\tcardinality=\"single\"\n" 518 518 "\t\tvisibility=\"internal\"\n" … … 525 525 "\t\tname=\"materialZ\"\n" 526 526 " category=\"pointer\"\n" 527 "\t\ttype=\"Material Ptr\"\n"527 "\t\ttype=\"Material\"\n" 528 528 "\t\tcardinality=\"single\"\n" 529 529 "\t\tvisibility=\"internal\"\n" … … 536 536 "\t\tname=\"axisLinesN\"\n" 537 537 " category=\"pointer\"\n" 538 "\t\ttype=\"Node Ptr\"\n"538 "\t\ttype=\"Node\"\n" 539 539 "\t\tcardinality=\"single\"\n" 540 540 "\t\tvisibility=\"internal\"\n" … … 837 837 ManipulatorBase::ManipulatorBase(void) : 838 838 Inherited(), 839 _sfTarget (Node Ptr(NullFC)),840 _sfActiveSubHandle (Node Ptr(NullFC)),839 _sfTarget (NodeInternalRefPtr(NullFC)), 840 _sfActiveSubHandle (NodeInternalRefPtr(NullFC)), 841 841 _sfLastMousePos (), 842 _sfViewport (Viewport Ptr(NullFC)),842 _sfViewport (ViewportInternalRefPtr(NullFC)), 843 843 _sfActive (), 844 844 _sfLength (Vec3f(1,1,1)), 845 _sfHandleXNode (Node Ptr(NullFC)),846 _sfHandleYNode (Node Ptr(NullFC)),847 _sfHandleZNode (Node Ptr(NullFC)),848 _sfTransXNode (Node Ptr(NullFC)),849 _sfTransYNode (Node Ptr(NullFC)),850 _sfTransZNode (Node Ptr(NullFC)),851 _sfMaterialX (Material Ptr(NullFC)),852 _sfMaterialY (Material Ptr(NullFC)),853 _sfMaterialZ (Material Ptr(NullFC)),854 _sfAxisLinesN (Node Ptr(NullFC))845 _sfHandleXNode (NodeInternalRefPtr(NullFC)), 846 _sfHandleYNode (NodeInternalRefPtr(NullFC)), 847 _sfHandleZNode (NodeInternalRefPtr(NullFC)), 848 _sfTransXNode (NodeInternalRefPtr(NullFC)), 849 _sfTransYNode (NodeInternalRefPtr(NullFC)), 850 _sfTransZNode (NodeInternalRefPtr(NullFC)), 851 _sfMaterialX (MaterialInternalRefPtr(NullFC)), 852 _sfMaterialY (MaterialInternalRefPtr(NullFC)), 853 _sfMaterialZ (MaterialInternalRefPtr(NullFC)), 854 _sfAxisLinesN (NodeInternalRefPtr(NullFC)) 855 855 { 856 856 } … … 858 858 ManipulatorBase::ManipulatorBase(const ManipulatorBase &source) : 859 859 Inherited(source), 860 _sfTarget (Node Ptr(NullFC)),861 _sfActiveSubHandle (Node Ptr(NullFC)),860 _sfTarget (NodeInternalRefPtr(NullFC)), 861 _sfActiveSubHandle (NodeInternalRefPtr(NullFC)), 862 862 _sfLastMousePos (source._sfLastMousePos ), 863 _sfViewport (Viewport Ptr(NullFC)),863 _sfViewport (ViewportInternalRefPtr(NullFC)), 864 864 _sfActive (source._sfActive ), 865 865 _sfLength (source._sfLength ), 866 _sfHandleXNode (Node Ptr(NullFC)),867 _sfHandleYNode (Node Ptr(NullFC)),868 _sfHandleZNode (Node Ptr(NullFC)),869 _sfTransXNode (Node Ptr(NullFC)),870 _sfTransYNode (Node Ptr(NullFC)),871 _sfTransZNode (Node Ptr(NullFC)),872 _sfMaterialX (Material Ptr(NullFC)),873 _sfMaterialY (Material Ptr(NullFC)),874 _sfMaterialZ (Material Ptr(NullFC)),875 _sfAxisLinesN (Node Ptr(NullFC))866 _sfHandleXNode (NodeInternalRefPtr(NullFC)), 867 _sfHandleYNode (NodeInternalRefPtr(NullFC)), 868 _sfHandleZNode (NodeInternalRefPtr(NullFC)), 869 _sfTransXNode (NodeInternalRefPtr(NullFC)), 870 _sfTransYNode (NodeInternalRefPtr(NullFC)), 871 _sfTransZNode (NodeInternalRefPtr(NullFC)), 872 _sfMaterialX (MaterialInternalRefPtr(NullFC)), 873 _sfMaterialY (MaterialInternalRefPtr(NullFC)), 874 _sfMaterialZ (MaterialInternalRefPtr(NullFC)), 875 _sfAxisLinesN (NodeInternalRefPtr(NullFC)) 876 876 { 877 877 } … … 921 921 GetFieldHandlePtr ManipulatorBase::getHandleTarget (void) const 922 922 { 923 SFNode Ptr::GetHandlePtr returnValue(924 new SFNode Ptr::GetHandle(923 SFNodeInternalRefPtr::GetHandlePtr returnValue( 924 new SFNodeInternalRefPtr::GetHandle( 925 925 &_sfTarget, 926 926 this->getType().getFieldDesc(TargetFieldId))); … … 930 930 EditFieldHandlePtr ManipulatorBase::editHandleTarget (void) 931 931 { 932 SFNode Ptr::EditHandlePtr returnValue(933 new SFNode Ptr::EditHandle(932 SFNodeInternalRefPtr::EditHandlePtr returnValue( 933 new SFNodeInternalRefPtr::EditHandle( 934 934 &_sfTarget, 935 935 this->getType().getFieldDesc(TargetFieldId))); … … 945 945 GetFieldHandlePtr ManipulatorBase::getHandleActiveSubHandle (void) const 946 946 { 947 SFNode Ptr::GetHandlePtr returnValue(948 new SFNode Ptr::GetHandle(947 SFNodeInternalRefPtr::GetHandlePtr returnValue( 948 new SFNodeInternalRefPtr::GetHandle( 949 949 &_sfActiveSubHandle, 950 950 this->getType().getFieldDesc(ActiveSubHandleFieldId))); … … 954 954 EditFieldHandlePtr ManipulatorBase::editHandleActiveSubHandle(void) 955 955 { 956 SFNode Ptr::EditHandlePtr returnValue(957 new SFNode Ptr::EditHandle(956 SFNodeInternalRefPtr::EditHandlePtr returnValue( 957 new SFNodeInternalRefPtr::EditHandle( 958 958 &_sfActiveSubHandle, 959 959 this->getType().getFieldDesc(ActiveSubHandleFieldId))); … … 990 990 GetFieldHandlePtr ManipulatorBase::getHandleViewport (void) const 991 991 { 992 SFViewport Ptr::GetHandlePtr returnValue(993 new SFViewport Ptr::GetHandle(992 SFViewportInternalRefPtr::GetHandlePtr returnValue( 993 new SFViewportInternalRefPtr::GetHandle( 994 994 &_sfViewport, 995 995 this->getType().getFieldDesc(ViewportFieldId))); … … 999 999 EditFieldHandlePtr ManipulatorBase::editHandleViewport (void) 1000 1000 { 1001 SFViewport Ptr::EditHandlePtr returnValue(1002 new SFViewport Ptr::EditHandle(1001 SFViewportInternalRefPtr::EditHandlePtr returnValue( 1002 new SFViewportInternalRefPtr::EditHandle( 1003 1003 &_sfViewport, 1004 1004 this->getType().getFieldDesc(ViewportFieldId))); … … 1056 1056 GetFieldHandlePtr ManipulatorBase::getHandleHandleXNode (void) const 1057 1057 { 1058 SFNode Ptr::GetHandlePtr returnValue(1059 new SFNode Ptr::GetHandle(1058 SFNodeInternalRefPtr::GetHandlePtr returnValue( 1059 new SFNodeInternalRefPtr::GetHandle( 1060 1060 &_sfHandleXNode, 1061 1061 this->getType().getFieldDesc(HandleXNodeFieldId))); … … 1065 1065 EditFieldHandlePtr ManipulatorBase::editHandleHandleXNode (void) 1066 1066 { 1067 SFNode Ptr::EditHandlePtr returnValue(1068 new SFNode Ptr::EditHandle(1067 SFNodeInternalRefPtr::EditHandlePtr returnValue( 1068 new SFNodeInternalRefPtr::EditHandle( 1069 1069 &_sfHandleXNode, 1070 1070 this->getType().getFieldDesc(HandleXNodeFieldId))); … … 1080 1080 GetFieldHandlePtr ManipulatorBase::getHandleHandleYNode (void) const 1081 1081 { 1082 SFNode Ptr::GetHandlePtr returnValue(1083 new SFNode Ptr::GetHandle(1082 SFNodeInternalRefPtr::GetHandlePtr returnValue( 1083 new SFNodeInternalRefPtr::GetHandle( 1084 1084 &_sfHandleYNode, 1085 1085 this->getType().getFieldDesc(HandleYNodeFieldId))); … … 1089 1089 EditFieldHandlePtr ManipulatorBase::editHandleHandleYNode (void) 1090 1090 { 1091 SFNode Ptr::EditHandlePtr returnValue(1092 new SFNode Ptr::EditHandle(1091 SFNodeInternalRefPtr::EditHandlePtr returnValue( 1092 new SFNodeInternalRefPtr::EditHandle( 1093 1093 &_sfHandleYNode, 1094 1094 this->getType().getFieldDesc(HandleYNodeFieldId))); … … 1104 1104 GetFieldHandlePtr ManipulatorBase::getHandleHandleZNode (void) const 1105 1105 { 1106 SFNode Ptr::GetHandlePtr returnValue(1107 new SFNode Ptr::GetHandle(1106 SFNodeInternalRefPtr::GetHandlePtr returnValue( 1107 new SFNodeInternalRefPtr::GetHandle( 1108 1108 &_sfHandleZNode, 1109 1109 this->getType().getFieldDesc(HandleZNodeFieldId))); … … 1113 1113 EditFieldHandlePtr ManipulatorBase::editHandleHandleZNode (void) 1114 1114 { 1115 SFNode Ptr::EditHandlePtr returnValue(1116 new SFNode Ptr::EditHandle(1115 SFNodeInternalRefPtr::EditHandlePtr returnValue( 1116 new SFNodeInternalRefPtr::EditHandle( 1117 1117 &_sfHandleZNode, 1118 1118 this->getType().getFieldDesc(HandleZNodeFieldId))); … … 1128 1128 GetFieldHandlePtr ManipulatorBase::getHandleTransXNode (void) const 1129 1129 { 1130 SFNode Ptr::GetHandlePtr returnValue(1131 new SFNode Ptr::GetHandle(1130 SFNodeInternalRefPtr::GetHandlePtr returnValue( 1131 new SFNodeInternalRefPtr::GetHandle( 1132 1132 &_sfTransXNode, 1133 1133 this->getType().getFieldDesc(TransXNodeFieldId))); … … 1137 1137 EditFieldHandlePtr ManipulatorBase::editHandleTransXNode (void) 1138 1138 { 1139 SFNode Ptr::EditHandlePtr returnValue(1140 new SFNode Ptr::EditHandle(1139 SFNodeInternalRefPtr::EditHandlePtr returnValue( 1140 new SFNodeInternalRefPtr::EditHandle( 1141 1141 &_sfTransXNode, 1142 1142 this->getType().getFieldDesc(TransXNodeFieldId))); … … 1152 1152 GetFieldHandlePtr ManipulatorBase::getHandleTransYNode (void) const 1153 1153 { 1154 SFNode Ptr::GetHandlePtr returnValue(1155 new SFNode Ptr::GetHandle(1154 SFNodeInternalRefPtr::GetHandlePtr returnValue( 1155 new SFNodeInternalRefPtr::GetHandle( 1156 1156 &_sfTransYNode, 1157 1157 this->getType().getFieldDesc(TransYNodeFieldId))); … … 1161 1161 EditFieldHandlePtr ManipulatorBase::editHandleTransYNode (void) 1162 1162 { 1163 SFNode Ptr::EditHandlePtr returnValue(1164 new SFNode Ptr::EditHandle(1163 SFNodeInternalRefPtr::EditHandlePtr returnValue( 1164 new SFNodeInternalRefPtr::EditHandle( 1165 1165 &_sfTransYNode, 1166 1166 this->getType().getFieldDesc(TransYNodeFieldId))); … … 1176 1176 GetFieldHandlePtr ManipulatorBase::getHandleTransZNode (void) const 1177 1177 { 1178 SFNode Ptr::GetHandlePtr returnValue(1179 new SFNode Ptr::GetHandle(1178 SFNodeInternalRefPtr::GetHandlePtr returnValue( 1179 new SFNodeInternalRefPtr::GetHandle( 1180 1180 &_sfTransZNode, 1181 1181 this->getType().getFieldDesc(TransZNodeFieldId))); … … 1185 1185 EditFieldHandlePtr ManipulatorBase::editHandleTransZNode (void) 1186 1186 { 1187 SFNode Ptr::EditHandlePtr returnValue(1188 new SFNode Ptr::EditHandle(1187 SFNodeInternalRefPtr::EditHandlePtr returnValue( 1188 new SFNodeInternalRefPtr::EditHandle( 1189 1189 &_sfTransZNode, 1190 1190 this->getType().getFieldDesc(TransZNodeFieldId))); … … 1200 1200 GetFieldHandlePtr ManipulatorBase::getHandleMaterialX (void) const 1201 1201 { 1202 SFMaterial Ptr::GetHandlePtr returnValue(1203 new SFMaterial Ptr::GetHandle(1202 SFMaterialInternalRefPtr::GetHandlePtr returnValue( 1203 new SFMaterialInternalRefPtr::GetHandle( 1204 1204 &_sfMaterialX, 1205 1205 this->getType().getFieldDesc(MaterialXFieldId))); … … 1209 1209 EditFieldHandlePtr ManipulatorBase::editHandleMaterialX (void) 1210 1210 { 1211 SFMaterial Ptr::EditHandlePtr returnValue(1212 new SFMaterial Ptr::EditHandle(1211 SFMaterialInternalRefPtr::EditHandlePtr returnValue( 1212 new SFMaterialInternalRefPtr::EditHandle( 1213 1213 &_sfMaterialX, 1214 1214 this->getType().getFieldDesc(MaterialXFieldId))); … … 1224 1224 GetFieldHandlePtr ManipulatorBase::getHandleMaterialY (void) const 1225 1225 { 1226 SFMaterial Ptr::GetHandlePtr returnValue(1227 new SFMaterial Ptr::GetHandle(1226 SFMaterialInternalRefPtr::GetHandlePtr returnValue( 1227 new SFMaterialInternalRefPtr::GetHandle( 1228 1228 &_sfMaterialY, 1229 1229 this->getType().getFieldDesc(MaterialYFieldId))); … … 1233 1233 EditFieldHandlePtr ManipulatorBase::editHandleMaterialY (void) 1234 1234 { 1235 SFMaterial Ptr::EditHandlePtr returnValue(1236 new SFMaterial Ptr::EditHandle(1235 SFMaterialInternalRefPtr::EditHandlePtr returnValue( 1236 new SFMaterialInternalRefPtr::EditHandle( 1237 1237 &_sfMaterialY, 1238 1238 this->getType().getFieldDesc(MaterialYFieldId))); … … 1248 1248 GetFieldHandlePtr ManipulatorBase::getHandleMaterialZ (void) const 1249 1249 { 1250 SFMaterial Ptr::GetHandlePtr returnValue(1251 new SFMaterial Ptr::GetHandle(1250 SFMaterialInternalRefPtr::GetHandlePtr returnValue( 1251 new SFMaterialInternalRefPtr::GetHandle( 1252 1252 &_sfMaterialZ, 1253 1253 this->getType().getFieldDesc(MaterialZFieldId))); … … 1257 1257 EditFieldHandlePtr ManipulatorBase::editHandleMaterialZ (void) 1258 1258 { 1259 SFMaterial Ptr::EditHandlePtr returnValue(1260 new SFMaterial Ptr::EditHandle(1259 SFMaterialInternalRefPtr::EditHandlePtr returnValue( 1260 new SFMaterialInternalRefPtr::EditHandle( 1261 1261 &_sfMaterialZ, 1262 1262 this->getType().getFieldDesc(MaterialZFieldId))); … … 1272 1272 GetFieldHandlePtr ManipulatorBase::getHandleAxisLinesN (void) const 1273 1273 { 1274 SFNode Ptr::GetHandlePtr returnValue(1275 new SFNode Ptr::GetHandle(1274 SFNodeInternalRefPtr::GetHandlePtr returnValue( 1275 new SFNodeInternalRefPtr::GetHandle( 1276 1276 &_sfAxisLinesN, 1277 1277 this->getType().getFieldDesc(AxisLinesNFieldId))); … … 1281 1281 EditFieldHandlePtr ManipulatorBase::editHandleAxisLinesN (void) 1282 1282 { 1283 SFNode Ptr::EditHandlePtr returnValue(1284 new SFNode Ptr::EditHandle(1283 SFNodeInternalRefPtr::EditHandlePtr returnValue( 1284 new SFNodeInternalRefPtr::EditHandle( 1285 1285 &_sfAxisLinesN, 1286 1286 this->getType().getFieldDesc(AxisLinesNFieldId))); … … 1335 1335 OSG_END_NAMESPACE 1336 1336 1337 #include "OSGS FieldAdaptor.ins"1338 #include "OSGM FieldAdaptor.ins"1337 #include "OSGSPointerFieldAdapter.ins" 1338 #include "OSGMPointerFieldAdapter.ins" 1339 1339 1340 1340 OSG_BEGIN_NAMESPACE 1341 1341 1342 1342 #if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 1343 DataType FieldTraits<ManipulatorPtr>::_type("ManipulatorPtr", "TransformPtr"); 1343 DataType FieldTraits<ManipulatorInternalRefPtr>::_type( 1344 "ManipulatorInternalRefPtr", 1345 "TransformInternalRefPtr"); 1346 DataType FieldTraits<ManipulatorWeakRefPtr>::_type( 1347 "ManipulatorWeakRefPtr", 1348 "TransformWeakRefPtr"); 1349 DataType FieldTraits<ManipulatorParentPtr>::_type( 1350 "ManipulatorParentPtr", 1351 "TransformParentPtr"); 1344 1352 #endif 1345 1353 1346 OSG_FIELDTRAITS_GETTYPE(ManipulatorPtr) 1347 1348 OSG_FIELD_DLLEXPORT_DEF2(SFieldAdaptor, ManipulatorPtr, SFFieldContainerPtr); 1349 OSG_FIELD_DLLEXPORT_DEF2(MFieldAdaptor, ManipulatorPtr, MFFieldContainerPtr); 1354 OSG_FIELDTRAITS_GETTYPE(ManipulatorInternalRefPtr) 1355 OSG_FIELDTRAITS_GETTYPE(ManipulatorWeakRefPtr) 1356 OSG_FIELDTRAITS_GETTYPE(ManipulatorParentPtr) 1357 1358 OSG_FIELD_DLLEXPORT_DEF2(SPointerFieldAdapter, 1359 ManipulatorInternalRefPtr, 1360 SFFieldContainerInternalRefPtr); 1361 OSG_FIELD_DLLEXPORT_DEF2(SPointerFieldAdapter, 1362 ManipulatorWeakRefPtr, 1363 SFFieldContainerWeakRefPtr); 1364 OSG_FIELD_DLLEXPORT_DEF2(SPointerFieldAdapter, 1365 ManipulatorParentPtr, 1366 SFFieldContainerParentPtr); 1367 OSG_FIELD_DLLEXPORT_DEF2(MPointerFieldAdapter, 1368 ManipulatorInternalRefPtr, 1369 MFFieldContainerInternalRefPtr); 1370 OSG_FIELD_DLLEXPORT_DEF2(MPointerFieldAdapter, 1371 ManipulatorWeakRefPtr, 1372 MFFieldContainerWeakRefPtr); 1373 OSG_FIELD_DLLEXPORT_DEF2(MPointerFieldAdapter, 1374 ManipulatorParentPtr, 1375 MFFieldContainerParentPtr); 1350 1376 1351 1377 OSG_END_NAMESPACE
