Changeset 6145 in orxonox.OLD

Timestamp:

Dec 16, 2005, 11:46:55 PM (18 years ago)

Author:

patrick

Message:

trunk: fixed the network bug, uninitialized variable

Location:

trunk/src/lib

Files:

• graphics/importer/texture.cc (modified) (2 diffs)
• network/synchronizeable.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/texture.cc

@@ -260 +260 @@
   glBindTexture(GL_TEXTURE_2D, texture);
 
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, /*GL_LINEAR*/ GL_LINEAR_MIPMAP_LINEAR);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, /*GL_LINEAR*/ GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
   /* control the mipmap levels */
   glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, -100);
@@ -289 +292 @@
     PRINTF(1)("Error while loading texture, gluBuild2DMipmaps returned %i\n", errorCode);
 
-#define max(a,b) (a>b)?a:b
-  mipmapLevel = (int)(log2f(max(surface->w, surface->h)));
-#undef max
-  PRINTF(5)("Built the texture mipmpaps, got: %i levels of detail\n", mipmapLevel);
+// #define max(a,b) (a>b)?a:b
+//   mipmapLevel = (int)(log2f(max(surface->w, surface->h)));
+// #undef max
+//   PRINTF(5)("Built the texture mipmpaps, got: %i levels of detail\n", mipmapLevel);
 
   /* now actualy load the mipmaps into the graphics memory */
-  glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 1, GL_TEXTURE_WIDTH, &mipmapWidth);
-  glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 1, GL_TEXTURE_WIDTH, &mipmapHight);
-  PRINTF(5)(" Mipmap at level %i has a %ix%i resolution\n", 1, mipmapWidth, mipmapHight);
-  glTexImage2D(GL_PROXY_TEXTURE_2D,
-               1,
-               GL_RGBA,
-               mipmapWidth, mipmapHight,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               NULL
-               );
+//   glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 1, GL_TEXTURE_WIDTH, &mipmapWidth);
+//   glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 1, GL_TEXTURE_WIDTH, &mipmapHight);
+//   PRINTF(5)(" Mipmap at level %i has a %ix%i resolution\n", 1, mipmapWidth, mipmapHight);
+//   glTexImage2D(GL_PROXY_TEXTURE_2D,
+//                1,
+//                GL_RGBA,
+//                mipmapWidth, mipmapHight,
+//                0,
+//                GL_RGBA,
+//                GL_UNSIGNED_BYTE,
+//                NULL
+//                );
 
   glBindTexture(GL_TEXTURE_2D, 0);

trunk/src/lib/network/synchronizeable.cc

@@ -32 +32 @@
   hostID = NetworkManager::getInstance()->getHostID();
   uniqueID = -1;
+  this->networkStream = NULL;
   //state = ?;
 
@@ -42 +43 @@
 {
   this->setName(name);
+  this->networkStream = NULL;
 }