load texture into shader

underdoeg · Aug 11, 2014 · d8dd44e · d8dd44e
1 parent b94e658
commit d8dd44e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Material.cpp b/src/Material.cpp
@@ -34,8 +34,14 @@ void Material::begin() {
 	}
 
 	for(ofShader* shader: shaders) {
-		if(shader->isLoaded())
+		if(shader->isLoaded()) {
 			shader->begin();
+			if(textures.size()>0) {
+				if(textures[0]->img.isAllocated()) {
+					shader->setUniformTexture("tex0", textures[0]->img.getTextureReference(), 0);
+				}
+			}
+		}
 	}
 }
 

diff --git a/src/Object.cpp b/src/Object.cpp
@@ -109,13 +109,17 @@ bool Object::isVisible() {
 }
 
 void Object::hide() {
+	if(!visible)
+		return;
 	visible = false;
 	ObjectEventArgs args;
 	args.obj = this;
 	ofNotifyEvent(onHide, args);
 }
 
 void Object::show() {
+	if(visible)
+		return;
 	visible = true;
 	ObjectEventArgs args;
 	args.obj = this;