From 9ba9ac64cb358c78ef8d312e067fc714b7cb9237 Mon Sep 17 00:00:00 2001
From: josh <josh@5bef9df8-b654-44bb-925b-0ff18baa8f8c>
Date: Thu, 13 Nov 2008 23:32:53 +0000
Subject: [PATCH] transparency working using texture with color {1,1,1,0.5}

git-svn-id: svn://anubis/dwscr/trunk@105 5bef9df8-b654-44bb-925b-0ff18baa8f8c
---
 ss/LightBounce.cc | 8 +++++---
 ss/LogoBox.cpp    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ss/LightBounce.cc b/ss/LightBounce.cc
index 4df4913..5885f43 100644
--- a/ss/LightBounce.cc
+++ b/ss/LightBounce.cc
@@ -122,17 +122,19 @@ LightBounce::LightBounce(SSMain * _SSMain) : SSMode(_SSMain)
     glPushAttrib(GL_POLYGON_BIT);   /* store CULL_FACE settings */
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-#if 0
+
     GLuint tex;
     glGenTextures(1, &tex);
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, tex);
-    GLfloat pixels[] = {0, 0, 0, 0.5};
+    GLfloat pixels[] = {1, 1, 1, 0.5};
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_FLOAT, pixels);
     glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-#endif
+
+#if 0
     glEnable(GL_COLOR_MATERIAL);
     glColor4f(1, 1, 1, 0.3);
+#endif
 }
 
 LightBounce::~LightBounce()
diff --git a/ss/LogoBox.cpp b/ss/LogoBox.cpp
index fc766a9..8817516 100644
--- a/ss/LogoBox.cpp
+++ b/ss/LogoBox.cpp
@@ -41,7 +41,7 @@ LogoBox::LogoBox()
         WFObj obj;
         if (obj.load("dwlogo.obj", NULL, &LoadFile))
         {
-            _logoList = obj.render();
+            _logoList = obj.render(false);
             const float * aabb = obj.getAABB();
             memcpy(_logoAABB, aabb, sizeof(_logoAABB));