Changeset 5374 in orxonox.OLD for trunk

Timestamp:

Oct 13, 2005, 1:04:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cool shell-commands for loading images and setting colors

Location:

trunk/src/lib

Files:

• graphics/importer/material.cc (modified) (1 diff)
• shell/shell.cc (modified) (3 diffs)
• shell/shell.h (modified) (2 diffs)
• shell/shell_command.cc (modified) (1 diff)

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

@@ -39 +39 @@
 
   this->setIllum(3);
-  this->setDiffuse(0,0,0);
+  this->setDiffuse(1,1,1);
   this->setAmbient(0,0,0);
   this->setSpecular(.5,.5,.5);

trunk/src/lib/shell/shell.cc

@@ -43 +43 @@
     ->setAlias("hide");
 SHELL_COMMAND(textsize, Shell, setTextSize)
-    ->describe("Sets the size of the Text (size, linespacing)")
+    ->describe("Sets the size of the Text size, linespacing")
     ->defaultValues(1, 15, 0);
+SHELL_COMMAND(textcolor, Shell, setTextColor)
+    ->describe("Sets the Color of the Shells Text (red, green, blue, alpha)")
+    ->defaultValues(4, SHELL_DEFAULT_TEXT_COLOR);
+SHELL_COMMAND(backgroundcolor, Shell, setBackgroundColor)
+    ->describe("Sets the Color of the Shells Background (red, green, blue, alpha)")
+    ->defaultValues(4, SHELL_DEFAULT_BACKGROUND_COLOR);
+SHELL_COMMAND(backgroundimage, Shell, setBackgroundImage)
+    ->describe("sets the background image to load for the Shell");
 SHELL_COMMAND(font, Shell, setFont)
     ->describe("Sets the font of the Shell")
@@ -82 +90 @@
 
   this->rebuildText();
+
   this->setTextColor(SHELL_DEFAULT_TEXT_COLOR);
   this->setBackgroundColor(SHELL_DEFAULT_BACKGROUND_COLOR);
@@ -221 +230 @@
   this->backgroundMaterial->setTransparency(a);
 }
+
+/**
+ * sets a nice background image to the Shell's background
+ * @param fileName the filename of the Image to load
+ */
+void Shell::setBackgroundImage(const char* fileName)
+{
+  this->backgroundMaterial->setDiffuseMap(fileName);
+}
+
 
 /**

trunk/src/lib/shell/shell.h

@@ -16 +16 @@
 
 #define         SHELL_DEFAULT_FONT              "fonts/dpquake_.ttf"
-#define         SHELL_DEFAULT_TEXT_COLOR        1,0,0,1
-#define         SHELL_DEFAULT_BACKGROUND_COLOR  0,0,.8,.8
+#define         SHELL_DEFAULT_TEXT_COLOR        1.0f, 0.0f, 0.0f, 1.0f
+#define         SHELL_DEFAULT_BACKGROUND_COLOR  0.0f, 0.0f, 0.8f, 0.8f
 
 // FORWARD DECLARATION
@@ -58 +58 @@
     void setTextColor(float r, float g, float b, float a);
     void setBackgroundColor(float r, float g, float b, float a);
+    void setBackgroundImage(const char* fileName);
 
     void resetValues();

trunk/src/lib/shell/shell_command.cc

@@ -504 +504 @@
           objectPointer = objectList->firstElement();
       }
-      printf("test\n");
       // match a function.
       if (commandClass != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.getCount() >= 3)))