Remove changes

Author: danoli3

libs/openFrameworks/gl/ofMaterial.cpp

@@ -1350,10 +1350,6 @@ void ofMaterial::setCustomUniformTexture(const std::string & name, int textureTa
 	uniformstex[name] = {textureTarget, textureID, textureLocation, shaderDefine};
 }
 
-ofMaterial::Data ofMaterial::getData() const {
-	return ofMaterial::Data();
-}
-
 //--------------------------------------------------------
 bool ofMaterial::removeCustomUniformTexture(const ofMaterialTextureType& aMaterialTextureType) {
 	return removeCustomUniformTexture(getUniformName(aMaterialTextureType));
@@ -1500,7 +1496,6 @@ const std::string ofMaterial::getDefinesString() const {
 
 #include "shaders/pbr.vert"
 #include "shaders/pbr.frag"
-#include "ofMaterialBaseTypes.h"
 
 
 namespace{
@@ -1623,12 +1618,3 @@ namespace{
 		return header+source;
 	}
 }
-
-void
-ofBaseMaterial::uploadMatrices(const ofShader &shader, ofGLProgrammableRenderer &renderer) const {
-
-}
-
-bool ofBaseMaterial::isBound() const {
-    return false;
-}

libs/openFrameworks/gl/ofTexture.cpp

@@ -163,7 +163,27 @@ static void release(GLuint id){
 	}
 }
 
+#ifdef TARGET_ANDROID
+static set<ofTexture*> & allTextures(){
+	static set<ofTexture*> * allTextures = new set<ofTexture*>;
+	return *allTextures;
+}
+
+static void registerTexture(ofTexture * texture){
+	allTextures().insert(texture);
+}
+
+static void unregisterTexture(ofTexture * texture){
+	allTextures().erase(texture);
+}
 
+void ofRegenerateAllTextures(){
+	for(auto tex: allTextures()){
+		tex->clear();
+	}
+}
+
+#endif
 
 //----------------------------------------------------------
 ofTexture::ofTexture(){
@@ -1273,33 +1293,3 @@ float ofTexture::getHeight() const {
 float ofTexture::getWidth() const {
 	return texData.width;
 }
-
-void ofTexture::enableTextureTarget(int textureLocation) const {
-
-}
-
-void ofTexture::disableTextureTarget(int textureLocation) const {
-
-}
-
-#ifdef TARGET_ANDROID
- set<ofTexture*> & ofTexture::allTextures(){
-	static set<ofTexture*> * allTextures = new set<ofTexture*>;
-	return *allTextures;
-}
-
- void ofTexture::registerTexture(ofTexture * texture){
-	allTextures().insert(texture);
-}
-
- void ofTexture::unregisterTexture(ofTexture * texture){
-	allTextures().erase(texture);
-}
-
-void ofTexture::ofRegenerateAllTextures(){
-	for(auto tex: allTextures()){
-		tex->clear();
-	}
-}
-
-#endif