Changeset 10042 for ps

Timestamp:

08/20/11 19:17:53 (13 years ago)

Author:

philip

Message:

# New menu background image

Location:

ps/trunk

Files:

• binaries/data/mods/public/art/textures/ui/pregame/backgrounds (added)
• binaries/data/mods/public/art/textures/ui/pregame/backgrounds/hellenes1-1.png (added)
• binaries/data/mods/public/art/textures/ui/pregame/backgrounds/hellenes1-2.png (added)
• binaries/data/mods/public/art/textures/ui/pregame/backgrounds/hellenes1-3.png (added)
• binaries/data/mods/public/art/textures/ui/pregame/backgrounds/textures.xml (added)
• binaries/data/mods/public/gui/pregame/mainmenu.js (modified) (2 diffs)
• binaries/data/mods/public/gui/pregame/mainmenu.xml (modified) (3 diffs)
• binaries/data/mods/public/gui/pregame/sprites.xml (modified) (1 diff)
• source/gui/CGUI.cpp (modified) (2 diffs)
• source/gui/CGUISprite.h (modified) (3 diffs)
• source/gui/GUIRenderer.cpp (modified) (5 diffs)
• source/gui/IGUIObject.h (modified) (1 diff)
• source/gui/scripting/JSInterface_IGUIObject.cpp (modified) (3 diffs)
• source/gui/scripting/JSInterface_IGUIObject.h (modified) (1 diff)
• source/ps/Overlay.cpp (modified) (1 diff)
• source/ps/Overlay.h (modified) (1 diff)

ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js

@@ -8 +8 @@
 
     userReportEnabledText = getGUIObjectByName("userReportEnabledText").caption;
+}
+
+var t0 = new Date;
+function scrollBackgrounds()
+{
+    var layer1 = getGUIObjectByName("backgroundLayer1");
+    var layer2 = getGUIObjectByName("backgroundLayer2");
+    var layer3 = getGUIObjectByName("backgroundLayer3");
+
+    var screen = layer1.parent.getComputedSize();
+    var h = screen.bottom - screen.top; // height of screen
+    var w = h*16/9; // width of background image
+
+    // Offset the layers by oscillating amounts
+    var t = (t0 - new Date) / 1000;
+    var speed = 1/10;
+    var off1 = 0.10 * w * (1+Math.cos(t*speed));
+    var off2 = 0.18 * w * (1+Math.cos(t*speed)) - h*6/9;
+    var off3 = 0.20 * w * (1+Math.cos(t*speed));
+
+    var left = screen.right - w * (1 + Math.ceil(screen.right / w));
+    layer1.size = new GUISize(left + off1, screen.top, screen.right + off1, screen.bottom);
+
+    layer2.size = new GUISize(screen.right - h + off2, screen.top, screen.right + off2, screen.bottom);
+    layer3.size = new GUISize(screen.right - h + off3, screen.top, screen.right + off3, screen.bottom);
 }
 
@@ -56 +81 @@
 function onTick()
 {
+    scrollBackgrounds();
+
     if (Engine.IsUserReportEnabled())
     {

ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml

@@ -14 +14 @@
     <object type="image" sprite="bkFillBlack"/>
 
-    <object name="pg"
-        type="image"
-        sprite="pgBackground"
-        aspectratio="1.333333"
-    >
+    <object name="pg">
+
+        <object name="backgroundLayer1"
+            type="image"
+            sprite="background-hellenes1-1"
+        />
+        <object name="backgroundLayer2"
+            type="image"
+            sprite="background-hellenes1-2"
+        />
+        <object name="backgroundLayer3"
+            type="image"
+            sprite="background-hellenes1-3"
+        />
 
         <action on="Tick">
@@ -446 +455 @@
         <object
             name="userReportDisabled"
-            size="100%-300 300 100% 450"
+            size="100%-304 100%-154 100%-4 100%-4"
             type="image"
             style="userReportPanel"
@@ -469 +478 @@
         <object
             name="userReportEnabled"
-            size="100%-304 300 100%-4 590"
+            size="100%-304 100%-294 100%-4 100%-4"
             type="image"
             style="userReportPanel"

ps/trunk/binaries/data/mods/public/gui/pregame/sprites.xml

@@ -3 +3 @@
 <sprites>
 
-        <!--
-        ==========================================
-        PREGAME GUI - TEXTURE SPRITES - BACKDROPS
-        ==========================================
-        -->
+        <sprite name="background-hellenes1-1">
+            <image
+                texture="pregame/backgrounds/hellenes1-1.png"
+                fixed_h_aspect_ratio="1.777777"
+                round_coordinates="false"
+            />
+        </sprite>
 
-        <sprite name="pgBackground">
-            <image  texture="pregame/shell/parchment/background.dds"
-                real_texture_placement="0 0 1024 768"
-                size="0 0 100% 100%" 
+        <sprite name="background-hellenes1-2">
+            <image
+                texture="pregame/backgrounds/hellenes1-2.png"
+                round_coordinates="false"
+                wrap_mode="clamp_to_edge"
+            />
+        </sprite>
+
+        <sprite name="background-hellenes1-3">
+            <image
+                texture="pregame/backgrounds/hellenes1-3.png"
+                round_coordinates="false"
+                wrap_mode="clamp_to_edge"
             />
         </sprite>

ps/trunk/source/gui/CGUI.cpp

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -1591 +1591 @@
         }
         else
+        if (attr_name == "fixed_h_aspect_ratio")
+        {
+            float val;
+            if (!GUI<float>::ParseString(attr_value, val))
+                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+            else image.m_FixedHAspectRatio = val;
+        }
+        else
+        if (attr_name == "round_coordinates")
+        {
+            bool b;
+            if (!GUI<bool>::ParseString(attr_value, b))
+                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+            else image.m_RoundCoordinates = b;
+        }
+        else
+        if (attr_name == "wrap_mode")
+        {
+            if (attr_value == L"repeat")
+                image.m_WrapMode = GL_REPEAT;
+            else if (attr_value == L"mirrored_repeat")
+                image.m_WrapMode = GL_MIRRORED_REPEAT;
+            else if (attr_value == L"clamp_to_edge")
+                image.m_WrapMode = GL_CLAMP_TO_EDGE;
+            else if (attr_value == L"clamp_to_border")
+                image.m_WrapMode = GL_CLAMP_TO_BORDER;
+            else
+                LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
+        }
+        else
         if (attr_name == "z_level")
         {

ps/trunk/source/gui/CGUISprite.h

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -78 +78 @@
 struct SGUIImage
 {
-    SGUIImage() : m_Effects(NULL), m_Border(false), m_DeltaZ(0.f) {}
+    SGUIImage() :
+        m_FixedHAspectRatio(0.f), m_RoundCoordinates(true), m_WrapMode(GL_REPEAT),
+        m_Effects(NULL), m_Border(false), m_DeltaZ(0.f)
+    {
+    }
 
     // Filename of the texture
@@ -99 +103 @@
     //  Equal to CSize(0,0) for non-celled textures.
     CSize           m_CellSize;
+
+    /**
+     * If non-zero, then the image's width will be adjusted when rendering so that
+     * the width:height ratio equals this value.
+     */
+    float           m_FixedHAspectRatio;
+
+    /**
+     * If true, the image's coordinates will be rounded to integer pixels when
+     * rendering, to avoid blurry filtering.
+     */
+    bool            m_RoundCoordinates;
+
+    /**
+     * Texture wrapping mode (GL_REPEAT, GL_CLAMP_TO_BORDER, etc)
+     */
+    GLint           m_WrapMode;
 
     // Visual effects (e.g. colour modulation)

ps/trunk/source/gui/GUIRenderer.cpp

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -453 +453 @@
 
         Call.m_Vertices = ObjectSize;
-        // Round the vertex coordinates to integers, to avoid ugly filtering artifacts
-        Call.m_Vertices.left = (int)(Call.m_Vertices.left + 0.5f);
-        Call.m_Vertices.right = (int)(Call.m_Vertices.right + 0.5f);
-        Call.m_Vertices.top = (int)(Call.m_Vertices.top + 0.5f);
-        Call.m_Vertices.bottom = (int)(Call.m_Vertices.bottom + 0.5f);
+        if (cit->m_RoundCoordinates)
+        {
+            // Round the vertex coordinates to integers, to avoid ugly filtering artifacts
+            Call.m_Vertices.left = (int)(Call.m_Vertices.left + 0.5f);
+            Call.m_Vertices.right = (int)(Call.m_Vertices.right + 0.5f);
+            Call.m_Vertices.top = (int)(Call.m_Vertices.top + 0.5f);
+            Call.m_Vertices.bottom = (int)(Call.m_Vertices.bottom + 0.5f);
+        }
 
         if (! cit->m_TextureName.empty())
         {
             CTextureProperties textureProps(cit->m_TextureName);
+            textureProps.SetWrap(cit->m_WrapMode);
             CTexturePtr texture = g_Renderer.GetTextureManager().CreateTexture(textureProps);
             texture->Prefetch();
@@ -535 +539 @@
     // Get the screen's position/size for the block
     CRect BlockScreen = m_Image->m_TextureSize.GetClientArea(m_ObjectSize);
+
+    if (m_Image->m_FixedHAspectRatio)
+        BlockScreen.right = BlockScreen.left + BlockScreen.GetHeight() * m_Image->m_FixedHAspectRatio;
 
     // Get the texture's position/size for the block:
@@ -594 +601 @@
     glDisable(GL_BLEND);
 
+    // Set LOD bias so mipmapped textures are prettier
+    glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.f);
+
     // Iterate through each DrawCall, and execute whatever drawing code is being called
     for (DrawCalls::const_iterator cit = Calls.begin(); cit != Calls.end(); ++cit)
@@ -671 +681 @@
         glDisable(GL_BLEND);
     }
-}
+
+    glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, 0.f);
+}

ps/trunk/source/gui/IGUIObject.h

@@ -148 +148 @@
     friend JSBool JSI_IGUIObject::getProperty(JSContext* cx, JSObject* obj, jsid id, jsval* vp);
     friend JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsid id, JSBool strict, jsval* vp);
+    friend JSBool JSI_IGUIObject::getComputedSize(JSContext* cx, uintN argc, jsval* vp);
 
 public:

ps/trunk/source/gui/scripting/JSInterface_IGUIObject.cpp

@@ -50 +50 @@
     { "focus", JSI_IGUIObject::focus, 0, 0 },
     { "blur", JSI_IGUIObject::blur, 0, 0 },
+    { "getComputedSize", JSI_IGUIObject::getComputedSize, 0, 0 },
     { 0 }
 };
@@ -76 +77 @@
         propName == "toString"    ||
         propName == "focus"       ||
-        propName == "blur"
+        propName == "blur"        ||
+        propName == "getComputedSize"
        )
         return JS_TRUE;
@@ -648 +650 @@
     return JS_TRUE;
 }
+
+JSBool JSI_IGUIObject::getComputedSize(JSContext* cx, uintN argc, jsval* vp)
+{
+    UNUSED2(argc);
+
+    IGUIObject* e = (IGUIObject*)JS_GetInstancePrivate(cx, JS_THIS_OBJECT(cx, vp), &JSI_IGUIObject::JSI_class, NULL);
+    if (!e)
+        return JS_FALSE;
+
+    e->UpdateCachedSize();
+    CRect size = e->m_CachedActualSize;
+
+    JSObject* obj = JS_NewObject(cx, NULL, NULL, NULL);
+    try
+    {
+        g_ScriptingHost.SetObjectProperty_Double(obj, "left", size.left);
+        g_ScriptingHost.SetObjectProperty_Double(obj, "right", size.right);
+        g_ScriptingHost.SetObjectProperty_Double(obj, "top", size.top);
+        g_ScriptingHost.SetObjectProperty_Double(obj, "bottom", size.bottom);
+    }
+    catch (PSERROR_Scripting_ConversionFailed)
+    {
+        debug_warn(L"Error creating size object!");
+        return JS_FALSE;
+    }
+
+    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(obj));
+    return JS_TRUE;
+}

ps/trunk/source/gui/scripting/JSInterface_IGUIObject.h

@@ -32 +32 @@
     JSBool focus(JSContext* cx, uintN argc, jsval* vp);
     JSBool blur(JSContext* cx, uintN argc, jsval* vp);
+    JSBool getComputedSize(JSContext* cx, uintN argc, jsval* vp);
     void init();
 }

ps/trunk/source/ps/Overlay.cpp

@@ -250 +250 @@
 }
 
+CPos CRect::TopRight() const
+{
+    return CPos(right, top);
+}
+
+CPos CRect::BottomLeft() const
+{
+    return CPos(left, bottom);
+}
+
 CPos CRect::BottomRight() const
 {
-    return CPos(right, right);
+    return CPos(right, bottom);
 }
 

ps/trunk/source/ps/Overlay.h

@@ -121 +121 @@
 
     /**
+     * Get Position equivalent to top/right corner
+     */
+    CPos TopRight() const;
+
+    /**
+     * Get Position equivalent to bottom/left corner
+     */
+    CPos BottomLeft() const;
+
+    /**
      * Get Position equivalent to bottom/right corner
      */