You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(23) |
Jul
(31) |
Aug
(13) |
Sep
|
Oct
(9) |
Nov
|
Dec
(2) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <cl...@us...> - 2007-06-27 00:36:29
|
Revision: 16 http://fortress.svn.sourceforge.net/fortress/?rev=16&view=rev Author: clrg Date: 2007-06-26 17:36:30 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Import surface template from Vexi widgets - only using that template at the moment - makes it quicker for people to get started Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/app.t Added Paths: ----------- trunk/Prototype/src/net/sourceforge/fortress/surface.t Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 00:34:09 UTC (rev 15) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 00:36:30 UTC (rev 16) @@ -1,7 +1,7 @@ <!-- Copyright 2007 licensed under GPL v3 --> -<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:role="org.vexi.lib.role"> - <role:surface /> +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> + <surface /> <preloadimages /> <ui:box titlebar="Fortress Prototype"> <ui:box orient="vertical" shrink="true"> Added: trunk/Prototype/src/net/sourceforge/fortress/surface.t =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/surface.t ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-27 00:34:11
|
Revision: 15 http://fortress.svn.sourceforge.net/fortress/?rev=15&view=rev Author: clrg Date: 2007-06-26 17:34:09 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Click on the minimap now moves the map too Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/app.t trunk/Prototype/src/net/sourceforge/fortress/map.t trunk/Prototype/src/net/sourceforge/fortress/minimap.t Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 00:20:34 UTC (rev 14) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 00:34:09 UTC (rev 15) @@ -8,9 +8,9 @@ <minimap /> <ui:box fill="#888888" height="1" /> <ui:box height="5" /> - <ui:box id="tiletype" textcolor="white" /> + <ui:box id="tiletype" align="center" textcolor="white" /> <ui:box height="5" /> - <ui:box id="position" textcolor="white" /> + <ui:box id="position" align="center" textcolor="white" /> </ui:box> <ui:box fill="#888888" width="1" hshrink="true" /> <map id="map" /> Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-27 00:20:34 UTC (rev 14) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-27 00:34:09 UTC (rev 15) @@ -183,6 +183,16 @@ { cascade = v; surface.setMapContents($map); + + surface.moveMapTo = function(x, y) + { + var d = $map.distanceto($map[x][y]); + var dx = width/2 - d.x; + var dy = height/2 - d.y; + $map.x = 0 > dx ? (dx > width - $map.width ? dx : width - $map.width) : 0; + $map.y = 0 > dy ? (dy > height - $map.height ? dy : height - $map.height) : 0; + surface.setMapPos($map.x, $map.y); + } } </ui:box> Modified: trunk/Prototype/src/net/sourceforge/fortress/minimap.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-27 00:20:34 UTC (rev 14) +++ trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-27 00:34:09 UTC (rev 15) @@ -32,6 +32,13 @@ $viewbox.y = $minimap.height * (-my / mh); } + var moveMapFunc = function(v) + { + // assumes minimap tiles are 1px by 1px + var d = $minimap.distanceto(trapee); + surface.moveMapTo(d.x, d.y); + } + surface ++= function(v) { cascade = v; @@ -68,6 +75,7 @@ for (var j=0; nj > j; j++) { var t = .minimaptile(vexi.box); + t.Press1 ++= moveMapFunc; t.setType(map[i][j].type, map[i][j].seed); $minimap[i][j] = t; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-27 00:20:32
|
Revision: 14 http://fortress.svn.sourceforge.net/fortress/?rev=14&view=rev Author: clrg Date: 2007-06-26 17:20:34 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Preload mud road images (no more black flicker!) Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/app.t Added Paths: ----------- trunk/Prototype/src/net/sourceforge/fortress/preloadimages.t Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 00:20:09 UTC (rev 13) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 00:20:34 UTC (rev 14) @@ -2,6 +2,7 @@ <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:role="org.vexi.lib.role"> <role:surface /> + <preloadimages /> <ui:box titlebar="Fortress Prototype"> <ui:box orient="vertical" shrink="true"> <minimap /> Added: trunk/Prototype/src/net/sourceforge/fortress/preloadimages.t =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/preloadimages.t ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-27 00:20:07
|
Revision: 13 http://fortress.svn.sourceforge.net/fortress/?rev=13&view=rev Author: clrg Date: 2007-06-26 17:20:09 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Oops, really fix tile cursor display ;-) Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/map.t Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-27 00:16:00 UTC (rev 12) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-27 00:20:09 UTC (rev 13) @@ -147,7 +147,7 @@ thisbox.active ++= function(v) { - var d = distanceto(activeTile); + var d = thisbox.distanceto(activeTile); $cur.display = true; $cur.width = activeTile.width; $cur.height = activeTile.height; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-27 00:15:58
|
Revision: 12 http://fortress.svn.sourceforge.net/fortress/?rev=12&view=rev Author: clrg Date: 2007-06-26 17:16:00 -0700 (Tue, 26 Jun 2007) Log Message: ----------- Press1 and drag to create road and fix tile cursor display for updated Vexi Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/map.t Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-24 23:13:29 UTC (rev 11) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-27 00:16:00 UTC (rev 12) @@ -5,16 +5,13 @@ <ui:box id="map" shrink="true" /> <ui:box id="cur" fill="#88ffffff" display="false" /> + var drag1 = false; + var drag2 = false; + //////// sample road creation ///////////////////////////////// - thisbox.Press1 ++= function(v) + var createMudTile = function(tile) { - if (!activeTile) return; - createMudTile(activeTile); - } - - thisbox.createMudTile = function(tile) - { if (tile.type == "mud") return; var posx = tile.posx; var posy = tile.posy; @@ -58,6 +55,22 @@ surface.setMapTile(tile); } + var sr1Func = function(v) + { + drag1 = false; + surface.Focused --= sr1Func; + surface.Release1 --= sr1Func; + } + + thisbox.Press1 ++= function(v) + { + if (!activeTile or drag2) return; + createMudTile(activeTile); + drag1 = true; + surface.Focused ++= sr1Func; + surface.Release1 ++= sr1Func; + } + //////// minimap interaction ////////////////////////////////// var mapDim = function(v) @@ -80,8 +93,6 @@ //////// map movement ///////////////////////////////////////// - var dragging = false; - var mx; var my; var ox; @@ -106,14 +117,15 @@ { surface.delMoveTrap(dragMove); surface._Release2 --= dragStop; - dragging = false; + drag2 = false; cascade = v; active = true; } var dragStart = function(v) { - dragging = true; + if (drag1) return; + drag2 = true; $cur.display = false; var m = thisbox.mouse; mx = m.x; @@ -135,19 +147,20 @@ thisbox.active ++= function(v) { - var d = $map.distanceto(activeTile); + var d = distanceto(activeTile); $cur.display = true; $cur.width = activeTile.width; $cur.height = activeTile.height; - $cur.x = d.x + $map.x; - $cur.y = d.y + $map.y; + $cur.x = d.x; + $cur.y = d.y; } var enterFunc = function(v) { cascade = v; activeTile = trapee; - if (!dragging) active = true; + if (drag1) createMudTile(trapee); + if (!drag2) active = true; } thisbox.Leave ++= function(v) { $cur.display = false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-24 23:13:29
|
Revision: 11 http://fortress.svn.sourceforge.net/fortress/?rev=11&view=rev Author: clrg Date: 2007-06-24 16:13:29 -0700 (Sun, 24 Jun 2007) Log Message: ----------- Update after major changes to Vexi layout strategy - increase map size to 100 - sync prototype with development version of Vexi - change map management to $map[x][y] instead of $map[y][x] Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/app.t trunk/Prototype/src/net/sourceforge/fortress/map.t trunk/Prototype/src/net/sourceforge/fortress/minimap.t Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-20 15:57:46 UTC (rev 10) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-24 23:13:29 UTC (rev 11) @@ -3,16 +3,15 @@ <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:role="org.vexi.lib.role"> <role:surface /> <ui:box titlebar="Fortress Prototype"> - <ui:box cols="1" hshrink="true"> + <ui:box orient="vertical" shrink="true"> <minimap /> <ui:box fill="#888888" height="1" /> <ui:box height="5" /> - <ui:box id="tiletype" textcolor="white" vshrink="true" /> + <ui:box id="tiletype" textcolor="white" /> <ui:box height="5" /> - <ui:box id="position" textcolor="white" vshrink="true" /> - <ui:box /> + <ui:box id="position" textcolor="white" /> </ui:box> - <ui:box fill="#888888" width="1" /> + <ui:box fill="#888888" width="1" hshrink="true" /> <map id="map" /> vexi.ui.frame = thisbox; Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-20 15:57:46 UTC (rev 10) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-24 23:13:29 UTC (rev 11) @@ -1,9 +1,9 @@ <!-- Copyright 2007 licensed under GPL v3 --> <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> - <ui:box> - <ui:box id="map" align="topleft" cols="1" packed="false" shrink="true" /> - <ui:box id="cur" align="topleft" fill="#88ffffff" display="false" packed="false" /> + <ui:box layout="absolute"> + <ui:box id="map" shrink="true" /> + <ui:box id="cur" fill="#88ffffff" display="false" /> //////// sample road creation ///////////////////////////////// @@ -19,33 +19,33 @@ var posx = tile.posx; var posy = tile.posy; var comp = ""; - if (posy > 0 and $map[posy-1][posx].type == "mud") + if (posy > 0 and $map[posx][posy-1].type == "mud") { - var nt = $map[posy-1][posx]; + var nt = $map[posx][posy-1]; nt.comp = nt.comp.substring(0, 2) + "m" + nt.comp.substring(3); nt.sync(); comp = comp + "m"; } else comp = comp + "_"; - if ($map[posy].numchildren > posx + 1 and $map[posy][posx+1].type == "mud") + if ($map.numchildren > posx+1 and $map[posx+1][posy].type == "mud") { - var nt = $map[posy][posx+1]; + var nt = $map[posx+1][posy]; nt.comp = nt.comp.substring(0, 3) + "m"; nt.sync(); comp = comp + "m"; } else comp = comp + "_"; - if ($map.numchildren > posy + 1 and $map[posy+1][posx].type != "grass") + if ($map[posx].numchildren > posy+1 and $map[posx][posy+1].type != "grass") { - var nt = $map[posy+1][posx]; + var nt = $map[posx][posy+1]; nt.comp = "m" + nt.comp.substring(1); nt.sync(); comp = comp + "m"; } else comp = comp + "_"; - if (posx > 0 and $map[posy][posx-1].type != "grass") + if (posx > 0 and $map[posx-1][posy].type != "grass") { - var nt = $map[posy][posx-1]; + var nt = $map[posx-1][posy]; nt.comp = nt.comp.substring(0, 1) + "m" + nt.comp.substring(2); nt.sync(); comp = comp + "m"; @@ -105,7 +105,7 @@ var dragStop = function(v) { surface.delMoveTrap(dragMove); - surface.Release2 --= dragStop; + surface._Release2 --= dragStop; dragging = false; cascade = v; active = true; @@ -123,7 +123,7 @@ vx = width - $map.width; vy = height - $map.height; surface.addMoveTrap(dragMove); - surface.Release2 ++= dragStop; + surface._Release2 ++= dragStop; cascade = v; } @@ -152,15 +152,16 @@ thisbox.Leave ++= function(v) { $cur.display = false; } - for (var i=0; 50>i; i++) + for (var i=0; 100>i; i++) { $map[i] = vexi.box; - for (var j=0; 50>j; j++) + $map[i].orient = "vertical"; + for (var j=0; 100>j; j++) { var t = .maptile(vexi.box); t.Enter ++= enterFunc; - t.posx = j; - t.posy = i; + t.posx = i; + t.posy = j; $map[i][j] = t; } } Modified: trunk/Prototype/src/net/sourceforge/fortress/minimap.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-20 15:57:46 UTC (rev 10) +++ trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-24 23:13:29 UTC (rev 11) @@ -1,17 +1,19 @@ <!-- Copyright 2007 licensed under GPL v3 --> <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> - <ui:box height="100" width="100"> - <ui:box shrink="true"> - <ui:box id="minimap" cols="1" shrink="true" /> - <ui:box id="viewbox" cols="1" align="topleft" packed="false"> - <ui:box fill="white" height="1" /> + <ui:box height="100" width="100" layout="absolute"> + <ui:box layout="absolute"> + $minimap.width ++= function(v) { cascade = v; width = v; } + $minimap.height ++= function(v) { cascade = v; height = v; } + <ui:box id="minimap" shrink="true" /> + <ui:box id="viewbox" orient="vertical" align="topleft"> + <ui:box fill="white" height="1" vshrink="true" /> <ui:box> - <ui:box fill="white" width="1" /> + <ui:box fill="white" width="1" hshrink="true" /> <ui:box /> - <ui:box fill="white" width="1" /> + <ui:box fill="white" width="1" hshrink="true" /> </ui:box> - <ui:box fill="white" height="1" /> + <ui:box fill="white" height="1" vshrink="true" /> </ui:box> </ui:box> @@ -62,6 +64,7 @@ for (var i=0; ni > i; i++) { $minimap[i] = vexi.box; + $minimap[i].orient = "vertical"; for (var j=0; nj > j; j++) { var t = .minimaptile(vexi.box); @@ -73,7 +76,7 @@ surface.setMapTile = function(t) { - $minimap[t.posy][t.posx].setType(t.type, t.seed); + $minimap[t.posx][t.posy].setType(t.type, t.seed); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-20 15:57:46
|
Revision: 10 http://fortress.svn.sourceforge.net/fortress/?rev=10&view=rev Author: clrg Date: 2007-06-20 08:57:46 -0700 (Wed, 20 Jun 2007) Log Message: ----------- Click on the grass to make mud roads :-) Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/app.t trunk/Prototype/src/net/sourceforge/fortress/map.t trunk/Prototype/src/net/sourceforge/fortress/maptile.t trunk/Prototype/src/net/sourceforge/fortress/minimap.t trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t Added Paths: ----------- trunk/Prototype/src/net/sourceforge/fortress/image/grass/ trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass0.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass1.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass2.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass3.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass4.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass5.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass6.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass7.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass8.png trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass9.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/Thumbs.db trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud____.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud___m.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud__m_.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud__mm.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_m__.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_m_m.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_mm_.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_mmm.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm___.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm__m.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm_m_.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm_mm.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmm__.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmm_m.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmmm_.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmmmm.png Removed Paths: ------------- trunk/Prototype/src/net/sourceforge/fortress/image/grass0.png trunk/Prototype/src/net/sourceforge/fortress/image/grass1.png trunk/Prototype/src/net/sourceforge/fortress/image/grass2.png trunk/Prototype/src/net/sourceforge/fortress/image/grass3.png trunk/Prototype/src/net/sourceforge/fortress/image/grass4.png trunk/Prototype/src/net/sourceforge/fortress/image/grass5.png trunk/Prototype/src/net/sourceforge/fortress/image/grass6.png trunk/Prototype/src/net/sourceforge/fortress/image/grass7.png trunk/Prototype/src/net/sourceforge/fortress/image/grass8.png trunk/Prototype/src/net/sourceforge/fortress/image/grass9.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w_nw.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_ne_sw.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_nw_se.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_w.png Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-20 14:35:39 UTC (rev 9) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-20 15:57:46 UTC (rev 10) @@ -2,7 +2,7 @@ <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:role="org.vexi.lib.role"> <role:surface /> - <ui:box> + <ui:box titlebar="Fortress Prototype"> <ui:box cols="1" hshrink="true"> <minimap /> <ui:box fill="#888888" height="1" /> Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass0.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass0.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass1.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass2.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass3.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass4.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass5.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass6.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass7.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass8.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass9.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass/grass9.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass0.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass1.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass2.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass3.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass4.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass5.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass6.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass7.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass8.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/grass9.png =================================================================== (Binary files differ) Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/Thumbs.db =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/Thumbs.db ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud.png =================================================================== (Binary files differ) Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud____.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud____.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud___m.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud___m.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud__m_.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud__m_.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud__mm.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud__mm.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s_w.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_w.png =================================================================== (Binary files differ) Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_m__.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_m__.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_m_m.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_m_m.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_mm_.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_mm_.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_mmm.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_mmm.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s_w.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_w.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s_w.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w_nw.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_ne_sw.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_nw_se.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s_w.png =================================================================== (Binary files differ) Deleted: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_w.png =================================================================== (Binary files differ) Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm___.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm___.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm__m.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm__m.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm_m_.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm_m_.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm_mm.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudm_mm.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmm__.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmm__.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmm_m.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmm_m.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmmm_.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmmm_.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmmmm.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mudmmmm.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-20 14:35:39 UTC (rev 9) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-20 15:57:46 UTC (rev 10) @@ -5,6 +5,61 @@ <ui:box id="map" align="topleft" cols="1" packed="false" shrink="true" /> <ui:box id="cur" align="topleft" fill="#88ffffff" display="false" packed="false" /> + //////// sample road creation ///////////////////////////////// + + thisbox.Press1 ++= function(v) + { + if (!activeTile) return; + createMudTile(activeTile); + } + + thisbox.createMudTile = function(tile) + { + if (tile.type == "mud") return; + var posx = tile.posx; + var posy = tile.posy; + var comp = ""; + if (posy > 0 and $map[posy-1][posx].type == "mud") + { + var nt = $map[posy-1][posx]; + nt.comp = nt.comp.substring(0, 2) + "m" + nt.comp.substring(3); + nt.sync(); + comp = comp + "m"; + } + else comp = comp + "_"; + if ($map[posy].numchildren > posx + 1 and $map[posy][posx+1].type == "mud") + { + var nt = $map[posy][posx+1]; + nt.comp = nt.comp.substring(0, 3) + "m"; + nt.sync(); + comp = comp + "m"; + } + else comp = comp + "_"; + if ($map.numchildren > posy + 1 and $map[posy+1][posx].type != "grass") + { + var nt = $map[posy+1][posx]; + nt.comp = "m" + nt.comp.substring(1); + nt.sync(); + comp = comp + "m"; + } + else comp = comp + "_"; + if (posx > 0 and $map[posy][posx-1].type != "grass") + { + var nt = $map[posy][posx-1]; + nt.comp = nt.comp.substring(0, 1) + "m" + nt.comp.substring(2); + nt.sync(); + comp = comp + "m"; + } + else comp = comp + "_"; + tile.seed = ""; + tile.type = "mud"; + tile.comp = comp; + tile.sync(); + surface.setMapTile(tile); + } + + //////// minimap interaction ////////////////////////////////// + var mapDim = function(v) { cascade = v; Modified: trunk/Prototype/src/net/sourceforge/fortress/maptile.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/maptile.t 2007-06-20 14:35:39 UTC (rev 9) +++ trunk/Prototype/src/net/sourceforge/fortress/maptile.t 2007-06-20 15:57:46 UTC (rev 10) @@ -3,10 +3,12 @@ <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> <ui:box shrink="true" width="20" height="20"> + thisbox.sync = function() { fill = .image[type][type+comp+seed]; } thisbox.type = "grass"; + thisbox.comp = ""; thisbox.seed = vexi.math.floor(vexi.math.random()*10); - fill = .image[type+seed]; + sync(); </ui:box> </vexi> \ No newline at end of file Modified: trunk/Prototype/src/net/sourceforge/fortress/minimap.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-20 14:35:39 UTC (rev 9) +++ trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-20 15:57:46 UTC (rev 10) @@ -70,6 +70,11 @@ } } } + + surface.setMapTile = function(t) + { + $minimap[t.posy][t.posx].setType(t.type, t.seed); + } } </ui:box> Modified: trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t 2007-06-20 14:35:39 UTC (rev 9) +++ trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t 2007-06-20 15:57:46 UTC (rev 10) @@ -7,16 +7,16 @@ { switch (s) { - case 0: return "90"; - case 1: return "98"; - case 2: return "A0"; - case 3: return "A8"; - case 4: return "B0"; - case 5: return "B8"; - case 6: return "C0"; - case 7: return "C8"; - case 8: return "D0"; - case 9: return "D8"; + case 0: return "70"; + case 1: return "78"; + case 2: return "80"; + case 3: return "88"; + case 4: return "90"; + case 5: return "98"; + case 6: return "A0"; + case 7: return "A8"; + case 8: return "B0"; + case 9: return "B8"; } return "FF"; } @@ -25,6 +25,9 @@ { switch (t) { + case "mud": + fill = "#5f2a07"; + break; case "grass": default: fill = "#00" + getFillHex(s) + "00"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-20 14:35:37
|
Revision: 9 http://fortress.svn.sourceforge.net/fortress/?rev=9&view=rev Author: clrg Date: 2007-06-20 07:35:39 -0700 (Wed, 20 Jun 2007) Log Message: ----------- More mud road tiles Modified Paths: -------------- trunk/Prototype/xcf/mudtile.xcf Added Paths: ----------- trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w_nw.png Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_s_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w_nw.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w_nw.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Prototype/xcf/mudtile.xcf =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-20 01:03:10
|
Revision: 8 http://fortress.svn.sourceforge.net/fortress/?rev=8&view=rev Author: clrg Date: 2007-06-19 18:03:06 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Some more image work, mainly for basic mud roads Modified Paths: -------------- trunk/Prototype/xcf/grasstile.xcf Added Paths: ----------- trunk/Prototype/src/net/sourceforge/fortress/image/mud/ trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_ne_sw.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_nw_se.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s_w.png trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_w.png trunk/Prototype/xcf/mudtile.xcf Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_s.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_e_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_e.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_s.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_n_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_ne_sw.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_ne_sw.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_nw_se.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_nw_se.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_s_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_w.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/mud/mud_w.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Prototype/xcf/grasstile.xcf =================================================================== (Binary files differ) Added: trunk/Prototype/xcf/mudtile.xcf =================================================================== (Binary files differ) Property changes on: trunk/Prototype/xcf/mudtile.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-19 17:35:34
|
Revision: 7 http://fortress.svn.sourceforge.net/fortress/?rev=7&view=rev Author: clrg Date: 2007-06-19 10:35:36 -0700 (Tue, 19 Jun 2007) Log Message: ----------- - make map follow cursor instead of following view - switch off cursor while dragging map Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/app.t trunk/Prototype/src/net/sourceforge/fortress/map.t trunk/Prototype/src/net/sourceforge/fortress/minimap.t Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-19 17:01:06 UTC (rev 6) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-19 17:35:36 UTC (rev 7) @@ -17,10 +17,10 @@ vexi.ui.frame = thisbox; - $map.activeTile ++= function(v) + $map.active ++= function(v) { - $position.text = "( "+v.posx+", "+v.posy+" )"; - $tiletype.text = v.type; + $position.text = "( "+$map.activeTile.posx+", "+$map.activeTile.posy+" )"; + $tiletype.text = $map.activeTile.type; cascade = v; } Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-19 17:01:06 UTC (rev 6) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-19 17:35:36 UTC (rev 7) @@ -25,6 +25,8 @@ //////// map movement ///////////////////////////////////////// + var dragging = false; + var mx; var my; var ox; @@ -35,8 +37,8 @@ var dragMove = function(v) { var m = thisbox.mouse; - var nx = ox - m.x + mx; - var ny = oy - m.y + my; + var nx = ox + m.x - mx; + var ny = oy + m.y - my; nx = 0 > nx ? (nx > vx ? nx : vx) : 0; ny = 0 > ny ? (ny > vy ? ny : vy) : 0; $map.x = nx; @@ -49,11 +51,15 @@ { surface.delMoveTrap(dragMove); surface.Release2 --= dragStop; + dragging = false; cascade = v; + active = true; } var dragStart = function(v) { + dragging = true; + $cur.display = false; var m = thisbox.mouse; mx = m.x; my = m.y; @@ -72,21 +78,21 @@ thisbox.activeTile = null; - var active = function() + thisbox.active ++= function(v) { - var d = thisbox.distanceto(activeTile); + var d = $map.distanceto(activeTile); $cur.display = true; $cur.width = activeTile.width; $cur.height = activeTile.height; - $cur.x = d.x; - $cur.y = d.y; + $cur.x = d.x + $map.x; + $cur.y = d.y + $map.y; } var enterFunc = function(v) { + cascade = v; activeTile = trapee; - cascade = v; - active(); + if (!dragging) active = true; } thisbox.Leave ++= function(v) { $cur.display = false; } Modified: trunk/Prototype/src/net/sourceforge/fortress/minimap.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-19 17:01:06 UTC (rev 6) +++ trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-19 17:35:36 UTC (rev 7) @@ -24,8 +24,8 @@ var syncView = function() { - $viewbox.width = $minimap.width * (vw / mw); - $viewbox.height = $minimap.height * (vh / mh); + $viewbox.width = $minimap.width * (vw / mw) + 1; + $viewbox.height = $minimap.height * (vh / mh) + 1; $viewbox.x = $minimap.width * (-mx / mw); $viewbox.y = $minimap.height * (-my / mh); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-19 17:01:06
|
Revision: 6 http://fortress.svn.sourceforge.net/fortress/?rev=6&view=rev Author: clrg Date: 2007-06-19 10:01:06 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Make map scrollable with minimap Modified Paths: -------------- trunk/Prototype/src/net/sourceforge/fortress/app.t trunk/Prototype/src/net/sourceforge/fortress/map.t trunk/Prototype/src/net/sourceforge/fortress/maptile.t Added Paths: ----------- trunk/Prototype/src/net/sourceforge/fortress/minimap.t trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-19 17:00:41 UTC (rev 5) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-19 17:01:06 UTC (rev 6) @@ -1,10 +1,28 @@ <!-- Copyright 2007 licensed under GPL v3 --> -<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:role="org.vexi.lib.role"> + <role:surface /> <ui:box> - <map packed="false" /> + <ui:box cols="1" hshrink="true"> + <minimap /> + <ui:box fill="#888888" height="1" /> + <ui:box height="5" /> + <ui:box id="tiletype" textcolor="white" vshrink="true" /> + <ui:box height="5" /> + <ui:box id="position" textcolor="white" vshrink="true" /> + <ui:box /> + </ui:box> + <ui:box fill="#888888" width="1" /> + <map id="map" /> vexi.ui.frame = thisbox; + $map.activeTile ++= function(v) + { + $position.text = "( "+v.posx+", "+v.posy+" )"; + $tiletype.text = v.type; + cascade = v; + } + </ui:box> </vexi> \ No newline at end of file Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-19 17:00:41 UTC (rev 5) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-19 17:01:06 UTC (rev 6) @@ -1,12 +1,114 @@ <!-- Copyright 2007 licensed under GPL v3 --> <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> - <ui:box cols="50" shrink="true"> + <ui:box> + <ui:box id="map" align="topleft" cols="1" packed="false" shrink="true" /> + <ui:box id="cur" align="topleft" fill="#88ffffff" display="false" packed="false" /> - for (var i=0; 2500>i; i++) + var mapDim = function(v) { - thisbox[i] = .maptile(vexi.box); + cascade = v; + surface.setMapDim($map.width, $map.height); } + $map.width ++= mapDim; + $map.height ++= mapDim; + + var mapBox = function(v) + { + cascade = v; + surface.setMapBox(width, height); + } + + thisbox.width ++= mapBox; + thisbox.height ++= mapBox; + + //////// map movement ///////////////////////////////////////// + + var mx; + var my; + var ox; + var oy; + var vx; + var vy; + + var dragMove = function(v) + { + var m = thisbox.mouse; + var nx = ox - m.x + mx; + var ny = oy - m.y + my; + nx = 0 > nx ? (nx > vx ? nx : vx) : 0; + ny = 0 > ny ? (ny > vy ? ny : vy) : 0; + $map.x = nx; + $map.y = ny; + surface.setMapPos(nx, ny); + cascade = v; + } + + var dragStop = function(v) + { + surface.delMoveTrap(dragMove); + surface.Release2 --= dragStop; + cascade = v; + } + + var dragStart = function(v) + { + var m = thisbox.mouse; + mx = m.x; + my = m.y; + ox = $map.x; + oy = $map.y; + vx = width - $map.width; + vy = height - $map.height; + surface.addMoveTrap(dragMove); + surface.Release2 ++= dragStop; + cascade = v; + } + + thisbox.Press2 ++= dragStart; + + //////// tile tracking //////////////////////////////////////// + + thisbox.activeTile = null; + + var active = function() + { + var d = thisbox.distanceto(activeTile); + $cur.display = true; + $cur.width = activeTile.width; + $cur.height = activeTile.height; + $cur.x = d.x; + $cur.y = d.y; + } + + var enterFunc = function(v) + { + activeTile = trapee; + cascade = v; + active(); + } + + thisbox.Leave ++= function(v) { $cur.display = false; } + + for (var i=0; 50>i; i++) + { + $map[i] = vexi.box; + for (var j=0; 50>j; j++) + { + var t = .maptile(vexi.box); + t.Enter ++= enterFunc; + t.posx = j; + t.posy = i; + $map[i][j] = t; + } + } + + surface ++= function(v) + { + cascade = v; + surface.setMapContents($map); + } + </ui:box> </vexi> \ No newline at end of file Modified: trunk/Prototype/src/net/sourceforge/fortress/maptile.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/maptile.t 2007-06-19 17:00:41 UTC (rev 5) +++ trunk/Prototype/src/net/sourceforge/fortress/maptile.t 2007-06-19 17:01:06 UTC (rev 6) @@ -1,10 +1,10 @@ <!-- Copyright 2007 licensed under GPL v3 --> <vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> - <ui:box shrink="true"> + <ui:box shrink="true" width="20" height="20"> - var type = "grass"; - var seed = vexi.math.floor(vexi.math.random()*10); + thisbox.type = "grass"; + thisbox.seed = vexi.math.floor(vexi.math.random()*10); fill = .image[type+seed]; Added: trunk/Prototype/src/net/sourceforge/fortress/minimap.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/minimap.t (rev 0) +++ trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-19 17:01:06 UTC (rev 6) @@ -0,0 +1,76 @@ +<!-- Copyright 2007 licensed under GPL v3 --> + +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> + <ui:box height="100" width="100"> + <ui:box shrink="true"> + <ui:box id="minimap" cols="1" shrink="true" /> + <ui:box id="viewbox" cols="1" align="topleft" packed="false"> + <ui:box fill="white" height="1" /> + <ui:box> + <ui:box fill="white" width="1" /> + <ui:box /> + <ui:box fill="white" width="1" /> + </ui:box> + <ui:box fill="white" height="1" /> + </ui:box> + </ui:box> + + var mw = 1; + var mh = 1; + var mx = 1; + var my = 1; + var vw = 1; + var vh = 1; + + var syncView = function() + { + $viewbox.width = $minimap.width * (vw / mw); + $viewbox.height = $minimap.height * (vh / mh); + $viewbox.x = $minimap.width * (-mx / mw); + $viewbox.y = $minimap.height * (-my / mh); + } + + surface ++= function(v) + { + cascade = v; + + surface.setMapBox = function(_vw, _vh) + { + vw = _vw; + vh = _vh; + syncView(); + } + + surface.setMapDim = function(_mw, _mh) + { + mw = _mw; + mh = _mh; + syncView(); + } + + surface.setMapPos = function(_mx, _my) + { + mx = _mx; + my = _my; + syncView(); + } + + surface.setMapContents = function(map) + { + var ni = map.numchildren; + var nj = map[0].numchildren; + for (var i=0; ni > i; i++) + { + $minimap[i] = vexi.box; + for (var j=0; nj > j; j++) + { + var t = .minimaptile(vexi.box); + t.setType(map[i][j].type, map[i][j].seed); + $minimap[i][j] = t; + } + } + } + } + + </ui:box> +</vexi> Added: trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t (rev 0) +++ trunk/Prototype/src/net/sourceforge/fortress/minimaptile.t 2007-06-19 17:01:06 UTC (rev 6) @@ -0,0 +1,35 @@ +<!-- Copyright 2007 licensed under GPL v3 --> + +<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 "90"; + case 1: return "98"; + case 2: return "A0"; + case 3: return "A8"; + case 4: return "B0"; + case 5: return "B8"; + case 6: return "C0"; + case 7: return "C8"; + case 8: return "D0"; + case 9: return "D8"; + } + return "FF"; + } + + thisbox.setType = function(t, s) + { + switch (t) + { + case "grass": + default: + fill = "#00" + getFillHex(s) + "00"; + } + } + + </ui:box> +</vexi> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-19 17:00:43
|
Revision: 5 http://fortress.svn.sourceforge.net/fortress/?rev=5&view=rev Author: clrg Date: 2007-06-19 10:00:41 -0700 (Tue, 19 Jun 2007) Log Message: ----------- Add eclipse project file Added Paths: ----------- trunk/Prototype/.project Added: trunk/Prototype/.project =================================================================== --- trunk/Prototype/.project (rev 0) +++ trunk/Prototype/.project 2007-06-19 17:00:41 UTC (rev 5) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Prototype</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + <nature>org.vexi.vexidev.vexiNature</nature> + </natures> +</projectDescription> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-18 12:24:20
|
Revision: 4 http://fortress.svn.sourceforge.net/fortress/?rev=4&view=rev Author: clrg Date: 2007-06-18 05:24:21 -0700 (Mon, 18 Jun 2007) Log Message: ----------- Add initial Fortress vexi prototype, currently just tiled grass Added Paths: ----------- trunk/Prototype/doc/ trunk/Prototype/doc/empty.t trunk/Prototype/src/ trunk/Prototype/src/main.t trunk/Prototype/src/net/ trunk/Prototype/src/net/sourceforge/ trunk/Prototype/src/net/sourceforge/fortress/ trunk/Prototype/src/net/sourceforge/fortress/app.t trunk/Prototype/src/net/sourceforge/fortress/image/ trunk/Prototype/src/net/sourceforge/fortress/image/grass0.png trunk/Prototype/src/net/sourceforge/fortress/image/grass1.png trunk/Prototype/src/net/sourceforge/fortress/image/grass2.png trunk/Prototype/src/net/sourceforge/fortress/image/grass3.png trunk/Prototype/src/net/sourceforge/fortress/image/grass4.png trunk/Prototype/src/net/sourceforge/fortress/image/grass5.png trunk/Prototype/src/net/sourceforge/fortress/image/grass6.png trunk/Prototype/src/net/sourceforge/fortress/image/grass7.png trunk/Prototype/src/net/sourceforge/fortress/image/grass8.png trunk/Prototype/src/net/sourceforge/fortress/image/grass9.png trunk/Prototype/src/net/sourceforge/fortress/map.t trunk/Prototype/src/net/sourceforge/fortress/maptile.t trunk/Prototype/xcf/ trunk/Prototype/xcf/grasstile.xcf Added: trunk/Prototype/doc/empty.t =================================================================== --- trunk/Prototype/doc/empty.t (rev 0) +++ trunk/Prototype/doc/empty.t 2007-06-18 12:24:21 UTC (rev 4) @@ -0,0 +1,7 @@ +<!-- Copyright 2007 licensed under GPL v3 --> + +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> + <ui:box> + + </ui:box> +</vexi> Added: trunk/Prototype/src/main.t =================================================================== --- trunk/Prototype/src/main.t (rev 0) +++ trunk/Prototype/src/main.t 2007-06-18 12:24:21 UTC (rev 4) @@ -0,0 +1,5 @@ +<!-- Copyright 2007 licensed under GPL v3 --> + +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> + <app /> +</vexi> Added: trunk/Prototype/src/net/sourceforge/fortress/app.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/app.t (rev 0) +++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-18 12:24:21 UTC (rev 4) @@ -0,0 +1,10 @@ +<!-- Copyright 2007 licensed under GPL v3 --> + +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> + <ui:box> + <map packed="false" /> + + vexi.ui.frame = thisbox; + + </ui:box> +</vexi> \ No newline at end of file Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass0.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass0.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass1.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass2.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass3.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass4.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass5.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass6.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass7.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass8.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/image/grass9.png =================================================================== (Binary files differ) Property changes on: trunk/Prototype/src/net/sourceforge/fortress/image/grass9.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Prototype/src/net/sourceforge/fortress/map.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/map.t (rev 0) +++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-18 12:24:21 UTC (rev 4) @@ -0,0 +1,12 @@ +<!-- Copyright 2007 licensed under GPL v3 --> + +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> + <ui:box cols="50" shrink="true"> + + for (var i=0; 2500>i; i++) + { + thisbox[i] = .maptile(vexi.box); + } + + </ui:box> +</vexi> \ No newline at end of file Added: trunk/Prototype/src/net/sourceforge/fortress/maptile.t =================================================================== --- trunk/Prototype/src/net/sourceforge/fortress/maptile.t (rev 0) +++ trunk/Prototype/src/net/sourceforge/fortress/maptile.t 2007-06-18 12:24:21 UTC (rev 4) @@ -0,0 +1,12 @@ +<!-- Copyright 2007 licensed under GPL v3 --> + +<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress"> + <ui:box shrink="true"> + + var type = "grass"; + var seed = vexi.math.floor(vexi.math.random()*10); + + fill = .image[type+seed]; + + </ui:box> +</vexi> \ No newline at end of file Added: trunk/Prototype/xcf/grasstile.xcf =================================================================== (Binary files differ) Property changes on: trunk/Prototype/xcf/grasstile.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-06-18 12:19:58
|
Revision: 3 http://fortress.svn.sourceforge.net/fortress/?rev=3&view=rev Author: clrg Date: 2007-06-18 05:19:59 -0700 (Mon, 18 Jun 2007) Log Message: ----------- Created folder remotely Added Paths: ----------- trunk/Prototype/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gi...@us...> - 2007-06-11 17:51:00
|
Revision: 2 http://fortress.svn.sourceforge.net/fortress/?rev=2&view=rev Author: gilead Date: 2007-06-11 10:50:44 -0700 (Mon, 11 Jun 2007) Log Message: ----------- - import Added Paths: ----------- trunk/Fortress/.classpath trunk/Fortress/.project Added: trunk/Fortress/.classpath =================================================================== --- trunk/Fortress/.classpath (rev 0) +++ trunk/Fortress/.classpath 2007-06-11 17:50:44 UTC (rev 2) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path=""/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/Fortress/.project =================================================================== --- trunk/Fortress/.project (rev 0) +++ trunk/Fortress/.project 2007-06-11 17:50:44 UTC (rev 2) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Fortress</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gi...@us...> - 2007-06-11 17:50:10
|
Revision: 1 http://fortress.svn.sourceforge.net/fortress/?rev=1&view=rev Author: gilead Date: 2007-06-11 10:49:07 -0700 (Mon, 11 Jun 2007) Log Message: ----------- Share project 'Fortress' into 'https://fortress.svn.sourceforge.net/svnroot/fortress' Added Paths: ----------- trunk/ trunk/Fortress/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |