Changeset 8460 in orxonox.OLD

Timestamp:

Jun 15, 2006, 2:08:43 PM (18 years ago)

Author:

bensch

Message:

more style

Location:

branches/gui

Files:

• scripts/tardis-scratch-checkout.pl (modified) (2 diffs)
• src/lib/gui/gl/glgui_style.cc (modified) (9 diffs)

branches/gui/scripts/tardis-scratch-checkout.pl

@@ -24 +24 @@
   print("Checking out ORXONOX from '$URL' to '$destination'\n");
 
-
-  open(SVN_CO, "svn co $URL $destination |");
-  while(<SVN_CO>){
+  if (-e $destination)
+  {
+   open(SVN_UP, "svn up $destination |");
+   while(<SVN_UP>) {
    print $_;
+   }
   }
-  
+  else
+  {
+   open(SVN_CO, "svn co $URL $destination |");
+   while(<SVN_CO>){
+    print $_;
+   }
+  }
   chdir("$destination");
 
@@ -44 +52 @@
     printf $_;
   }
-  
+
   print ("Executing make with opts -j3\n");
   open(MAKE, "make -j3|");

branches/gui/src/lib/gui/gl/glgui_style.cc

@@ -54 +54 @@
 
   void GLGuiStyle::setBorderLeft(float value, OrxGui::State state)
-{}
+  {
+    _style[state]._borderLeft = value;
+  }
 
   void GLGuiStyle::setBorderLeftS(float value, const std::string& state)
-  {}
+  {
+
+  }
 
 
@@ -67 +71 @@
 
   void GLGuiStyle::setBorderRight(float value, OrxGui::State state)
-{}
+  {
+    _style[state]._borderRight = value;
+  }
 
   void GLGuiStyle::setBorderRightS(float value, const std::string& state)
@@ -80 +86 @@
 
   void GLGuiStyle::setBorderTop(float value, OrxGui::State state)
-{}
+{
+  _style[state]._borderTop = value;
+}
 
   void GLGuiStyle::setBorderTopS(float value, const std::string& state)
@@ -93 +101 @@
 
   void GLGuiStyle::setBorderBottom(float value, OrxGui::State state)
-{}
+{
+  _style[state]._borderBottom = value;
+}
 
   void GLGuiStyle::setBorderBottomS(float value, const std::string& state)
@@ -106 +116 @@
 
   void GLGuiStyle::setTextSize(float value, OrxGui::State state)
-{}
+{
+  _style[state]._textSize= value;
+}
 
   void GLGuiStyle::setTextSizeS(float value, const std::string& state)
@@ -119 +131 @@
 
   void GLGuiStyle::setBackgroundColor(const Color& color, OrxGui::State state)
-{}
+{
+  _style[state]._backgroundColor = color;
+}
 
   void GLGuiStyle::setBackgroundColorS(float r, float g, float b, float a, const std::string& state)
@@ -132 +146 @@
 
   void GLGuiStyle::setBackgroundTexture(const Texture& texture, OrxGui::State state)
-{}
+{
+  _style[state]._backgroundTexture = texture;
+}
 
   void GLGuiStyle::setBackgroundTexture(const std::string& textureName, const std::string& state)
@@ -145 +161 @@
 
   void GLGuiStyle::setForegroundColor(const Color& color, OrxGui::State state)
-  {}
+  {
+    _style[state]._foregroundColor = color;
+  }
 
   void GLGuiStyle::setForegroundColorS(float r, float g, float b, float a, const std::string& state)
@@ -159 +177 @@
   void GLGuiStyle::setFeaturePosition(const std::string& featurePosition)
   {
-
   }