diff --git a/VisualStudio/LANGEXT.DAT b/VisualStudio/LANGEXT.DAT index 91c318517..d902da64c 100644 --- a/VisualStudio/LANGEXT.DAT +++ b/VisualStudio/LANGEXT.DAT @@ -187,7 +187,6 @@ Transform TransformCallback TriangleFunctor TriStripVisitor -UByte4 UnitTestFramework UpdateVisitor VariableRateCounter diff --git a/VisualStudio/highlight70.reg b/VisualStudio/highlight70.reg index 52d29da08..78c4ad6ea 100644 --- a/VisualStudio/highlight70.reg +++ b/VisualStudio/highlight70.reg @@ -270,7 +270,6 @@ Windows Registry Editor Version 5.00 "TypedConstructorInfo"="" "TypedMethodInfo"="" "TypeNameAliasProxy"="" -"UByte4"="" "UFOManipulator"="" "Uniform"="" "UnitTestFramework"="" diff --git a/VisualStudio/highlight71.reg b/VisualStudio/highlight71.reg index 1d5dce635..b44968948 100644 --- a/VisualStudio/highlight71.reg +++ b/VisualStudio/highlight71.reg @@ -270,7 +270,6 @@ Windows Registry Editor Version 5.00 "TypedConstructorInfo"="" "TypedMethodInfo"="" "TypeNameAliasProxy"="" -"UByte4"="" "UFOManipulator"="" "Uniform"="" "UnitTestFramework"="" diff --git a/VisualStudio/highlight80.reg b/VisualStudio/highlight80.reg index fe009ec4c..84afc3aa9 100644 --- a/VisualStudio/highlight80.reg +++ b/VisualStudio/highlight80.reg @@ -270,7 +270,6 @@ Windows Registry Editor Version 5.00 "TypedConstructorInfo"="" "TypedMethodInfo"="" "TypeNameAliasProxy"="" -"UByte4"="" "UFOManipulator"="" "Uniform"="" "UnitTestFramework"="" diff --git a/Xcode/OpenSceneGraph/OpenSceneGraph.xcode/project.pbxproj b/Xcode/OpenSceneGraph/OpenSceneGraph.xcode/project.pbxproj index e09aa14f2..c6fc7ef07 100644 --- a/Xcode/OpenSceneGraph/OpenSceneGraph.xcode/project.pbxproj +++ b/Xcode/OpenSceneGraph/OpenSceneGraph.xcode/project.pbxproj @@ -42554,15 +42554,6 @@ refType = 2; sourceTree = SOURCE_ROOT; }; - BE11825305D63C0A00EB53E5 = { - explicitFileType = sourcecode.cpp; - fileEncoding = 30; - isa = PBXFileReference; - name = UByte4; - path = ../../include/osg/UByte4; - refType = 2; - sourceTree = SOURCE_ROOT; - }; BE11825405D63C0A00EB53E5 = { explicitFileType = sourcecode.cpp; fileEncoding = 30; diff --git a/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj b/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj index 04ebb9d7c..f4f543b58 100644 --- a/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj +++ b/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj @@ -2352,7 +2352,6 @@ BE11848305D70D1800EB53E5 /* Timer in Headers */ = {isa = PBXBuildFile; fileRef = BE11825005D63C0A00EB53E5 /* Timer */; settings = {ATTRIBUTES = (Public, ); }; }; BE11848405D70D1800EB53E5 /* Transform in Headers */ = {isa = PBXBuildFile; fileRef = BE11825105D63C0A00EB53E5 /* Transform */; settings = {ATTRIBUTES = (Public, ); }; }; BE11848505D70D1800EB53E5 /* TriangleFunctor in Headers */ = {isa = PBXBuildFile; fileRef = BE11825205D63C0A00EB53E5 /* TriangleFunctor */; settings = {ATTRIBUTES = (Public, ); }; }; - BE11848605D70D1900EB53E5 /* UByte4 in Headers */ = {isa = PBXBuildFile; fileRef = BE11825305D63C0A00EB53E5 /* UByte4 */; settings = {ATTRIBUTES = (Public, ); }; }; BE11848705D70D1900EB53E5 /* UnitTestFramework in Headers */ = {isa = PBXBuildFile; fileRef = BE11825405D63C0A00EB53E5 /* UnitTestFramework */; settings = {ATTRIBUTES = (Public, ); }; }; BE11848805D70D1900EB53E5 /* Vec2 in Headers */ = {isa = PBXBuildFile; fileRef = BE11825505D63C0A00EB53E5 /* Vec2 */; settings = {ATTRIBUTES = (Public, ); }; }; BE11848905D70D1900EB53E5 /* Vec3 in Headers */ = {isa = PBXBuildFile; fileRef = BE11825605D63C0A00EB53E5 /* Vec3 */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -5794,7 +5793,6 @@ BE11825005D63C0A00EB53E5 /* Timer */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Timer; path = ../../include/osg/Timer; sourceTree = SOURCE_ROOT; }; BE11825105D63C0A00EB53E5 /* Transform */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Transform; path = ../../include/osg/Transform; sourceTree = SOURCE_ROOT; }; BE11825205D63C0A00EB53E5 /* TriangleFunctor */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = TriangleFunctor; path = ../../include/osg/TriangleFunctor; sourceTree = SOURCE_ROOT; }; - BE11825305D63C0A00EB53E5 /* UByte4 */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = UByte4; path = ../../include/osg/UByte4; sourceTree = SOURCE_ROOT; }; BE11825405D63C0A00EB53E5 /* UnitTestFramework */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = UnitTestFramework; path = ../../include/osg/UnitTestFramework; sourceTree = SOURCE_ROOT; }; BE11825505D63C0A00EB53E5 /* Vec2 */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Vec2; path = ../../include/osg/Vec2; sourceTree = SOURCE_ROOT; }; BE11825605D63C0A00EB53E5 /* Vec3 */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Vec3; path = ../../include/osg/Vec3; sourceTree = SOURCE_ROOT; }; @@ -10559,7 +10557,6 @@ BE11825105D63C0A00EB53E5 /* Transform */, BE11825205D63C0A00EB53E5 /* TriangleFunctor */, 00CE2D40065BCD25003C8656 /* TriangleIndexFunctor */, - BE11825305D63C0A00EB53E5 /* UByte4 */, 009D9F8F081D7181001FA987 /* Uniform */, BE11825405D63C0A00EB53E5 /* UnitTestFramework */, BE11825505D63C0A00EB53E5 /* Vec2 */, @@ -12220,7 +12217,6 @@ BE11848405D70D1800EB53E5 /* Transform in Headers */, BE11848505D70D1800EB53E5 /* TriangleFunctor in Headers */, 00CE2D67065BCD69003C8656 /* TriangleIndexFunctor in Headers */, - BE11848605D70D1900EB53E5 /* UByte4 in Headers */, 009D9FB9081D7392001FA987 /* Uniform in Headers */, BE11848705D70D1900EB53E5 /* UnitTestFramework in Headers */, BE11848805D70D1900EB53E5 /* Vec2 in Headers */, diff --git a/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch b/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch index 8a847b0d8..66d91f159 100644 --- a/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch +++ b/Xcode/XcodeTemplates/OSG Application/osgApp_Prefix.pch @@ -165,7 +165,6 @@ #include #include #include -#include #include #include #include diff --git a/include/osg/UByte4 b/include/osg/UByte4 deleted file mode 100644 index 54da0fdbe..000000000 --- a/include/osg/UByte4 +++ /dev/null @@ -1,27 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSG_UBYTE4 -#define OSG_UBYTE4 1 - -#include - -namespace osg { - -#ifdef USE_DEPRECATED_API - typedef UByte4 Vec4ub; -#endif - -} // end of namespace osg - -#endif