From: <cl...@us...> - 2009-03-23 02:26:37
|
Revision: 108 http://fortress.svn.sourceforge.net/fortress/?rev=108&view=rev Author: clrg Date: 2009-03-23 02:26:32 +0000 (Mon, 23 Mar 2009) Log Message: ----------- Update prototype to work with latest version of Vexi Modified Paths: -------------- trunk/classic/src/fortress/unit/arrow.t trunk/classic/src/fortress/unit/base.t trunk/classic/src/fortress/unit/preview.t trunk/classic/src/net/sourceforge/fortress/app.t trunk/classic/src/net/sourceforge/fortress/busy.t trunk/classic/src/net/sourceforge/fortress/isogrid.t trunk/classic/src/net/sourceforge/fortress/minimaptile.t trunk/classic/src/net/sourceforge/fortress/panel.t trunk/classic/src/net/sourceforge/fortress/preloadimages.t trunk/classic/src/net/sourceforge/fortress/shadowtext.t trunk/classic/src/net/sourceforge/fortress/twoquarter.t Added Paths: ----------- trunk/classic/.vexipath Added: trunk/classic/.vexipath =================================================================== --- trunk/classic/.vexipath (rev 0) +++ trunk/classic/.vexipath 2009-03-23 02:26:32 UTC (rev 108) @@ -0,0 +1,8 @@ +{ + "source" : [ + "F/fortress-classic/src", + "LVexi Game Library", + "LVexi Platform" + ], + "projects" : [ ] +} \ No newline at end of file Modified: trunk/classic/src/fortress/unit/arrow.t =================================================================== --- trunk/classic/src/fortress/unit/arrow.t 2009-03-22 15:49:10 UTC (rev 107) +++ trunk/classic/src/fortress/unit/arrow.t 2009-03-23 02:26:32 UTC (rev 108) @@ -1,5 +1,5 @@ <vexi xmlns:ui="vexi://ui" xmlns="fortress.image"> - <ui:box cursor="hand" width="38" height="38" layout="layer" shrink="true"> + <ui:box cursor="hand" width="38" height="38" layout="place" shrink="true"> <ui:box id="arrow" display="false" shrink="true" /> thisbox.full = false; @@ -7,7 +7,7 @@ var syncArrow = function(v) { cascade = v; $arrow.fill = .misc["arrow"+(full?"1":"2")+"_"+face]; - $arrow.align = static.facealigns[face]; + align = static.facealigns[face]; } thisbox.full ++= syncArrow; Modified: trunk/classic/src/fortress/unit/base.t =================================================================== --- trunk/classic/src/fortress/unit/base.t 2009-03-22 15:49:10 UTC (rev 107) +++ trunk/classic/src/fortress/unit/base.t 2009-03-23 02:26:32 UTC (rev 108) @@ -1,6 +1,6 @@ <vexi xmlns:ui="vexi://ui" xmlns="fortress.unit"> - <ui:box redirect="null" layout="layer" width="32" height="32"> - <ui:box id="image" align="topleft" shrink="true" /> + <ui:box align="topleft" layout="place" width="32" height="32"> + <ui:box id="image" shrink="true" /> var xoffset = 0; var yoffset = 0; Modified: trunk/classic/src/fortress/unit/preview.t =================================================================== --- trunk/classic/src/fortress/unit/preview.t 2009-03-22 15:49:10 UTC (rev 107) +++ trunk/classic/src/fortress/unit/preview.t 2009-03-23 02:26:32 UTC (rev 108) @@ -1,8 +1,8 @@ -<vexi xmlns:ui="vexi://ui" xmlns="vexi.widget" +<vexi xmlns:ui="vexi://ui" xmlns:lay="vexi.layout" xmlns="vexi.widget" xmlns:image="fortress.image" xmlns:unit="fortress.unit"> <surface /> <ui:box frameheight="200" framewidth="420"> - <pad orient="vertical" padding="10" hshrink="true"> + <lay:pad orient="vertical" padding="10" hshrink="true"> <ui:box vshrink="true" text="Unit" /> <option id="units" /> <ui:box vshrink="true" text="Animation" /> @@ -12,9 +12,10 @@ <radio id="x1" text="x1" /> <radio id="x2" text="x2" /> <radio id="x4" text="x4" /> + $x4.group = $x2.group = $x1.group; </ui:box> <ui:box /> - </pad> + </lay:pad> <ui:box orient="vertical" hshrink="true"> <ui:box shrink="true"> <unit:arrow id="fnw" face="fnw" /> Modified: trunk/classic/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Modified: trunk/classic/src/net/sourceforge/fortress/busy.t =================================================================== (Binary files differ) Modified: trunk/classic/src/net/sourceforge/fortress/isogrid.t =================================================================== (Binary files differ) Modified: trunk/classic/src/net/sourceforge/fortress/minimaptile.t =================================================================== --- trunk/classic/src/net/sourceforge/fortress/minimaptile.t 2009-03-22 15:49:10 UTC (rev 107) +++ trunk/classic/src/net/sourceforge/fortress/minimaptile.t 2009-03-23 02:26:32 UTC (rev 108) @@ -3,34 +3,30 @@ <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> <ui:box width="1" height="1" shrink="true"> - var getFillHex = function(s) - { - switch (s) - { - case 0: return "50"; - case 1: return "58"; - case 2: return "60"; - case 3: return "68"; - case 4: return "70"; - case 5: return "78"; - case 6: return "80"; - case 7: return "88"; - case 8: return "90"; - case 9: return "98"; + var getFillHex = function(s) { + switch (s) { + case 0: return "50"; + case 1: return "58"; + case 2: return "60"; + case 3: return "68"; + case 4: return "70"; + case 5: return "78"; + case 6: return "80"; + case 7: return "88"; + case 8: return "90"; + case 9: return "98"; } return "FF"; } - thisbox.setType = function(t, s) - { - switch (t) - { - case "mud": - fill = "#5f2a07"; - break; - case "grass": - default: - fill = "#00" + getFillHex(s) + "00"; + thisbox.setType = function(t, s) { + switch (t) { + case "mud": + fill = "#5f2a07"; + break; + case "grass": + default: + fill = "#00" + getFillHex(s) + "00"; } } Modified: trunk/classic/src/net/sourceforge/fortress/panel.t =================================================================== (Binary files differ) Modified: trunk/classic/src/net/sourceforge/fortress/preloadimages.t =================================================================== (Binary files differ) Modified: trunk/classic/src/net/sourceforge/fortress/shadowtext.t =================================================================== (Binary files differ) Modified: trunk/classic/src/net/sourceforge/fortress/twoquarter.t =================================================================== --- trunk/classic/src/net/sourceforge/fortress/twoquarter.t 2009-03-22 15:49:10 UTC (rev 107) +++ trunk/classic/src/net/sourceforge/fortress/twoquarter.t 2009-03-23 02:26:32 UTC (rev 108) @@ -15,7 +15,7 @@ </usage> </meta:doc> - <ui:box layout="place" shrink="true" width="48" height="24"> + <ui:box align="topleft" layout="place" shrink="true" width="48" height="24"> // top-left vs bottom-left thisbox.forward; @@ -27,8 +27,7 @@ var sync = function() { fill = .iso96[base][base+seed]; } sync(); - thisbox.addPiece = function(type, top, left, zoffset) - { + thisbox.addPiece = function(type, top, left, zoffset) { type = type.split('.'); var z = static.zindex[type[0]]; if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy; @@ -36,8 +35,7 @@ z += static.z * (zoffset ? zoffset : 0); var p; var i = 0; - while (numchildren > i) - { + while (numchildren > i) { p = thisbox[i]; if (p.z == z and p.left == left and p.top == top) throw "tried to add a duplicate piece '"+type[0]+"("+z+") ' from "+posx+", "+posy; @@ -62,18 +60,15 @@ return b; } - thisbox.delPiece = function(type, top, left, zoffset) - { + thisbox.delPiece = function(type, top, left, zoffset) { var z = static.zindex[type]; if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy; // static.z*zoffset allows us to place tiles untouchably infront z += static.z * (zoffset ? zoffset : 0); var p; - for (var i=0; numchildren>i; i++) - { + for (var i=0; numchildren>i; i++) { p = thisbox[i]; - if (p.z == z and p.left == left and p.top == top) - { + if (p.z == z and p.left == left and p.top == top) { thisbox[i] = null; return; } @@ -86,21 +81,19 @@ </ui:box> - static.posFunc = function(v) - { + static.posFunc = function(v) { cascade = v; trapee.top = 0 == (trapee.posx + trapee.posy) % 2; } static.tileset = "iso96"; - static.varies = { }; - static.zindex = { }; - static.ztiles = [ ]; + static.varies = {}; + static.zindex = {}; + static.ztiles = []; static.z = 0; - static.register = function(name, v) - { + static.register = function(name, v) { if (zindex[name]) throw "duplicate entrie in zindex table"; if (!v) v = 1; varies[name] = v; @@ -109,8 +102,7 @@ static.z++; } - static.init = function() - { + static.init = function() { register("highlight"); register("grid"); register("squaretower"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |