Renamed ImageTexture file to BindImageTexture to better fit it's OpenGL implementaton.

Improved the indentation so it's more consistent with the rest of the OSG.
This commit is contained in:
Robert Osfield
2018-01-01 11:10:55 +00:00
parent 1f4ae0425c
commit eb72f3ed30
5 changed files with 119 additions and 115 deletions

View File

@@ -1,10 +1,10 @@
#include <osg/ImageTexture>
#include <osg/BindImageTexture>
using namespace osg;
int ImageTextureBinding::compare(const osg::StateAttribute &sa) const
int BindImageTexture::compare(const osg::StateAttribute &sa) const
{
COMPARE_StateAttribute_Types(ImageTextureBinding,sa)
COMPARE_StateAttribute_Types(BindImageTexture,sa)
// Compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_target)
COMPARE_StateAttribute_Parameter(_imageunit)
@@ -15,7 +15,7 @@ int ImageTextureBinding::compare(const osg::StateAttribute &sa) const
return 0;
}
void ImageTextureBinding::apply(osg::State&state) const
void BindImageTexture::apply(osg::State&state) const
{
if(_target.valid())
{

View File

@@ -28,6 +28,7 @@ SET(TARGET_H
${HEADER_PATH}/AudioStream
${HEADER_PATH}/AutoTransform
${HEADER_PATH}/Billboard
${HEADER_PATH}/BindImageTexture
${HEADER_PATH}/BlendColor
${HEADER_PATH}/BlendEquation
${HEADER_PATH}/BlendEquationi
@@ -96,7 +97,6 @@ SET(TARGET_H
${HEADER_PATH}/ImageSequence
${HEADER_PATH}/ImageStream
${HEADER_PATH}/ImageUtils
${HEADER_PATH}/ImageTexture
${HEADER_PATH}/io_utils
${HEADER_PATH}/KdTree
${HEADER_PATH}/Light
@@ -247,6 +247,7 @@ SET(TARGET_SRC
AudioStream.cpp
AutoTransform.cpp
Billboard.cpp
BindImageTexture.cpp
BlendColor.cpp
BlendEquation.cpp
BlendEquationi.cpp
@@ -308,7 +309,6 @@ SET(TARGET_SRC
ImageSequence.cpp
ImageStream.cpp
ImageUtils.cpp
ImageTexture.cpp
KdTree.cpp
Light.cpp
LightModel.cpp