From e3c523d63d33be51600d8a15e411a2da7f720dd7 Mon Sep 17 00:00:00 2001
From: Rob L <robert@slowsilver.net>
Date: Wed, 13 Jul 2016 11:49:18 -0400
Subject: [PATCH] Add border names to territories

---
 assets/down_arrow.jpg   | Bin 0 -> 682 bytes
 assets/down_arrow.png   | Bin 0 -> 2801 bytes
 assets/select-arrow.png | Bin 0 -> 129 bytes
 js/mapviewgl.js         |  13 +++++++++++--
 webviewgl.htm           |   4 ++--
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 assets/down_arrow.jpg
 create mode 100644 assets/down_arrow.png
 create mode 100644 assets/select-arrow.png

diff --git a/assets/down_arrow.jpg b/assets/down_arrow.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a3a75352de657ad3726610299bf186b44e66c699
GIT binary patch
literal 682
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfx!kS^o~KzF(p4Kl_BK-
zP=t}0L6n7=jf)q^JPyRK85o$Hfq2FL+YBuXY%DA+tSoG-tZbZYK+Mg-#>T<T!^OqT
z#l<7Q0|o*-eEb6Zd_2O!A|k@VGSbr0GV*Z1$j;8r%fl-nARr+nDkv%immrq${}6*9
z2ZJJmA~T~P1Ct;lvmoRDBMg%m7{LJOei&e6W@2GuWQ1{Hv;YGWBMUQ(2c&^PBcR}5
zXdtL4$iT>oBmrb9I4~*(3Za|fAj}BV#md42HwNewMF9sx$3O*x#)XL+3okzWe~W>K
znGxtfW<j78zb`e3Jo!B3$_0rzv!^hLFfiBy<vD<kV`OF8^7<mTVdpBN1J+N$f=nR6
zlVBz@g2}|hX3yjg5k)W=8G)icQ<C)|#xXP6D_)i~_`0IPUON1Mg?)+Bxx%JrQ@Y<S
zVB%}w)x7~RAEfHce+GzI2oA!z0u7G33_=V73=Hyca|Hsl4#dVPwKz)3%CO9ElSoeI
zul(w>s_otTWB0TU?OApD=jN-54AR^=2~A2KH>Gy&-}Crq;G%;MR(xdNzJP<_!JB%x
L<pRi-gE=<=!=jTx

literal 0
HcmV?d00001

diff --git a/assets/down_arrow.png b/assets/down_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fb3ffe1127d01bd2d3664bf8c9c9b2cb8bc64b4
GIT binary patch
literal 2801
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

literal 0
HcmV?d00001

diff --git a/assets/select-arrow.png b/assets/select-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca334022ab7d6da7c58a231a574e7fdc590b28ec
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)I!3HFqj;YoHDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MarHojv*DdlK$|s@K`Vi3m89|ket$FctJJ6O7eop0Z}Fv
a35MgHEL;rk3a5d}89ZJ6T-G@yGywp$tRcq$

literal 0
HcmV?d00001

diff --git a/js/mapviewgl.js b/js/mapviewgl.js
index 697b46f..4c0224d 100644
--- a/js/mapviewgl.js
+++ b/js/mapviewgl.js
@@ -100,8 +100,17 @@ for (var key in jsonEmpire) {
   	borders[border.name].position.x = border.x;
   	borders[border.name].position.y = border.y;
   	borders[border.name].position.z = border.z;
-  	scene.add( borders[border.name] );  
-  }
+  	scene.add( borders[border.name] );
+	if (border.radius > 10) {
+		var text = new Text2D(border.name, { align: textAlign.center,  font: '25px Arial', fillStyle: '#777' , antialias: false });
+		text.material.alphaTest = 0.5;
+		text.position.set(border.x,border.y,border.z);
+		text.scale.set(0.75,0.75,0.75);
+		scene.add(text);
+	}
+   }
+ 
+  
   
   // Planet Generation
   for (var key in area["planets"]) {
diff --git a/webviewgl.htm b/webviewgl.htm
index 6ba7257..b9ec1ac 100644
--- a/webviewgl.htm
+++ b/webviewgl.htm
@@ -12,9 +12,9 @@
       <style type="text/css">
           body { margin: 0; overflow:hidden;}
           canvas { width: 75%; height: 100% ;}
-	  .reset-button {margin: 0; padding: 0; padding: 5px 5px; color: #AAA;  }
+	  .reset-button {margin: 0; padding: 0; padding: 3px 3px; color: #AAA;  }
 	  .menu-button {  float: right; position: absolute; right: 0.1vw; top: 0; z-index: 5; color:white; background-color:#003133; padding: 0px; font-weight: bold; font-size:2.5vh; }
-	  .reset-container { margin: 0; padding: 0; padding: 8px; font-weight: bold; text-align: center; font-family: 'Space Mono', monospace; color:#67989A; background-color: maroon;  width: 100%; height: 2vh; float:bottom;  }
+	  .reset-container { margin: 0; padding: 10px; font-weight: bold; text-align: center; font-family: 'Space Mono', monospace; color:#67989A; background-color: maroon;  width: 100%; height: 2.5vh; float:bottom;  }
 	  .wvg-controls { position: fixed; left: 85%; height: 96%; width: 15%; margin-top: 0; display: none;} 
 	  ul.wvg-navbar { height: 3vh; width: 100%; background-color: #003133; list-style-type: none; overflow: hidden; padding: 0; margin: 0;  }
 	  ul.wvg-navbar li { width:auto; height: 100%; float: left; } .wvg-tablink { margin: 0; padding: 0; padding: 8px 10px; font-weight: bold; text-align: center; font-family: 'Space Mono', monospace; color:#67989A; }