Show
Ignore:
Timestamp:
12/22/14 11:35:33 (4 hours ago)
Author:
robert
Message:

Added comment about using -DCMAKE_DISABLE_FINDPACKAGE_* command line.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/Geometry.cpp

    r13522 r13557  
    17901790    _containsDeprecatedData = false; 
    17911791} 
     1792 
     1793//////////////////////////////////////////////////////////////////////////////////////////////////// 
     1794// 
     1795// deprecated_osg 
     1796 
     1797void deprecated_osg::Geometry::setNormalBinding(AttributeBinding ab) { osg::Geometry::setNormalBinding(static_cast<osg::Geometry::AttributeBinding>(ab)); } 
     1798deprecated_osg::Geometry::AttributeBinding deprecated_osg::Geometry::getNormalBinding() const { return static_cast<AttributeBinding>(osg::Geometry::getNormalBinding()); } 
     1799 
     1800void deprecated_osg::Geometry::setColorBinding(deprecated_osg::Geometry::AttributeBinding ab) { osg::Geometry::setColorBinding(static_cast<osg::Geometry::AttributeBinding>(ab)); } 
     1801deprecated_osg::Geometry::AttributeBinding deprecated_osg::Geometry::getColorBinding() const { return static_cast<AttributeBinding>(osg::Geometry::getColorBinding()); } 
     1802 
     1803void deprecated_osg::Geometry::setSecondaryColorBinding(deprecated_osg::Geometry::AttributeBinding ab) { osg::Geometry::setSecondaryColorBinding(static_cast<osg::Geometry::AttributeBinding>(ab)); } 
     1804deprecated_osg::Geometry::AttributeBinding deprecated_osg::Geometry::getSecondaryColorBinding() const { return static_cast<AttributeBinding>(osg::Geometry::getSecondaryColorBinding()); } 
     1805 
     1806void deprecated_osg::Geometry::setFogCoordBinding(deprecated_osg::Geometry::AttributeBinding ab) { osg::Geometry::setFogCoordBinding(static_cast<osg::Geometry::AttributeBinding>(ab)); } 
     1807deprecated_osg::Geometry::AttributeBinding deprecated_osg::Geometry::getFogCoordBinding() const { return static_cast<AttributeBinding>(osg::Geometry::getFogCoordBinding()); } 
     1808 
     1809void deprecated_osg::Geometry::setVertexAttribBinding(unsigned int index,deprecated_osg::Geometry::AttributeBinding ab) { osg::Geometry::setVertexAttribBinding(index, static_cast<osg::Geometry::AttributeBinding>(ab)); } 
     1810deprecated_osg::Geometry::AttributeBinding deprecated_osg::Geometry::getVertexAttribBinding(unsigned int index) const { return static_cast<AttributeBinding>(osg::Geometry::getVertexAttribBinding(index)); } 
     1811 
     1812void deprecated_osg::Geometry::setVertexAttribNormalize(unsigned int index,GLboolean norm) { osg::Geometry::setVertexAttribNormalize(index, norm); } 
     1813GLboolean deprecated_osg::Geometry::getVertexAttribNormalize(unsigned int index) const { return osg::Geometry::getVertexAttribNormalize(index); } 
     1814 
     1815void deprecated_osg::Geometry::setVertexIndices(osg::IndexArray* array) 
     1816{ 
     1817    if (_vertexArray.valid()) { _vertexArray->setUserData(array); if (array)  _containsDeprecatedData = true; } 
     1818    else { OSG_WARN<<"Geometry::setVertexIndicies(..) function failed as there is no vertex array to associate inidices with."<<std::endl; } 
     1819} 
     1820 
     1821const osg::IndexArray* deprecated_osg::Geometry::getVertexIndices() const 
     1822{ 
     1823    if (_vertexArray.valid()) return dynamic_cast<osg::IndexArray*>(_vertexArray->getUserData()); 
     1824    else return 0; 
     1825} 
     1826 
     1827void deprecated_osg::Geometry::setNormalIndices(osg::IndexArray* array) 
     1828{ 
     1829    if (_normalArray.valid()) { _normalArray->setUserData(array); if (array)  _containsDeprecatedData = true; } 
     1830    else { OSG_WARN<<"Geometry::setNormalIndicies(..) function failed as there is no normal array to associate inidices with."<<std::endl; } 
     1831} 
     1832 
     1833const osg::IndexArray* deprecated_osg::Geometry::getNormalIndices() const 
     1834{ 
     1835    if (_normalArray.valid()) return dynamic_cast<osg::IndexArray*>(_normalArray->getUserData()); 
     1836    else return 0; 
     1837} 
     1838 
     1839void deprecated_osg::Geometry::setColorIndices(osg::IndexArray* array) 
     1840{ 
     1841    if (_colorArray.valid()) { _colorArray->setUserData(array); if (array)  _containsDeprecatedData = true; } 
     1842    else { OSG_WARN<<"Geometry::setColorIndicies(..) function failed as there is no color array to associate inidices with."<<std::endl; } 
     1843} 
     1844 
     1845const osg::IndexArray* deprecated_osg::Geometry::getColorIndices() const 
     1846{ 
     1847    if (_colorArray.valid()) return dynamic_cast<osg::IndexArray*>(_colorArray->getUserData()); 
     1848    else return 0; 
     1849} 
     1850 
     1851void deprecated_osg::Geometry::setSecondaryColorIndices(osg::IndexArray* array) 
     1852{ 
     1853    if (_secondaryColorArray.valid()) { _secondaryColorArray->setUserData(array); if (array)  _containsDeprecatedData = true; } 
     1854    else { OSG_WARN<<"Geometry::setSecondaryColorArray(..) function failed as there is no secondary color array to associate inidices with."<<std::endl; } 
     1855} 
     1856 
     1857const osg::IndexArray* deprecated_osg::Geometry::getSecondaryColorIndices() const 
     1858{ 
     1859    if (_secondaryColorArray.valid()) return dynamic_cast<osg::IndexArray*>(_secondaryColorArray->getUserData()); 
     1860    else return 0; 
     1861} 
     1862 
     1863void deprecated_osg::Geometry::setFogCoordIndices(osg::IndexArray* array) 
     1864{ 
     1865    if (_fogCoordArray.valid()) { _fogCoordArray->setUserData(array); if (array)  _containsDeprecatedData = true; } 
     1866    else { OSG_WARN<<"Geometry::setFogCoordIndicies(..) function failed as there is no fog coord array to associate inidices with."<<std::endl; } 
     1867} 
     1868 
     1869const osg::IndexArray* deprecated_osg::Geometry::getFogCoordIndices() const 
     1870{ 
     1871    if (_fogCoordArray.valid()) return dynamic_cast<osg::IndexArray*>(_fogCoordArray->getUserData()); 
     1872    else return 0; 
     1873} 
     1874 
     1875void deprecated_osg::Geometry::setTexCoordIndices(unsigned int unit,osg::IndexArray* array) 
     1876{ 
     1877    if (unit<_texCoordList.size() && _texCoordList[unit].valid()) { _texCoordList[unit]->setUserData(array); if (array)  _containsDeprecatedData = true; } 
     1878    else { OSG_WARN<<"Geometry::setTexCoordIndices(..) function failed as there is no texcoord array to associate inidices with."<<std::endl; } 
     1879} 
     1880 
     1881const osg::IndexArray* deprecated_osg::Geometry::getTexCoordIndices(unsigned int unit) const 
     1882{ 
     1883    if (unit<_texCoordList.size() && _texCoordList[unit].valid()) return dynamic_cast<osg::IndexArray*>(_texCoordList[unit]->getUserData()); 
     1884    else return 0; 
     1885} 
     1886 
     1887void deprecated_osg::Geometry::setVertexAttribIndices(unsigned int index,osg::IndexArray* array) 
     1888{ 
     1889    if (index<_vertexAttribList.size() && _vertexAttribList[index].valid()) { _vertexAttribList[index]->setUserData(array); if (array)  _containsDeprecatedData = true; } 
     1890    else { OSG_WARN<<"Geometry::setVertexAttribIndices(..) function failed as there is no vertex attrib array to associate inidices with."<<std::endl; } 
     1891} 
     1892const osg::IndexArray* deprecated_osg::Geometry::getVertexAttribIndices(unsigned int index) const 
     1893{ 
     1894    if (index<_vertexAttribList.size() && _vertexAttribList[index].valid()) return dynamic_cast<osg::IndexArray*>(_vertexAttribList[index]->getUserData()); 
     1895    else return 0; 
     1896} 
     1897 
     1898 
     1899 
     1900 
     1901 
     1902 
     1903