Skip to content

Commit

Permalink
Small updates for oF 0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@dongle
dongle committed Nov 11, 2015
1 parent f711e85 commit 2254e93
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions src/CollageTexture.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ void CollageTexture::allocate(int w, int h, int internalGlDataType, int internal
texData.textureTarget = GL_TEXTURE_2D;
}

texData.glTypeInternal = internalGlDataType;
texData.glInternalFormat = internalGlDataType;


// MEMO: todo, add more types
switch(texData.glTypeInternal) {
switch(texData.glInternalFormat) {
#ifndef TARGET_OPENGLES
case GL_RGBA32F_ARB:
case GL_RGBA16F_ARB:
Expand Down Expand Up @@ -121,10 +121,10 @@ void CollageTexture::allocate(int w, int h, int internalGlDataType, int internal
// can't do this on OpenGL ES: on full-blown OpenGL,
// internalGlDataType and glDataType (GL_LUMINANCE below)
// can be different; on ES they must be exactly the same.
// glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint)texData.tex_w, (GLint)texData.tex_h, 0, GL_LUMINANCE, PIXEL_TYPE, 0); // init to black...
glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint) texData.tex_w, (GLint) texData.tex_h, 0, internal.glType, internal.pixelType, 0); // init to black...
// glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, (GLint)texData.tex_w, (GLint)texData.tex_h, 0, GL_LUMINANCE, PIXEL_TYPE, 0); // init to black...
glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, (GLint) texData.tex_w, (GLint) texData.tex_h, 0, internal.glType, internal.pixelType, 0); // init to black...
#else
glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, texData.tex_w, texData.tex_h, 0, texData.glTypeInternal, GL_UNSIGNED_BYTE, 0);
glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, texData.tex_w, texData.tex_h, 0, texData.glInternalFormat, GL_UNSIGNED_BYTE, 0);
#endif


Expand All @@ -144,7 +144,7 @@ void CollageTexture::pasteImage(int x, int y, string textureName, int glType)
{
ofImage loader;
loader.setUseTexture(false);
loader.loadImage(textureName);
loader.load(textureName);

pasteImage(x, y, loader.getWidth(), loader.getHeight(), loader.getPixels(), glType);

Expand Down
16 changes: 8 additions & 8 deletions src/LinearTexture.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ void LinearTexture::loadImage(string textureName)
{
ofImage loader;
loader.setUseTexture(false);
loader.loadImage(textureName);
loader.load(textureName);

int glType = GL_RGB;

if(loader.bpp==32){
if(loader.getImageType() == OF_IMAGE_COLOR_ALPHA){
glType = GL_RGBA;

}
Expand All @@ -32,7 +32,7 @@ void LinearTexture::loadTexture(string textureName, int glType)
{
ofImage loader;
loader.setUseTexture(false);
loader.loadImage(textureName);
loader.load(textureName);
allocate(loader.getWidth(), loader.getHeight(), glType);
loadData(loader.getPixels(), loader.getWidth(), loader.getHeight(), glType);

Expand Down Expand Up @@ -65,11 +65,11 @@ void LinearTexture::allocate(int w, int h, int internalGlDataType, bool bUseARBE
texData.textureTarget = GL_TEXTURE_2D;
}

texData.glTypeInternal = internalGlDataType;
texData.glInternalFormat = internalGlDataType;


// MEMO: todo, add more types
switch(texData.glTypeInternal) {
switch(texData.glInternalFormat) {
#ifndef TARGET_OPENGLES
case GL_RGBA32F_ARB:
case GL_RGBA16F_ARB:
Expand Down Expand Up @@ -111,10 +111,10 @@ void LinearTexture::allocate(int w, int h, int internalGlDataType, bool bUseARBE
// can't do this on OpenGL ES: on full-blown OpenGL,
// internalGlDataType and glDataType (GL_LUMINANCE below)
// can be different; on ES they must be exactly the same.
// glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint)texData.tex_w, (GLint)texData.tex_h, 0, GL_LUMINANCE, PIXEL_TYPE, 0); // init to black...
glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint) texData.tex_w, (GLint) texData.tex_h, 0, internal.glType, internal.pixelType, 0); // init to black...
// glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, (GLint)texData.tex_w, (GLint)texData.tex_h, 0, GL_LUMINANCE, PIXEL_TYPE, 0); // init to black...
glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, (GLint) texData.tex_w, (GLint) texData.tex_h, 0, internal.glType, internal.pixelType, 0); // init to black...
#else
glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, texData.tex_w, texData.tex_h, 0, internal.glTypeInternal, GL_UNSIGNED_BYTE, 0);
glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, texData.tex_w, texData.tex_h, 0, internal.glInternalFormat, GL_UNSIGNED_BYTE, 0);
#endif


Expand Down
16 changes: 8 additions & 8 deletions src/PixelTexture.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ void PixelTexture::loadImage(string textureName)
{
ofImage loader;
loader.setUseTexture(false);
loader.loadImage(textureName);
loader.load(textureName);

int glType = GL_RGB;

if(loader.bpp==32){
if(loader.getImageType() == OF_IMAGE_COLOR_ALPHA){
glType = GL_RGBA;

}
Expand All @@ -32,7 +32,7 @@ void PixelTexture::loadTexture(string textureName, int glType)
{
ofImage loader;
loader.setUseTexture(false);
loader.loadImage(textureName);
loader.load(textureName);
allocate(loader.getWidth(), loader.getHeight(), glType);
loadData(loader.getPixels(), loader.getWidth(), loader.getHeight(), glType);

Expand Down Expand Up @@ -65,11 +65,11 @@ void PixelTexture::allocate(int w, int h, int internalGlDataType, bool bUseARBEx
texData.textureTarget = GL_TEXTURE_2D;
}

texData.glTypeInternal = internalGlDataType;
texData.glInternalFormat = internalGlDataType;


// MEMO: todo, add more types
switch(texData.glTypeInternal) {
switch(texData.glInternalFormat) {
#ifndef TARGET_OPENGLES
case GL_RGBA32F_ARB:
case GL_RGBA16F_ARB:
Expand Down Expand Up @@ -111,10 +111,10 @@ void PixelTexture::allocate(int w, int h, int internalGlDataType, bool bUseARBEx
// can't do this on OpenGL ES: on full-blown OpenGL,
// internalGlDataType and glDataType (GL_LUMINANCE below)
// can be different; on ES they must be exactly the same.
// glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint)texData.tex_w, (GLint)texData.tex_h, 0, GL_LUMINANCE, PIXEL_TYPE, 0); // init to black...
glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint) texData.tex_w, (GLint) texData.tex_h, 0, internal.glType, internal.pixelType, 0); // init to black...
// glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, (GLint)texData.tex_w, (GLint)texData.tex_h, 0, GL_LUMINANCE, PIXEL_TYPE, 0); // init to black...
glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, (GLint) texData.tex_w, (GLint) texData.tex_h, 0, internal.glType, internal.pixelType, 0); // init to black...
#else
glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, texData.tex_w, texData.tex_h, 0, texData.glTypeInternal, GL_UNSIGNED_BYTE, 0);
glTexImage2D(texData.textureTarget, 0, texData.glInternalFormat, texData.tex_w, texData.tex_h, 0, texData.glInternalFormat, GL_UNSIGNED_BYTE, 0);
#endif


Expand Down
2 changes: 1 addition & 1 deletion src/ofxSpriteSheetRenderer.cpp
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ bool ofxSpriteSheetRenderer::addLine(ofVec2f a, ofVec2f b, int width, int layer,


//based off http://answers.oreilly.com/topic/1669-how-to-render-anti-aliased-lines-with-textures-in-ios-4/
ofVec2f e = (b - a).normalized() * width;
ofVec2f e = (b - a).getNormalized() * width;

ofVec2f N = ofVec2f(-e.y, e.x);
ofVec2f S = -N;
Expand Down

0 comments on commit 2254e93

Please sign in to comment.