summaryrefslogtreecommitdiff
path: root/gui/src/chainImage.h
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2018-11-18 01:26:53 +0000
committerTim Redfern <tim@getdrop.com>2018-11-18 01:26:53 +0000
commit7ebbce5e53efce80bc48fa6f492451df4107e8b5 (patch)
tree5f696004da987700ccbc6bd3f58f447bd728d900 /gui/src/chainImage.h
parent7e0ccebd5167da4d0bb4de1fb9b0ebb68f2bbe82 (diff)
alpha modeHEADmaster
Diffstat (limited to 'gui/src/chainImage.h')
-rw-r--r--gui/src/chainImage.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/gui/src/chainImage.h b/gui/src/chainImage.h
index 75f290e..cebb940 100644
--- a/gui/src/chainImage.h
+++ b/gui/src/chainImage.h
@@ -45,8 +45,21 @@ class chainImage : public ofImage{
bool tload(std::string _filename){
printf("tload : %s\n",_filename.c_str());
filename=_filename;
+
+ //ofTexture& texture=getTexture();
+ //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+
if (ofImage::load(filename)){
+
+ //ofDisableArbTex();
+ //GLint minFilter=GL_LINEAR_MIPMAP_LINEAR;
+ //GLint magFilter=GL_LINEAR;
+ //ofTexture& texture=getTexture();
+ ///texture.generateMipmap();
+ //texture.setTextureMinMagFilter(minFilter,magFilter);
+
makeThumbnail();
+
//setImageType(OF_IMAGE_COLOR_ALPHA);
//could there be a way to load without committing the texture
//setUseTexture(false);
@@ -83,7 +96,7 @@ class chainImage : public ofImage{
void updateRotationTimeline();
- void drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f,float startGamma=1.0f);
+ void drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, bool alpha =false,float intensity=1.0f, float zoomMultiplier=1.0f,float startGamma=1.0f);
void gpu_drawChain(float fadeIn=DEFAULT_FADEIN,bool additive =false, float intensity=1.0f, float zoomMultiplier=1.0f);
void gpu_drawImage();