From: <cl...@us...> - 2007-07-17 10:50:17
|
Revision: 56 http://fortress.svn.sourceforge.net/fortress/?rev=56&view=rev Author: clrg Date: 2007-07-17 03:50:19 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Major UI updates - add menu for starting game - add loading screen / animation - move minimap + elements to bottom of game screen Modified Paths: -------------- trunk/client/src/main.t trunk/client/src/net/sourceforge/fortress/game.t trunk/client/src/net/sourceforge/fortress/isogrid.t trunk/client/src/net/sourceforge/fortress/minimap.t trunk/client/src/net/sourceforge/fortress/panel.t trunk/client/src/net/sourceforge/fortress/shadowtext.t trunk/client/src/net/sourceforge/fortress/twoquarter.t Added Paths: ----------- trunk/client/src/net/sourceforge/fortress/app.t trunk/client/src/net/sourceforge/fortress/appitem.t trunk/client/src/net/sourceforge/fortress/busy.t trunk/client/src/net/sourceforge/fortress/image/process.png Modified: trunk/client/src/main.t =================================================================== --- trunk/client/src/main.t 2007-07-16 00:30:20 UTC (rev 55) +++ trunk/client/src/main.t 2007-07-17 10:50:19 UTC (rev 56) @@ -1,5 +1,5 @@ <!-- Copyright 2007 licensed under GPL v3 --> <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> - <game /> + <app /> </vexi> Added: trunk/client/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/app.t ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/client/src/net/sourceforge/fortress/appitem.t =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/appitem.t ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/client/src/net/sourceforge/fortress/busy.t =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/busy.t ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/client/src/net/sourceforge/fortress/game.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-16 00:30:20 UTC (rev 55) +++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-17 10:50:19 UTC (rev 56) @@ -2,39 +2,40 @@ <vexi xmlns:ui="vexi://ui" xmlns:layout="vexi.layout" xmlns:widget="vexi.widget" xmlns="net.sourceforge.fortress"> - <widget:surface /> <preloadimages /> - <ui:box orient="vertical" titlebar="Fortress Prototype"> + <ui:box orient="vertical"> <panel id="top" padding="10" vshrink="true"> <shadowtext text="Fortress Prototype v2" /> <ui:box /> <shadowtext text="Map Size 100 x 100" shrink="true" /> </panel> <ui:box> - <panel id="left" hshrink="true" orient="vertical" padding="0 10"> - <layout:border border="#ffcc00" depth="1" shrink="true"> - <minimap id="minimap" /> - </layout:border> - <ui:box orient="vertical" vshrink="true"> - <ui:box height="10" /> - <widget:check id="gridon" cursor="hand" focusable="false" selected="true"> - <shadowtext text="Toggle Grid" /> - </widget:check> - <ui:box height="10" /> - <widget:check id="invert" cursor="hand" focusable="false" selected="false"> - <shadowtext text="Invert Mouse" /> - </widget:check> - </ui:box> - <ui:box /> - </panel> + <panel id="left" hshrink="true" orient="vertical" padding="5" /> <layout:border border="#ffcc00" depth="1"> <isogrid id="map" /> </layout:border> - <panel id="right" hshrink="true" padding="5" /> + <panel id="right" hshrink="true" orient="vertical" padding="5" /> </ui:box> - <panel id="bottom" vshrink="true" padding="5" /> + <panel id="bottom" vshrink="true" padding="10"> + <layout:border border="#ffcc00" depth="1" shrink="true"> + <minimap id="minimap" /> + </layout:border> + <ui:box orient="vertical" vshrink="true"> + <ui:box height="10" /> + <widget:check id="gridon" cursor="hand" focusable="false" selected="true"> + <shadowtext text="Toggle Grid" /> + </widget:check> + <ui:box height="10" /> + <widget:check id="invert" cursor="hand" focusable="false" selected="false"> + <shadowtext text="Invert Mouse" /> + </widget:check> + </ui:box> + <layout:border border="#ffcc00" depth="1" shrink="true"> + <ui:box width="100" height="100" /> + </layout:border> + </panel> - vexi.ui.frame = thisbox; + thisbox.init = $map.init; //// Map / Sidebar Interaction //////////////////////////////// @@ -46,6 +47,7 @@ $top.height ++= function(v) { cascade = v; + if (!display) return; $left.bgy = -v; $right.bgy = -v; } @@ -53,6 +55,7 @@ $map.height ++= function(v) { cascade = v; + if (!display) return; $bottom.bgy = -((v + $top.height)%256); surface.setMapView(vexi.math.floor($map.width / 48), vexi.math.floor(v / 24)); } @@ -60,6 +63,7 @@ $map.width ++= function(v) { cascade = v; + if (!display) return; $right.bgx = -((v + $left.width)%256); surface.setMapView(vexi.math.floor(v / 48), vexi.math.floor($map.height / 24)); } Added: trunk/client/src/net/sourceforge/fortress/image/process.png =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/image/process.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/minimap.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-16 00:30:20 UTC (rev 55) +++ trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-17 10:50:19 UTC (rev 56) @@ -1,8 +1,8 @@ <!-- Copyright 2007 licensed under GPL v3 --> <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> - <ui:box height="100" width="100" layout="absolute"> - <ui:box layout="absolute"> + <ui:box height="100" width="100" layout="place"> + <ui:box layout="place"> $minimap.width ++= function(v) { cascade = v; width = v; } $minimap.height ++= function(v) { cascade = v; height = v; } <ui:box id="minimap" shrink="true" /> @@ -27,10 +27,10 @@ /** synchronizes the viewbox with the map */ var syncView = function() { - $viewbox.width = $minimap.width * (view_w / map_w) + 1; - $viewbox.height = $minimap.height * (view_h / map_h) + 1; - $viewbox.x = $minimap.width * (-map_x / map_w); - $viewbox.y = $minimap.height * (-map_y / map_h); + $viewbox.width = $minimap.width * (view_w / map_w) + 2; + $viewbox.height = $minimap.height * (view_h / map_h) + 2; + $viewbox.x = $minimap.width * (-map_x / map_w) - 1; + $viewbox.y = $minimap.height * (-map_y / map_h) - 1; } var mx, my; Modified: trunk/client/src/net/sourceforge/fortress/panel.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/shadowtext.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/twoquarter.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-16 00:30:20 UTC (rev 55) +++ trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-17 10:50:19 UTC (rev 56) @@ -15,7 +15,7 @@ </usage> </meta:doc> - <ui:box layout="absolute" shrink="true" width="48" height="24"> + <ui:box layout="place" shrink="true" width="48" height="24"> // top-left vs bottom-left thisbox.forward; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |