[Orxonox-commit 973] r5696 - in data/trunk: . gui gui/looknfeel materials/programs materials/textures models

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-30 02:29:06 +0200 (Sun, 30 Aug 2009)
New Revision: 5696

Added:
   data/trunk/resources.oxr
Removed:
   data/trunk/backToPNG/
   data/trunk/defaultConfig/
   data/trunk/gui/configs/
   data/trunk/gui/layouts/
   data/trunk/gui/schemes/
   data/trunk/gui/scripts/
   data/trunk/levels/
   data/trunk/overlay/
   data/trunk/particle/
   data/trunk/resources.cfg
   data/trunk/tcl/
   data/trunk/tcl8.4/
   data/trunk/tcl8.5/
Modified:
   data/trunk/
   data/trunk/gui/looknfeel/TaharezLook.looknfeel
   data/trunk/materials/programs/ToonShaderPS.cg
   data/trunk/materials/programs/ToonShader_ps.frag
   data/trunk/materials/textures/OrxonoxBlack.tga
   data/trunk/models/satellitedish.mesh
Log:
Merged media_stripped branch back to data trunk.
PLEASE update your DATA_DIRECTORY!


Property changes on: data/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /data/branches/media_stripped:5591-5657

Modified: data/trunk/gui/looknfeel/TaharezLook.looknfeel
===================================================================
--- data/trunk/gui/looknfeel/TaharezLook.looknfeel	2009-08-30 00:22:00 UTC (rev 5695)
+++ data/trunk/gui/looknfeel/TaharezLook.looknfeel	2009-08-30 00:29:06 UTC (rev 5696)
@@ -1044,12 +1044,22 @@
     <WidgetLook name="TaharezLook/ProgressBar">
         <NamedArea name="ProgressArea">
             <Area>
-                <Dim type="LeftEdge" ><ImageDim imageset="TaharezLook" image="ProgressBarLeft" dimension="Width" /></Dim>
+                <Dim type="LeftEdge" >
+                    <ImageDim imageset="TaharezLook" image="ProgressBarLeft" dimension="Width">
+                        <DimOperator op="Divide">
+                            <AbsoluteDim value="2" />
+                        </DimOperator>
+                    </ImageDim>
+                </Dim>
                 <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
                 <Dim type="RightEdge" >
                     <UnifiedDim scale="1" type="RightEdge">
                         <DimOperator op="Subtract">
-                            <ImageDim imageset="TaharezLook" image="ProgressBarRight" dimension="Width" />
+                            <ImageDim imageset="TaharezLook" image="ProgressBarRight" dimension="Width">
+                                <DimOperator op="Divide">
+                                    <AbsoluteDim value="2" />
+                                </DimOperator>
+                            </ImageDim>
                         </DimOperator>
                     </UnifiedDim>
                 </Dim>
@@ -1067,6 +1077,7 @@
                 <Image type="LeftEdge" imageset="TaharezLook" image="ProgressBarLeft" />
                 <Image type="RightEdge" imageset="TaharezLook" image="ProgressBarRight" />
                 <Image type="Background" imageset="TaharezLook" image="ProgressBarMiddle" />
+                <HorzFormat type="Tiled" />
             </FrameComponent>
         </ImagerySection>
         <ImagerySection name="progress_lights" >


Property changes on: data/trunk/materials/programs/ToonShaderPS.cg
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: data/trunk/materials/programs/ToonShader_ps.frag
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: data/trunk/materials/textures/OrxonoxBlack.tga
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: data/trunk/models/satellitedish.mesh
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Deleted: data/trunk/resources.cfg
===================================================================
--- data/trunk/resources.cfg	2009-08-30 00:22:00 UTC (rev 5695)
+++ data/trunk/resources.cfg	2009-08-30 00:29:06 UTC (rev 5696)
@@ -1,34 +0,0 @@
-# Resource locations to be added to the 'boostrap' path 
-# This also contains the minimum you need to use the Ogre example framework
-[Bootstrap]
-Zip=packs/OgreCore.zip
-
-# Resource locations to be added to the default path
-[General]
-FileSystem=.
-FileSystem=fonts
-FileSystem=materials/programs
-FileSystem=materials/scripts
-FileSystem=materials/textures
-FileSystem=models
-FileSystem=overlay
-FileSystem=particle
-#FileSystem=../Media/levels
-#FileSystem=../Media/audio
-Zip=packs/cubemap.zip
-#Zip=../Media/packs/cubemapsJS.zip
-#Zip=../Media/packs/dragon.zip
-#Zip=../Media/packs/fresneldemo.zip
-#Zip=../Media/packs/ogretestmap.zip
-Zip=packs/skybox.zip
-FileSystem=gui/fonts
-
-# CEGUI files
-[GUI]
-FileSystem=gui/configs
-FileSystem=gui/fonts
-FileSystem=gui/imagesets
-FileSystem=gui/layouts
-FileSystem=gui/looknfeel
-FileSystem=gui/schemes
-FileSystem=gui/scripts

Copied: data/trunk/resources.oxr (from rev 5657, data/branches/media_stripped/resources.oxr)
===================================================================
--- data/trunk/resources.oxr	                        (rev 0)
+++ data/trunk/resources.oxr	2009-08-30 00:29:06 UTC (rev 5696)
@@ -0,0 +1,17 @@
+<ResourceCollection resourceGroup = "General" >
+    <ResourceLocation path = "audio" />
+    <ResourceLocation path = "fonts" />
+    <ResourceLocation path = "materials/programs" />
+    <ResourceLocation path = "materials/scripts" />
+    <ResourceLocation path = "materials/textures" />
+    <ResourceLocation path = "models" />
+    <ResourceLocation path = "gui/fonts" />
+    <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip" />
+    <ResourceLocation path = "packs/skybox.zip"  archiveType = "Zip" />
+</ResourceCollection>
+
+<ResourceCollection resourceGroup = "GUI" >
+    <ResourceLocation path = "gui/fonts" />
+    <ResourceLocation path = "gui/imagesets" />
+    <ResourceLocation path = "gui/looknfeel" />
+</ResourceCollection>