fixed material transparency enable/disable

Pfeil · Apr 17, 2016 · ad8e549 · ad8e549
1 parent f126a94
commit ad8e549
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/core/objects/material/VRMaterial.cpp b/src/core/objects/material/VRMaterial.cpp
@@ -678,7 +678,8 @@ void VRMaterial::setTransparency(float c) {
     //enableTransparency();
 }
 
-void VRMaterial::enableTransparency() {
+void VRMaterial::enableTransparency(bool user_override) {
+    force_transparency = user_override;
     auto md = mats[activePass];
     if (md->blendChunk == 0) {
         md->blendChunk = BlendChunk::create();
@@ -688,7 +689,9 @@ void VRMaterial::enableTransparency() {
     }
 }
 
-void VRMaterial::clearTransparency() {
+void VRMaterial::clearTransparency(bool user_override) {
+    if (user_override) force_transparency = false;
+    if (force_transparency && !user_override) return;
     auto md = mats[activePass];
     md->clearChunk(md->blendChunk);
     md->clearChunk(md->depthChunk);

diff --git a/src/core/objects/material/VRMaterial.h b/src/core/objects/material/VRMaterial.h
@@ -38,6 +38,7 @@ class VRMaterial : public VRObject {
         MultiPassMaterialMTRecPtr passes;
         vector<VRMatData*> mats;
         int activePass = 0;
+        bool force_transparency = false;
         bool deferred = false;
 
         VRObjectPtr copy(vector<VRObjectPtr> children);
@@ -95,8 +96,8 @@ class VRMaterial : public VRObject {
         void setEmission(Color3f c);
         void setTransparency(float t);
         void setDepthTest(int d);
-        void enableTransparency();
-        void clearTransparency();
+        void enableTransparency(bool user_override = false);
+        void clearTransparency(bool user_override = false);
         void setLineWidth(int w, bool smooth = true);
         void setPointSize(int s, bool smooth = true);
         void setWireFrame(bool b);

diff --git a/src/core/scripting/VRPyMaterial.cpp b/src/core/scripting/VRPyMaterial.cpp
@@ -49,13 +49,13 @@ PyMethodDef VRPyMaterial::methods[] = {
 
 PyObject* VRPyMaterial::enableTransparency(VRPyMaterial* self) {
 	if (self->objPtr == 0) { PyErr_SetString(err, "VRPyMaterial::enableTransparency, C obj is invalid"); return NULL; }
-	self->objPtr->enableTransparency();
+	self->objPtr->enableTransparency(true);
 	Py_RETURN_TRUE;
 }
 
 PyObject* VRPyMaterial::clearTransparency(VRPyMaterial* self) {
 	if (self->objPtr == 0) { PyErr_SetString(err, "VRPyMaterial::clearTransparency, C obj is invalid"); return NULL; }
-	self->objPtr->clearTransparency();
+	self->objPtr->clearTransparency(true);
 	Py_RETURN_TRUE;
 }