Changeset 1571 for code/trunk

Timestamp:

Jun 9, 2008, 12:47:40 AM (17 years ago)

Author:

rgrieder

Message:

• changed console font to Monofur
• please check whether the character width is OK
• and UPDATE YOUR MEDIA REPO

Location:

code/trunk

Files:

• src/orxonox/console/InGameConsole.cc (modified) (3 diffs)
• visual_studio/base_properties.vsprops (modified) (3 diffs)

code/trunk/src/orxonox/console/InGameConsole.cc

@@ -47 +47 @@
 
 #define LINES 30
-#define CHAR_WIDTH1 7.78 //34 // fix this please - determine the char-width dynamically
-#define CHAR_WIDTH2 8.28 // fix this please - determine the char-width dynamically
-#define CHAR_WIDTH3 7.80 //78 // fix this please - determine the char-width dynamically
+#define CHAR_WIDTH1 7.45 //78 //34 // fix this please - determine the char-width dynamically
+#define CHAR_WIDTH2 CHAR_WIDTH1 //28 // fix this please - determine the char-width dynamically
+#define CHAR_WIDTH3 CHAR_WIDTH1 //80 //78 // fix this please - determine the char-width dynamically
 
 namespace orxonox
@@ -231 +231 @@
             this->consoleOverlayTextAreas_[i] = static_cast<TextAreaOverlayElement*>(this->om_->createOverlayElement("TextArea", "InGameConsoleTextArea" + Ogre::StringConverter::toString(i)));
             this->consoleOverlayTextAreas_[i]->setMetricsMode(Ogre::GMM_PIXELS);
-            this->consoleOverlayTextAreas_[i]->setFontName("Console");
+            this->consoleOverlayTextAreas_[i]->setFontName("Monofur");
             this->consoleOverlayTextAreas_[i]->setCharHeight(18);
             this->consoleOverlayTextAreas_[i]->setParameter("colour_top", "0.21 0.69 0.21");
@@ -485 +485 @@
                 width += CHAR_WIDTH3;
         }
-        this->consoleOverlayCursor_->setPosition(width + 5, this->windowH_ * InGameConsole::REL_HEIGHT - 20);
+        this->consoleOverlayCursor_->setPosition(width + 8, this->windowH_ * InGameConsole::REL_HEIGHT - 20);
     }
 

code/trunk/visual_studio/base_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\tolua&quot;;&quot;$(RootDir)src\ois&quot;;&quot;$(DependencyDir)include&quot;"
+                AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\tolua&quot;;&quot;$(RootDir)src\ois&quot;;&quot;$(LibDir)ogre-1.4.8\OgreMain\include&quot;;&quot;$(LibDir)boost-1.35.0&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)lua-5.1.3\src&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)openal-1.1\alut\include&quot;;&quot;$(LibDir)tcl-8.5.\generic&quot;;&quot;$(LibDir)zlib-1.2.3&quot;"
                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI"
                 WarningLevel="3"
@@ -33 +33 @@
         <UserMacro
                 Name="DependencyDir"
-                Value="$(RootDir)..\dependencies\"
+                Value="$(RootDir)..\lib_precompiled\"
         />
         <UserMacro
@@ -43 +43 @@
                 Value=""
         />
+        <UserMacro
+                Name="LibDir"
+                Value="$(RootDir)..\lib_src\"
+        />
 </VisualStudioPropertySheet>