Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY #2622

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

support for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY #2622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9937168
Merge branch 'master' of github.com:openframeworks/openFrameworks
joshuajnoble Oct 17, 2013
722ad28
adding 3D textures
joshuajnoble Oct 17, 2013
5ba97b3
changing from custom method to just overloaded one
joshuajnoble Oct 17, 2013
963fa00
removing debug & old comments
joshuajnoble Oct 17, 2013
6bda9c8
no need to draw 3D textures
joshuajnoble Oct 17, 2013
dd01c9b
undoing commits for tutorial update, leaving those in a different PR
joshuajnoble Oct 18, 2013
00c4c1a
fixing allocation bug in loadData()
joshuajnoble Oct 18, 2013
a6d5940
cleaning up impl of loadData()
joshuajnoble Oct 18, 2013
5239308
Merge branch 'master' of github.com:openframeworks/openFrameworks int…
joshuajnoble Oct 21, 2013
00b64aa
Merge branch 'master' of github.com:openframeworks/openFrameworks int…
joshuajnoble Oct 29, 2013
71d6016
updating
joshuajnoble Oct 29, 2013
aa64062
GL3.x+ 3D texturing
joshuajnoble Oct 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
no need to draw 3D textures
  • Loading branch information
@joshuajnoble
joshuajnoble committed Oct 17, 2013
commit 6bda9c82c4e259d8199c0f86aaa2fd0701d0bd2f
173 changes: 40 additions & 133 deletions libs/openFrameworks/gl/ofTexture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,9 @@ void ofTexture::allocate(const ofTextureData & textureData, int glFormat, int pi
texData.tex_v = textureData.tex_v;
texData.tex_z = textureData.tex_z;

//void glTexImage3D( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * data);


glTexImage3D(texData.textureTarget, 0, texData.glTypeInternal, (GLint)texData.tex_w, (GLint)texData.tex_h, (GLint)texData.depth, 0, glFormat, pixelType, 0); // init to black...
}
else
Expand Down Expand Up @@ -627,7 +630,11 @@ void ofTexture::loadData(const void * data, int w, int h, int glFormat, int glTy
//----------------------------------------------------------
void ofTexture::loadData(vector<ofPixels> &texArray, int w, int h, int depth, int glFormat, int glType){

// compute new tex co-ords based on the ratio of data's w, h to texture w,h;
/*if(w > texData.tex_w || h > texData.tex_h) {
allocate(w, h, glFormat, glFormat, glType);
}*/

// compute new tex co-ords based on the ratio of data's w, h to texture w,h;
#ifndef TARGET_OPENGLES
if (texData.textureTarget == GL_TEXTURE_RECTANGLE_ARB){
texData.tex_t = w;
Expand All @@ -640,6 +647,26 @@ void ofTexture::loadData(vector<ofPixels> &texArray, int w, int h, int depth, in
}


// ok this is an ultra annoying bug :
// opengl texels and linear filtering -
// when we have a sub-image, and we scale it
// we can clamp the border pixels to the border,
// but the borders of the sub image get mixed with
// neighboring pixels...
// grr...
//
// the best solution would be to pad out the image
// being uploaded with 2 pixels on all sides, and
// recompute tex_t coordinates..
// another option is a gl_arb non pow 2 textures...
// the current hack is to alter the tex_t, tex_u calcs, but
// that makes the image slightly off...
// this is currently being done in draw...
//
// we need a good solution for this..
//
// http:https://www.opengl.org/discussion_boards/ubb/ultimatebb.php?ubb=get_topic;f=3;t=014770#000001
// http:https://www.opengl.org/discussion_boards/ubb/ultimatebb.php?ubb=get_topic;f=3;t=014770#000001


//Sosolimited: texture compression
Expand All @@ -652,6 +679,11 @@ void ofTexture::loadData(vector<ofPixels> &texArray, int w, int h, int depth, in
glBindTexture(texData.textureTarget, (GLuint) texData.textureID);
//glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint)w, (GLint)h, 0, glFormat, glType, data);

// just do 0 depth to start?
//glTexSubImage3D(texData.textureTarget, 0, 0, 0, 0, w, h, depth, glFormat, glType, data);

//void glTexImage3D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * data);

// when this texture needs to be shrunk to fit on small polygons, use linear interpolation of the texels to determine the color
glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
// when this texture needs to be magnified to fit on a big polygon, use linear interpolation of the texels to determine the color
Expand All @@ -670,6 +702,7 @@ void ofTexture::loadData(vector<ofPixels> &texArray, int w, int h, int depth, in
cout << sizeof(texels) << endl;

for ( int i = 0; i < texArray.size(); i++ ) {
cout << i << endl;
memcpy( &(texels[w*h*3*i]), texArray[i].getPixels(), w*h*3*sizeof(unsigned char));
}

Expand Down Expand Up @@ -731,6 +764,12 @@ void ofTexture::loadData(const void * data, int w, int h, int depth, int glForma
enableTextureTarget();

glBindTexture(texData.textureTarget, (GLuint) texData.textureID);
//glTexImage2D(texData.textureTarget, 0, texData.glTypeInternal, (GLint)w, (GLint)h, 0, glFormat, glType, data);

// just do 0 depth to start?
//glTexSubImage3D(texData.textureTarget, 0, 0, 0, 0, w, h, depth, glFormat, glType, data);

//void glTexImage3D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * data);

// when this texture needs to be shrunk to fit on small polygons, use linear interpolation of the texels to determine the color
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
Expand Down Expand Up @@ -1121,138 +1160,6 @@ void ofTexture::draw(const ofPoint & p1, const ofPoint & p2, const ofPoint & p3,
unbind();
}

//----------------------------------------------------------
void ofTexture::draw3D(const ofVec3f & p1, const ofVec3f & p2, const ofVec3f & p3, const ofVec3f & p4){
/*
GLfloat tx0 = 0;
GLfloat ty0 = 0;
GLfloat tz0 = 0;
GLfloat tx1 = texData.tex_t;
GLfloat ty1 = texData.tex_u;
GLfloat tz1 = texData.tex_v;

quad.getVertices()[0].set(p1.x, p1.y, p1.z);
quad.getVertices()[1].set(p2.x, p2.y, p1.z);
quad.getVertices()[2].set(p3.x, p3.y, p1.z);
quad.getVertices()[3].set(p4.x, p4.y, p1.z);

quad.getTexCoords()[0].set(tx0,ty0,tz0);
quad.getTexCoords()[1].set(tx1,ty0,tz0);
quad.getTexCoords()[2].set(tx1,ty1,tz1);
quad.getTexCoords()[3].set(tx0,ty1,tz1);

// make sure we are on unit 0 - we may change this when setting shader samplers
// before glEnable or else the shader gets confused
/// ps: maybe if bUsingArbTex is enabled we should use glActiveTextureARB?
glActiveTexture(GL_TEXTURE0);

bind();
quad.draw();
unbind(); */
}

//----------------------------------------------------------
void ofTexture::drawSubsection3D(float x, float y, float z, float w, float h, float d, float sx, float sy, float sz, float sw, float sh, float sd) {


// GLfloat px0 = x; // up to you to get the aspect ratio right
// GLfloat py0 = y;
// GLfloat pz0 = z;
// GLfloat px1 = w+x;
// GLfloat py1 = h+y;
// GLfloat pz1 = z+d;
//
//
// if (texData.bFlipTexture == ofIsVFlipped()){
// swap(py0,py1);
// }
//
// // for rect mode center, let's do this:
// if (ofGetRectMode() == OF_RECTMODE_CENTER){
// px0 = -w/2;
// py0 = -h/2;
// px1 = +w/2;
// py1 = +h/2;
// }
//
// //we translate our drawing points by our anchor point.
// //we still respect ofRectMode so if you have rect mode set to
// //OF_RECTMODE_CENTER your anchor will be relative to that.
// GLfloat anchorX;
// GLfloat anchorY;
//
// if(bAnchorIsPct){
// anchorX = anchor.x * w;
// anchorY = anchor.y * h;
// }else{
// anchorX = anchor.x;
// anchorY = anchor.y;
// }
//
// px0 -= anchorX;
// py0 -= anchorY;
// px1 -= anchorX;
// py1 -= anchorY;
//
//
// // -------------------------------------------------
// // complete hack to remove border artifacts.
// // slightly, slightly alters an image, scaling...
// // to remove the border.
// // we need a better solution for this, but
// // to constantly add a 2 pixel border on all uploaded images
// // is insane..
//
// GLfloat offsetw = 0.0f;
// GLfloat offseth = 0.0f;
//
// if (!ofGLSupportsNPOTTextures() && bTexHackEnabled) {
// offsetw = 1.0f / (texData.tex_w);
// offseth = 1.0f / (texData.tex_h);
// }
// // -------------------------------------------------
//
// ofPoint topLeft = getCoordFromPoint(sx, sy);
// ofPoint bottomRight = getCoordFromPoint(sx + sw, sy + sh);
//
// GLfloat tx0 = topLeft.x + offsetw;
// GLfloat ty0 = topLeft.y + offseth;
// GLfloat tz0 = topLeft.z;
// GLfloat tx1 = bottomRight.x - offsetw;
// GLfloat ty1 = bottomRight.y - offseth;
// GLfloat tz1 = bottomRight.z;
//
// /*if(z>0 || z<0){
// ofPushMatrix();
//
// ofTranslate(0,0,z);
// }*/
// quad.getVertices()[0].set(px0,py0,z);
// quad.getVertices()[1].set(px1,py0,z);
// quad.getVertices()[2].set(px1,py1,z);
// quad.getVertices()[3].set(px0,py1,z);
//
// quad.getTexCoords()[0].set(tx0,ty0,tz0);
// quad.getTexCoords()[1].set(tx1,ty0,tz0);
// quad.getTexCoords()[2].set(tx1,ty1,tz1);
// quad.getTexCoords()[3].set(tx0,ty1,tz1);
//
//
// // make sure we are on unit 0 - we may change this when setting shader samplers
// // before glEnable or else the shader gets confused
// /// ps: maybe if bUsingArbTex is enabled we should use glActiveTextureARB?
// glActiveTexture(GL_TEXTURE0);
//
// bind();
// quad.draw();
// unbind();
//
// /*if(z>0 || z<0){
// ofPopMatrix();
// }*/

}


//----------------------------------------------------------
void ofTexture::readToPixels(ofPixels & pixels){
Expand Down
3 changes: 0 additions & 3 deletions libs/openFrameworks/gl/ofTexture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,6 @@ class ofTexture : public ofBaseDraws {
void drawSubsection(float x, float y, float w, float h, float sx, float sy, float sw, float sh);
void drawSubsection(float x, float y, float z, float w, float h, float sx, float sy, float sw, float sh);

void draw3D(const ofVec3f & p1, const ofVec3f & p2, const ofVec3f & p3, const ofVec3f & p4);
void drawSubsection3D(float x, float y, float z, float w, float h, float d, float sx, float sy, float sz, float sw, float sh, float sd);

void readToPixels(ofPixels & pixels);
void readToPixels(ofShortPixels & pixels);
void readToPixels(ofFloatPixels & pixels);
Expand Down