Menu
▾
▴
[Hgengine-cvs] SF.net SVN: hgengine:[396] Mercury2
|
From: <cn...@us...> - 2009-07-01 17:27:03
|
Revision: 396
http://hgengine.svn.sourceforge.net/hgengine/?rev=396&view=rev
Author: cnlohr
Date: 2009-07-01 17:27:00 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
move stuff to the approprate places
Modified Paths:
--------------
Mercury2/src/Mercury2.cpp
Mercury2/src/MercuryFile.cpp
Mercury2/src/MercuryTheme.cpp
Mercury2/src/MercuryTheme.h
Mercury2/src/MercuryUtil.cpp
Mercury2/src/MercuryUtil.h
Added Paths:
-----------
Mercury2/Themes/default/File/
Mercury2/Themes/default/File/scenegraph.xml
Mercury2/Themes/default/Font/
Mercury2/Themes/default/Font/testfont.hgfont
Mercury2/Themes/default/Font/testfont.png
Mercury2/Themes/default/Graphic/
Mercury2/Themes/default/Graphic/flame.png
Mercury2/Themes/default/Graphic/test.bmp
Mercury2/Themes/default/Graphic/test.frag
Mercury2/Themes/default/Graphic/test.vert
Mercury2/Themes/default/Graphic/test2.bmp
Mercury2/Themes/default/Graphic/test2.png
Mercury2/Themes/default/Graphic/testShader.frag
Mercury2/Themes/default/Graphic/testShader.vert
Mercury2/Themes/default/Model/
Mercury2/Themes/default/Model/beerhall.hgmdl
Mercury2/Themes/default/Model/gunther.hgmdl
Mercury2/Themes/default/Model/gunther.png
Mercury2/Themes/default/Model/lamp.hgmdl
Mercury2/Themes/default/Model/lamp.png
Mercury2/Themes/default/Model/lampN.hgmdl
Mercury2/Themes/default/Model/map.hgmdl
Mercury2/Themes/default/Model/map.png
Removed Paths:
-------------
Mercury2/beerhall.hgmdl
Mercury2/flame.png
Mercury2/lamp.hgmdl
Mercury2/lamp.png
Mercury2/lampN.hgmdl
Mercury2/map.hgmdl
Mercury2/map.png
Mercury2/scenegraph.xml
Mercury2/test.bmp
Mercury2/test2.bmp
Mercury2/test2.png
Mercury2/testShader.frag
Mercury2/testShader.vert
Mercury2/testfont.hgfont
Mercury2/testfont.png
Added: Mercury2/Themes/default/File/scenegraph.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraph.xml (rev 0)
+++ Mercury2/Themes/default/File/scenegraph.xml 2009-07-01 17:27:00 UTC (rev 396)
@@ -0,0 +1,50 @@
+<SceneGraph name="root">
+<!-- <node type="cameranode" movx="6" movz="-5.5" movy="3" rotx="-45" roty="90">
+ <node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100"/>
+ </node>
+-->
+ <node type="cameranode" movx="0" movz="0" movy="0" rotx="0" roty="0" rotz="0" name="camera">
+ <node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100" name="vp"/>
+ </node>
+
+ <node type="transformnode" movz="-5" >
+ <node type="TextNode" text="test font 123 HELLO WORLD!!! WOOT!" font="FONT:testfont.hgfont" size=".01" width="300" alphaPath="true" alignment="FIT_FULL" />
+ </node>
+<!-- <asset type="texture" file="screenFBO_0" dynamic="true"/>
+ <asset type="fullscreenquad"/>
+ <node type="mercuryfbo" width="640" height="480" depth="true" tnum="2" name="screenFBO" usescreensize="true">
+ <asset type="shader" file="testShader"/>
+--> <node type="transformnode" rotx="-90" movz="-10" movx="0" movy="-5">
+ <asset type="texture" file="MODEL:map.png"/>
+ <asset type="hgmdlmodel" file="MODEL:map.hgmdl" />
+ </node>
+ <node type="mercurynode" name="lampForest" >
+ <node type="transformnode" movz="-5" movx="0" movy="0" name="lamprow" >
+ <node type="mercurynode" name="lamp">
+ <node type="transformnode" rotx="-90" >
+ <asset type="texture" file="MODEL:lamp.png"/>
+ <asset type="hgmdlmodel" file="MODEL:lampN.hgmdl" />
+ </node>
+ <node type="billboardnode" billboardaxis="0,1,0" spheremode="true" >
+ <node type="transformnode" roty="180" scalex="0.1" scaley="0.1" alphaPath="true">
+ <asset type="texture" file="GRAPHIC:flame.png"/>
+ <asset type="quad"/>
+ </node>
+ </node>
+ </node>
+ <node type="transformnode" movx="1" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="2" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="3" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="-1" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="-2" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="-3" fallback="lamprow.lamp" />
+ </node>
+ <node type="transformnode" movz="-6" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-7" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-8" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-9" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-4" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-3" fallback="lampForest.lamprow"/>
+ </node>
+<!-- </node> -->
+</SceneGraph>
Added: Mercury2/Themes/default/Font/testfont.hgfont
===================================================================
--- Mercury2/Themes/default/Font/testfont.hgfont (rev 0)
+++ Mercury2/Themes/default/Font/testfont.hgfont 2009-07-01 17:27:00 UTC (rev 396)
@@ -0,0 +1,258 @@
+FONT:testfont.png
+64 4.000000 15.000000 80.000000
+0 0.000000 0.000000 0.031250 0.040039 32 41 8 41
+1 0.062500 0.000000 0.093750 0.040039 32 41 8 41
+2 0.125000 0.000000 0.156250 0.040039 32 41 8 41
+3 0.187500 0.000000 0.218750 0.040039 32 41 8 41
+4 0.250000 0.000000 0.281250 0.040039 32 41 8 41
+5 0.312500 0.000000 0.343750 0.040039 32 41 8 41
+6 0.375000 0.000000 0.406250 0.040039 32 41 8 41
+7 0.437500 0.000000 0.468750 0.040039 32 41 8 41
+8 0.500000 0.000000 0.531250 0.040039 32 41 8 41
+9 0.562500 0.000000 0.593750 0.040039 32 41 8 41
+10 0.625000 0.000000 0.656250 0.040039 32 41 8 41
+11 0.687500 0.000000 0.718750 0.040039 32 41 8 41
+12 0.750000 0.000000 0.781250 0.040039 32 41 8 41
+13 0.812500 0.000000 0.843750 0.040039 32 41 8 41
+14 0.875000 0.000000 0.906250 0.040039 32 41 8 41
+15 0.937500 0.000000 0.968750 0.040039 32 41 8 41
+16 0.000000 0.062500 0.031250 0.102539 32 41 8 41
+17 0.062500 0.062500 0.093750 0.102539 32 41 8 41
+18 0.125000 0.062500 0.156250 0.102539 32 41 8 41
+19 0.187500 0.062500 0.218750 0.102539 32 41 8 41
+20 0.250000 0.062500 0.281250 0.102539 32 41 8 41
+21 0.312500 0.062500 0.343750 0.102539 32 41 8 41
+22 0.375000 0.062500 0.406250 0.102539 32 41 8 41
+23 0.437500 0.062500 0.468750 0.102539 32 41 8 41
+24 0.500000 0.062500 0.531250 0.102539 32 41 8 41
+25 0.562500 0.062500 0.593750 0.102539 32 41 8 41
+26 0.625000 0.062500 0.656250 0.102539 32 41 8 41
+27 0.687500 0.062500 0.718750 0.102539 32 41 8 41
+28 0.750000 0.062500 0.781250 0.102539 32 41 8 41
+29 0.812500 0.062500 0.843750 0.102539 32 41 8 41
+30 0.875000 0.062500 0.906250 0.102539 32 41 8 41
+31 0.937500 0.062500 0.968750 0.102539 32 41 8 41
+32 0.000000 0.125000 0.000000 0.125000 0 0 0 0
+33 0.062500 0.125000 0.068359 0.169922 6 46 7 46
+34 0.125000 0.125000 0.141602 0.140625 17 16 3 46
+35 0.187500 0.125000 0.221680 0.169922 35 46 0 46
+36 0.250000 0.125000 0.279297 0.178711 30 55 3 48
+37 0.312500 0.125000 0.360352 0.171875 49 48 4 47
+38 0.375000 0.125000 0.413086 0.171875 39 48 3 47
+39 0.437500 0.125000 0.443359 0.140625 6 16 3 46
+40 0.500000 0.125000 0.515625 0.182617 16 59 4 46
+41 0.562500 0.125000 0.578125 0.182617 16 59 1 46
+42 0.625000 0.125000 0.645508 0.143555 21 19 2 46
+43 0.687500 0.125000 0.717773 0.155273 31 31 3 38
+44 0.750000 0.125000 0.755859 0.139648 6 15 6 6
+45 0.812500 0.125000 0.829102 0.129883 17 5 2 19
+46 0.875000 0.125000 0.880859 0.130859 6 6 6 6
+47 0.937500 0.125000 0.956055 0.169922 19 46 0 46
+48 0.000000 0.187500 0.029297 0.233398 30 47 3 46
+49 0.062500 0.187500 0.079102 0.232422 17 46 7 46
+50 0.125000 0.187500 0.155273 0.232422 31 46 1 46
+51 0.187500 0.187500 0.216797 0.233398 30 47 3 46
+52 0.250000 0.187500 0.281250 0.231445 32 45 1 45
+53 0.312500 0.187500 0.341797 0.232422 30 46 3 45
+54 0.375000 0.187500 0.405273 0.233398 31 47 2 46
+55 0.437500 0.187500 0.466797 0.231445 30 45 3 45
+56 0.500000 0.187500 0.529297 0.233398 30 47 3 46
+57 0.562500 0.187500 0.591797 0.233398 30 47 3 46
+58 0.625000 0.187500 0.630859 0.220703 6 34 6 34
+59 0.687500 0.187500 0.693359 0.229492 6 43 6 34
+60 0.750000 0.187500 0.778320 0.217773 29 31 4 38
+61 0.812500 0.187500 0.841797 0.206055 30 19 3 32
+62 0.875000 0.187500 0.903320 0.217773 29 31 4 38
+63 0.937500 0.187500 0.966797 0.233398 30 47 3 47
+64 0.000000 0.250000 0.057617 0.308594 59 60 3 47
+65 0.062500 0.250000 0.106445 0.294922 45 46 -1 46
+66 0.125000 0.250000 0.159180 0.294922 35 46 5 46
+67 0.187500 0.250000 0.226562 0.296875 40 48 3 47
+68 0.250000 0.250000 0.287109 0.294922 38 46 5 46
+69 0.312500 0.250000 0.346680 0.294922 35 46 5 46
+70 0.375000 0.250000 0.405273 0.294922 31 46 5 46
+71 0.437500 0.250000 0.479492 0.296875 43 48 3 47
+72 0.500000 0.250000 0.535156 0.294922 36 46 5 46
+73 0.562500 0.250000 0.568359 0.294922 6 46 6 46
+74 0.625000 0.250000 0.650391 0.295898 26 47 1 46
+75 0.687500 0.250000 0.724609 0.294922 38 46 5 46
+76 0.750000 0.250000 0.778320 0.294922 29 46 5 46
+77 0.812500 0.250000 0.854492 0.294922 43 46 5 46
+78 0.875000 0.250000 0.910156 0.294922 36 46 5 46
+79 0.937500 0.250000 0.980469 0.296875 44 48 3 47
+80 0.000000 0.312500 0.034180 0.357422 35 46 5 46
+81 0.062500 0.312500 0.105469 0.362305 44 51 3 47
+82 0.125000 0.312500 0.164062 0.357422 40 46 5 46
+83 0.187500 0.312500 0.223633 0.359375 37 48 3 47
+84 0.250000 0.312500 0.285156 0.357422 36 46 2 46
+85 0.312500 0.312500 0.347656 0.358398 36 47 5 46
+86 0.375000 0.312500 0.418945 0.357422 45 46 -1 46
+87 0.437500 0.312500 0.499023 0.357422 63 46 0 46
+88 0.500000 0.312500 0.540039 0.357422 41 46 -1 46
+89 0.562500 0.312500 0.603516 0.357422 42 46 0 46
+90 0.625000 0.312500 0.660156 0.357422 36 46 1 46
+91 0.687500 0.312500 0.699219 0.370117 12 59 4 46
+92 0.750000 0.312500 0.768555 0.357422 19 46 -1 46
+93 0.812500 0.312500 0.824219 0.370117 12 59 2 46
+94 0.875000 0.312500 0.899414 0.336914 25 25 1 47
+95 0.937500 0.312500 0.973633 0.317383 37 5 -1 -8
+96 0.000000 0.375000 0.010742 0.383789 11 9 3 46
+97 0.062500 0.375000 0.091797 0.410156 30 36 3 35
+98 0.125000 0.375000 0.153320 0.420898 29 47 4 46
+99 0.187500 0.375000 0.215820 0.410156 29 36 3 35
+100 0.250000 0.375000 0.278320 0.420898 29 47 2 46
+101 0.312500 0.375000 0.342773 0.410156 31 36 2 35
+102 0.375000 0.375000 0.394531 0.420898 20 47 1 47
+103 0.437500 0.375000 0.465820 0.422852 29 49 2 35
+104 0.500000 0.375000 0.527344 0.419922 28 46 4 46
+105 0.562500 0.375000 0.568359 0.419922 6 46 4 46
+106 0.625000 0.375000 0.637695 0.433594 13 60 -3 46
+107 0.687500 0.375000 0.714844 0.419922 28 46 4 46
+108 0.750000 0.375000 0.755859 0.419922 6 46 4 46
+109 0.812500 0.375000 0.857422 0.409180 46 35 4 35
+110 0.875000 0.375000 0.902344 0.409180 28 35 4 35
+111 0.937500 0.375000 0.966797 0.410156 30 36 3 35
+112 0.000000 0.437500 0.028320 0.484375 29 48 4 35
+113 0.062500 0.437500 0.090820 0.484375 29 48 2 35
+114 0.125000 0.437500 0.142578 0.471680 18 35 4 35
+115 0.187500 0.437500 0.213867 0.472656 27 36 2 35
+116 0.250000 0.437500 0.265625 0.483398 16 47 1 46
+117 0.312500 0.437500 0.339844 0.471680 28 35 4 34
+118 0.375000 0.437500 0.405273 0.470703 31 34 1 34
+119 0.437500 0.437500 0.485352 0.470703 49 34 -1 34
+120 0.500000 0.437500 0.531250 0.470703 32 34 0 34
+121 0.562500 0.437500 0.593750 0.484375 32 48 0 34
+122 0.625000 0.437500 0.653320 0.470703 29 34 1 34
+123 0.687500 0.437500 0.705078 0.497070 18 61 1 47
+124 0.750000 0.437500 0.754883 0.496094 5 60 6 46
+125 0.812500 0.437500 0.830078 0.497070 18 61 2 47
+126 0.875000 0.437500 0.906250 0.448242 32 11 2 28
+127 0.937500 0.437500 0.968750 0.477539 32 41 8 41
+128 0.000000 0.500000 0.031250 0.540039 32 41 8 41
+129 0.062500 0.500000 0.093750 0.540039 32 41 8 41
+130 0.125000 0.500000 0.156250 0.540039 32 41 8 41
+131 0.187500 0.500000 0.218750 0.540039 32 41 8 41
+132 0.250000 0.500000 0.281250 0.540039 32 41 8 41
+133 0.312500 0.500000 0.343750 0.540039 32 41 8 41
+134 0.375000 0.500000 0.406250 0.540039 32 41 8 41
+135 0.437500 0.500000 0.468750 0.540039 32 41 8 41
+136 0.500000 0.500000 0.531250 0.540039 32 41 8 41
+137 0.562500 0.500000 0.593750 0.540039 32 41 8 41
+138 0.625000 0.500000 0.656250 0.540039 32 41 8 41
+139 0.687500 0.500000 0.718750 0.540039 32 41 8 41
+140 0.750000 0.500000 0.781250 0.540039 32 41 8 41
+141 0.812500 0.500000 0.843750 0.540039 32 41 8 41
+142 0.875000 0.500000 0.906250 0.540039 32 41 8 41
+143 0.937500 0.500000 0.968750 0.540039 32 41 8 41
+144 0.000000 0.562500 0.031250 0.602539 32 41 8 41
+145 0.062500 0.562500 0.093750 0.602539 32 41 8 41
+146 0.125000 0.562500 0.156250 0.602539 32 41 8 41
+147 0.187500 0.562500 0.218750 0.602539 32 41 8 41
+148 0.250000 0.562500 0.281250 0.602539 32 41 8 41
+149 0.312500 0.562500 0.343750 0.602539 32 41 8 41
+150 0.375000 0.562500 0.406250 0.602539 32 41 8 41
+151 0.437500 0.562500 0.468750 0.602539 32 41 8 41
+152 0.500000 0.562500 0.531250 0.602539 32 41 8 41
+153 0.562500 0.562500 0.593750 0.602539 32 41 8 41
+154 0.625000 0.562500 0.656250 0.602539 32 41 8 41
+155 0.687500 0.562500 0.718750 0.602539 32 41 8 41
+156 0.750000 0.562500 0.781250 0.602539 32 41 8 41
+157 0.812500 0.562500 0.843750 0.602539 32 41 8 41
+158 0.875000 0.562500 0.906250 0.602539 32 41 8 41
+159 0.937500 0.562500 0.968750 0.602539 32 41 8 41
+160 0.000000 0.625000 0.000000 0.625000 0 0 0 0
+161 0.062500 0.625000 0.068359 0.670898 6 47 7 34
+162 0.125000 0.625000 0.153320 0.682617 29 59 3 46
+163 0.187500 0.625000 0.219727 0.671875 33 48 1 47
+164 0.250000 0.625000 0.281250 0.652344 32 28 1 36
+165 0.312500 0.625000 0.346680 0.669922 35 46 -1 46
+166 0.375000 0.625000 0.379883 0.683594 5 60 6 46
+167 0.437500 0.625000 0.466797 0.683594 30 60 3 47
+168 0.500000 0.625000 0.517578 0.630859 18 6 2 46
+169 0.562500 0.625000 0.608398 0.671875 47 48 0 47
+170 0.625000 0.625000 0.646484 0.647461 22 23 1 47
+171 0.687500 0.625000 0.713867 0.653320 27 29 4 31
+172 0.750000 0.625000 0.779297 0.643555 30 19 3 32
+173 0.812500 0.625000 0.829102 0.629883 17 5 2 19
+174 0.875000 0.625000 0.920898 0.671875 47 48 0 47
+175 0.937500 0.625000 0.973633 0.629883 37 5 -1 54
+176 0.000000 0.687500 0.016602 0.704102 17 17 4 47
+177 0.062500 0.687500 0.092773 0.724609 31 38 2 38
+178 0.125000 0.687500 0.143555 0.709961 19 23 1 47
+179 0.187500 0.687500 0.206055 0.709961 19 23 1 47
+180 0.250000 0.687500 0.260742 0.696289 11 9 7 45
+181 0.312500 0.687500 0.338867 0.733398 27 47 5 34
+182 0.375000 0.687500 0.408203 0.745117 34 59 0 46
+183 0.437500 0.687500 0.443359 0.693359 6 6 6 25
+184 0.500000 0.687500 0.512695 0.701172 13 14 3 0
+185 0.562500 0.687500 0.574219 0.709961 12 23 4 47
+186 0.625000 0.687500 0.645508 0.709961 21 23 1 47
+187 0.687500 0.687500 0.713867 0.715820 27 29 5 31
+188 0.750000 0.687500 0.796875 0.735352 48 49 4 47
+189 0.812500 0.687500 0.859375 0.734375 48 48 4 47
+190 0.875000 0.687500 0.924805 0.735352 51 49 1 47
+191 0.937500 0.687500 0.965820 0.734375 29 48 5 34
+192 0.000000 0.750000 0.043945 0.806641 45 58 -1 58
+193 0.062500 0.750000 0.106445 0.806641 45 58 -1 58
+194 0.125000 0.750000 0.168945 0.806641 45 58 -1 58
+195 0.187500 0.750000 0.231445 0.805664 45 57 -1 57
+196 0.250000 0.750000 0.293945 0.803711 45 55 -1 55
+197 0.312500 0.750000 0.356445 0.803711 45 55 -1 55
+198 0.375000 0.750000 0.435547 0.794922 62 46 -1 46
+199 0.437500 0.750000 0.476562 0.809570 40 61 3 47
+200 0.500000 0.750000 0.534180 0.806641 35 58 5 58
+201 0.562500 0.750000 0.596680 0.806641 35 58 5 58
+202 0.625000 0.750000 0.659180 0.806641 35 58 5 58
+203 0.687500 0.750000 0.721680 0.803711 35 55 5 55
+204 0.750000 0.750000 0.760742 0.806641 11 58 2 58
+205 0.812500 0.750000 0.823242 0.806641 11 58 5 58
+206 0.875000 0.750000 0.894531 0.806641 20 58 -1 58
+207 0.937500 0.750000 0.955078 0.803711 18 55 0 55
+208 0.000000 0.812500 0.041992 0.857422 43 46 0 46
+209 0.062500 0.812500 0.097656 0.868164 36 57 5 57
+210 0.125000 0.812500 0.167969 0.870117 44 59 3 58
+211 0.187500 0.812500 0.230469 0.870117 44 59 3 58
+212 0.250000 0.812500 0.292969 0.870117 44 59 3 58
+213 0.312500 0.812500 0.355469 0.869141 44 58 3 57
+214 0.375000 0.812500 0.417969 0.867188 44 56 3 55
+215 0.437500 0.812500 0.463867 0.838867 27 27 5 36
+216 0.500000 0.812500 0.543945 0.861328 45 50 3 47
+217 0.562500 0.812500 0.597656 0.870117 36 59 5 58
+218 0.625000 0.812500 0.660156 0.870117 36 59 5 58
+219 0.687500 0.812500 0.722656 0.870117 36 59 5 58
+220 0.750000 0.812500 0.785156 0.867188 36 56 5 55
+221 0.812500 0.812500 0.853516 0.869141 42 58 0 58
+222 0.875000 0.812500 0.909180 0.857422 35 46 5 46
+223 0.937500 0.812500 0.968750 0.859375 32 48 5 47
+224 0.000000 0.875000 0.029297 0.920898 30 47 3 46
+225 0.062500 0.875000 0.091797 0.920898 30 47 3 46
+226 0.125000 0.875000 0.154297 0.920898 30 47 3 46
+227 0.187500 0.875000 0.216797 0.919922 30 46 3 45
+228 0.250000 0.875000 0.279297 0.917969 30 44 3 43
+229 0.312500 0.875000 0.341797 0.922852 30 49 3 48
+230 0.375000 0.875000 0.425781 0.910156 52 36 2 35
+231 0.437500 0.875000 0.465820 0.922852 29 49 3 35
+232 0.500000 0.875000 0.530273 0.920898 31 47 2 46
+233 0.562500 0.875000 0.592773 0.920898 31 47 2 46
+234 0.625000 0.875000 0.655273 0.920898 31 47 2 46
+235 0.687500 0.875000 0.717773 0.917969 31 44 2 43
+236 0.750000 0.875000 0.760742 0.919922 11 46 2 46
+237 0.812500 0.875000 0.823242 0.919922 11 46 5 46
+238 0.875000 0.875000 0.894531 0.919922 20 46 -1 46
+239 0.937500 0.875000 0.955078 0.916992 18 43 0 43
+240 0.000000 0.937500 0.030273 0.983398 31 47 2 46
+241 0.062500 0.937500 0.089844 0.981445 28 45 4 45
+242 0.125000 0.937500 0.154297 0.983398 30 47 3 46
+243 0.187500 0.937500 0.216797 0.983398 30 47 3 46
+244 0.250000 0.937500 0.279297 0.983398 30 47 3 46
+245 0.312500 0.937500 0.341797 0.982422 30 46 3 45
+246 0.375000 0.937500 0.404297 0.980469 30 44 3 43
+247 0.437500 0.937500 0.468750 0.961914 32 25 3 35
+248 0.500000 0.937500 0.531250 0.977539 32 41 3 38
+249 0.562500 0.937500 0.589844 0.983398 28 47 4 46
+250 0.625000 0.937500 0.652344 0.983398 28 47 4 46
+251 0.687500 0.937500 0.714844 0.983398 28 47 4 46
+252 0.750000 0.937500 0.777344 0.980469 28 44 4 43
+253 0.812500 0.937500 0.843750 0.996094 32 60 0 46
+254 0.875000 0.937500 0.903320 0.995117 29 59 4 46
+255 0.937500 0.937500 0.968750 0.993164 32 57 0 43
Added: Mercury2/Themes/default/Font/testfont.png
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Font/testfont.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Graphic/flame.png
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Graphic/flame.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Graphic/test.bmp
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Graphic/test.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Graphic/test.frag
===================================================================
--- Mercury2/Themes/default/Graphic/test.frag (rev 0)
+++ Mercury2/Themes/default/Graphic/test.frag 2009-07-01 17:27:00 UTC (rev 396)
@@ -0,0 +1,4 @@
+void main()
+{
+ gl_FragColor = vec4( 1., 0., 1., 1. );
+}
\ No newline at end of file
Added: Mercury2/Themes/default/Graphic/test.vert
===================================================================
--- Mercury2/Themes/default/Graphic/test.vert (rev 0)
+++ Mercury2/Themes/default/Graphic/test.vert 2009-07-01 17:27:00 UTC (rev 396)
@@ -0,0 +1,4 @@
+void main()
+{
+ gl_Position = ftransform();
+}
\ No newline at end of file
Added: Mercury2/Themes/default/Graphic/test2.bmp
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Graphic/test2.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Graphic/test2.png
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Graphic/test2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Graphic/testShader.frag
===================================================================
--- Mercury2/Themes/default/Graphic/testShader.frag (rev 0)
+++ Mercury2/Themes/default/Graphic/testShader.frag 2009-07-01 17:27:00 UTC (rev 396)
@@ -0,0 +1,9 @@
+uniform sampler2D HG_Texture0;
+varying vec3 normal;
+
+void main()
+{
+// gl_FragData[0] = texture2D(HG_Texture0, gl_TexCoord[0].st);
+ vec3 n = normalize(normal);
+ gl_FragData[0].rgb = 0.5 + 0.5 * n;
+}
Added: Mercury2/Themes/default/Graphic/testShader.vert
===================================================================
--- Mercury2/Themes/default/Graphic/testShader.vert (rev 0)
+++ Mercury2/Themes/default/Graphic/testShader.vert 2009-07-01 17:27:00 UTC (rev 396)
@@ -0,0 +1,13 @@
+varying vec3 normal;
+uniform mat4 HG_ModelMatrix;
+
+void main()
+{
+ gl_TexCoord[0] = gl_MultiTexCoord0;
+ gl_Position = ftransform();
+
+ vec4 n = vec4(gl_Normal, 0);
+
+ //normalize in fragment
+ normal = (HG_ModelMatrix * n).xyz;
+}
Added: Mercury2/Themes/default/Model/beerhall.hgmdl
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/beerhall.hgmdl
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Model/gunther.hgmdl
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/gunther.hgmdl
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Model/gunther.png
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/gunther.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Model/lamp.hgmdl
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/lamp.hgmdl
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Model/lamp.png
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/lamp.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Model/lampN.hgmdl
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/lampN.hgmdl
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Model/map.hgmdl
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/map.hgmdl
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: Mercury2/Themes/default/Model/map.png
===================================================================
(Binary files differ)
Property changes on: Mercury2/Themes/default/Model/map.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: Mercury2/beerhall.hgmdl
===================================================================
(Binary files differ)
Deleted: Mercury2/flame.png
===================================================================
(Binary files differ)
Deleted: Mercury2/lamp.hgmdl
===================================================================
(Binary files differ)
Deleted: Mercury2/lamp.png
===================================================================
(Binary files differ)
Deleted: Mercury2/lampN.hgmdl
===================================================================
(Binary files differ)
Deleted: Mercury2/map.hgmdl
===================================================================
(Binary files differ)
Deleted: Mercury2/map.png
===================================================================
(Binary files differ)
Deleted: Mercury2/scenegraph.xml
===================================================================
--- Mercury2/scenegraph.xml 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/scenegraph.xml 2009-07-01 17:27:00 UTC (rev 396)
@@ -1,50 +0,0 @@
-<SceneGraph name="root">
-<!-- <node type="cameranode" movx="6" movz="-5.5" movy="3" rotx="-45" roty="90">
- <node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100"/>
- </node>
--->
- <node type="cameranode" movx="0" movz="0" movy="0" rotx="0" roty="0" rotz="0" name="camera">
- <node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100" name="vp"/>
- </node>
-
- <node type="transformnode" movz="-5" >
- <node type="TextNode" text="test font 123 HELLO WORLD!!! WOOT!" font="testfont.hgfont" size=".01" width="300" alphaPath="true" alignment="FIT_FULL" />
- </node>
-<!-- <asset type="texture" file="screenFBO_0" dynamic="true"/>
- <asset type="fullscreenquad"/>
- <node type="mercuryfbo" width="640" height="480" depth="true" tnum="2" name="screenFBO" usescreensize="true">
- <asset type="shader" file="testShader"/>
---> <node type="transformnode" rotx="-90" movz="-10" movx="0" movy="-5">
- <asset type="texture" file="map.png"/>
- <asset type="hgmdlmodel" file="map.hgmdl" />
- </node>
- <node type="mercurynode" name="lampForest" >
- <node type="transformnode" movz="-5" movx="0" movy="0" name="lamprow" >
- <node type="mercurynode" name="lamp">
- <node type="transformnode" rotx="-90" >
- <asset type="texture" file="lamp.png"/>
- <asset type="hgmdlmodel" file="lampN.hgmdl" />
- </node>
- <node type="billboardnode" billboardaxis="0,1,0" spheremode="true" >
- <node type="transformnode" roty="180" scalex="0.1" scaley="0.1" alphaPath="true">
- <asset type="texture" file="flame.png"/>
- <asset type="quad"/>
- </node>
- </node>
- </node>
- <node type="transformnode" movx="1" fallback="lamprow.lamp" />
- <node type="transformnode" movx="2" fallback="lamprow.lamp" />
- <node type="transformnode" movx="3" fallback="lamprow.lamp" />
- <node type="transformnode" movx="-1" fallback="lamprow.lamp" />
- <node type="transformnode" movx="-2" fallback="lamprow.lamp" />
- <node type="transformnode" movx="-3" fallback="lamprow.lamp" />
- </node>
- <node type="transformnode" movz="-6" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-7" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-8" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-9" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-4" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-3" fallback="lampForest.lamprow"/>
- </node>
-<!-- </node> -->
-</SceneGraph>
Modified: Mercury2/src/Mercury2.cpp
===================================================================
--- Mercury2/src/Mercury2.cpp 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/src/Mercury2.cpp 2009-07-01 17:27:00 UTC (rev 396)
@@ -17,7 +17,7 @@
#include <Texture.h>
#include <GLHeaders.h>
#include <ModuleManager.h>
-
+#include <MercuryFile.h>
bool SHOWBOUNDINGVOLUME = false;
MSemaphore UpdateLoopGo;
@@ -57,7 +57,7 @@
MercuryNode* root = new MercuryNode();
- XMLDocument* doc = XMLDocument::Load("scenegraph.xml");
+ XMLDocument* doc = XMLDocument::Load("FILE:scenegraph.xml");
XMLNode r = doc->GetRootNode();
root->LoadFromXML( r );
Modified: Mercury2/src/MercuryFile.cpp
===================================================================
--- Mercury2/src/MercuryFile.cpp 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/src/MercuryFile.cpp 2009-07-01 17:27:00 UTC (rev 396)
@@ -1,10 +1,11 @@
#include "MercuryFile.h"
-#include <MercuryVector.h>
-#include <MercuryFileDriverDirect.h>
-#include <MercuryFileDriverNet.h>
-#include <MercuryFileDriverMem.h>
-#include <MercuryFileDriverZipped.h>
-#include <MercuryFileDriverPacked.h>
+#include "MercuryVector.h"
+#include "MercuryFileDriverDirect.h"
+#include "MercuryFileDriverNet.h"
+#include "MercuryFileDriverMem.h"
+#include "MercuryFileDriverZipped.h"
+#include "MercuryFileDriverPacked.h"
+#include "MercuryTheme.h"
/********************FILE MANAGER**************************/
@@ -50,19 +51,27 @@
if( sPath.empty() )
return NULL;
-//XXX !!! XXX NOTE TODO
-//This code below is very useful, but cannot be implemented until we get a theme system. Once then, we can give it a shot.
+ //Tricky: We can support all caps colon (GRAPHIC:, FILE:, etc.)
+ //So, instead of doing some checking in multiple passes, we are doing
+ //a generalized system to handle getting it.
+ {
+ const char * c;
+ for( c = sPath.c_str(); (*c <= 'Z' && *c >= 'A'); c++ );
+ if( *c == ':' )
+ {
+ c++;
+ MString ExtString = ToProper( MString( sPath.c_str(), c-sPath.c_str()-1 ) ) + "/" + c;
+ const MVector< MercuryThemeManager::Theme > & th = THEME.GetThemes();
+ for( int i = (int)th.size()-1; i >= 0; i-- )
+ {
+ MercuryFile * ret = FILEMAN.Open( ssprintf( "Themes/%s/%s", th[i].sTheme.c_str(),ExtString.c_str() ), p );
+ if( ret )
+ return ret;
+ }
+ return 0;
+ }
+ }
-//First check to see if we are using an associated FS
-//Currently these are only theme supported.
-// if ( sPath.find( "GRAPHIC:" ) == 0 )
-// return Open( THEME.GetPathToGraphic( sPath.substr( 8 ) ), p );
-// if ( sPath.find( "MODEL:" ) == 0 )
-// return Open( THEME.GetPathToModel( sPath.substr( 6 ) ), p );
-// if ( sPath.find( "FILE:" ) == 0 )
-// return Open( THEME.GetPathToFile( sPath.substr( 5 ) ), p );
-
-
MercuryFile * ret;
for ( unsigned int i = 0; i < m_Drivers->size(); i++ )
{
@@ -139,7 +148,7 @@
/*
- * Copyright (c) 2005-2006, Charles Lohr
+ * Copyright (c) 2005-2009, Charles Lohr
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
Modified: Mercury2/src/MercuryTheme.cpp
===================================================================
--- Mercury2/src/MercuryTheme.cpp 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/src/MercuryTheme.cpp 2009-07-01 17:27:00 UTC (rev 396)
@@ -41,9 +41,34 @@
bool MercuryThemeManager::GetValue( const MString & sDataPointer, MString & sReturn )
{
- //XXX: Incomplete
- //This code needs to be filled out.
- return true;
+ MString * cacheret;
+ if( (cacheret = m_hCache.get( sDataPointer ) ) != 0 )
+ {
+ sReturn = *cacheret;
+ return true;
+ }
+
+ MVector< MString > out;
+ SplitStrings( sDataPointer, out, ".", " ", 1, 1 );
+
+ for( unsigned i = out.size() - 1; i > 0; i-- )
+ {
+ MString sOut;
+ for( int j = 0; j < (int)i; j++ )
+ sOut += out[j] + '.';
+ sOut += out[out.size()-1];
+
+ for( int j = (int)m_vThemes.size() - 1; j >= 0; j-- )
+ {
+ if( m_vThemes[j].m_xNode->GetValue( sOut, sReturn ) )
+ {
+ m_hCache[sDataPointer] = sReturn;
+ return true;
+ }
+ }
+ }
+
+ return false;
}
MercuryThemeManager::Theme::Theme()
Modified: Mercury2/src/MercuryTheme.h
===================================================================
--- Mercury2/src/MercuryTheme.h 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/src/MercuryTheme.h 2009-07-01 17:27:00 UTC (rev 396)
@@ -3,6 +3,7 @@
#include <MercuryNamedResource.h>
#include <MercuryUtil.h> //huh?
+#include <MercuryHash.h>
#include <MercuryVector.h>
class XMLNode;
@@ -13,11 +14,7 @@
public:
MercuryThemeManager();
~MercuryThemeManager();
-
- static MercuryThemeManager& GetInstance();
- virtual bool GetValue( const MString & sDataPointer, MString & sReturn );
-private:
class Theme
{
public:
@@ -28,12 +25,19 @@
XMLNode * m_xNode;
XMLDocument * m_xDoc;
};
+
+ static MercuryThemeManager& GetInstance();
+
+ virtual bool GetValue( const MString & sDataPointer, MString & sReturn );
+ const MVector< Theme > & GetThemes() { return m_vThemes; }
+private:
MVector< Theme > m_vThemes;
+ MHash< MString > m_hCache;
};
-static InstanceCounter<MercuryThemeManager> MFMcounter("MercuryThemeManager");
+static InstanceCounter<MercuryThemeManager> MTMcounter("MercuryThemeManager");
-#define THEME MercuryFileManager::GetInstance()
+#define THEME MercuryThemeManager::GetInstance()
#endif
Modified: Mercury2/src/MercuryUtil.cpp
===================================================================
--- Mercury2/src/MercuryUtil.cpp 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/src/MercuryUtil.cpp 2009-07-01 17:27:00 UTC (rev 396)
@@ -15,6 +15,40 @@
return t;
}
+MString ToLower(const MString & s)
+{
+ MString t = s;
+ char * ti = (char*)t.c_str();
+ for (unsigned long i = 0; i < s.length(); ++i)
+ {
+ if( ti[i] >= 'A' && ti[i] <= 'Z' )
+ ti[i] += ( 'a' - 'A' );
+ }
+ return t;
+}
+
+MString ToProper(const MString & s)
+{
+ if( s.length() == 0 )
+ return "";
+
+ MString t = s;
+ char * ti = (char*)t.c_str();
+
+ if( ti[0] >= 'a' && ti[0] <= 'z' )
+ ti[0] -= ( 'a' - 'A' );
+
+ for (unsigned long i = 1; i < s.length(); ++i)
+ {
+ if( ti[i] >= 'A' && ti[i] <= 'Z' )
+ ti[i] += ( 'a' - 'A' );
+ }
+ return t;
+
+}
+
+
+
float StrToFloat(const MString & s, float d)
{
float x = d;
Modified: Mercury2/src/MercuryUtil.h
===================================================================
--- Mercury2/src/MercuryUtil.h 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/src/MercuryUtil.h 2009-07-01 17:27:00 UTC (rev 396)
@@ -25,8 +25,15 @@
#define M_ALIGN(n)
#endif
+///Make a string all upper case
MString ToUpper(const MString & s);
+///Make a string all lower case
+MString ToLower(const MString & s);
+
+///Make a string proper case (HELLO -> Hello, hello -> Hello)
+MString ToProper(const MString & s);
+
float StrToFloat(const MString & s, float d = 0);
int32_t StrToInt(const MString & s, int32_t d = 0);
Deleted: Mercury2/test.bmp
===================================================================
(Binary files differ)
Deleted: Mercury2/test2.bmp
===================================================================
(Binary files differ)
Deleted: Mercury2/test2.png
===================================================================
(Binary files differ)
Deleted: Mercury2/testShader.frag
===================================================================
--- Mercury2/testShader.frag 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/testShader.frag 2009-07-01 17:27:00 UTC (rev 396)
@@ -1,9 +0,0 @@
-uniform sampler2D HG_Texture0;
-varying vec3 normal;
-
-void main()
-{
-// gl_FragData[0] = texture2D(HG_Texture0, gl_TexCoord[0].st);
- vec3 n = normalize(normal);
- gl_FragData[0].rgb = 0.5 + 0.5 * n;
-}
Deleted: Mercury2/testShader.vert
===================================================================
--- Mercury2/testShader.vert 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/testShader.vert 2009-07-01 17:27:00 UTC (rev 396)
@@ -1,13 +0,0 @@
-varying vec3 normal;
-uniform mat4 HG_ModelMatrix;
-
-void main()
-{
- gl_TexCoord[0] = gl_MultiTexCoord0;
- gl_Position = ftransform();
-
- vec4 n = vec4(gl_Normal, 0);
-
- //normalize in fragment
- normal = (HG_ModelMatrix * n).xyz;
-}
Deleted: Mercury2/testfont.hgfont
===================================================================
--- Mercury2/testfont.hgfont 2009-06-30 03:01:02 UTC (rev 395)
+++ Mercury2/testfont.hgfont 2009-07-01 17:27:00 UTC (rev 396)
@@ -1,258 +0,0 @@
-testfont.png
-64 4.000000 15.000000 80.000000
-0 0.000000 0.000000 0.031250 0.040039 32 41 8 41
-1 0.062500 0.000000 0.093750 0.040039 32 41 8 41
-2 0.125000 0.000000 0.156250 0.040039 32 41 8 41
-3 0.187500 0.000000 0.218750 0.040039 32 41 8 41
-4 0.250000 0.000000 0.281250 0.040039 32 41 8 41
-5 0.312500 0.000000 0.343750 0.040039 32 41 8 41
-6 0.375000 0.000000 0.406250 0.040039 32 41 8 41
-7 0.437500 0.000000 0.468750 0.040039 32 41 8 41
-8 0.500000 0.000000 0.531250 0.040039 32 41 8 41
-9 0.562500 0.000000 0.593750 0.040039 32 41 8 41
-10 0.625000 0.000000 0.656250 0.040039 32 41 8 41
-11 0.687500 0.000000 0.718750 0.040039 32 41 8 41
-12 0.750000 0.000000 0.781250 0.040039 32 41 8 41
-13 0.812500 0.000000 0.843750 0.040039 32 41 8 41
-14 0.875000 0.000000 0.906250 0.040039 32 41 8 41
-15 0.937500 0.000000 0.968750 0.040039 32 41 8 41
-16 0.000000 0.062500 0.031250 0.102539 32 41 8 41
-17 0.062500 0.062500 0.093750 0.102539 32 41 8 41
-18 0.125000 0.062500 0.156250 0.102539 32 41 8 41
-19 0.187500 0.062500 0.218750 0.102539 32 41 8 41
-20 0.250000 0.062500 0.281250 0.102539 32 41 8 41
-21 0.312500 0.062500 0.343750 0.102539 32 41 8 41
-22 0.375000 0.062500 0.406250 0.102539 32 41 8 41
-23 0.437500 0.062500 0.468750 0.102539 32 41 8 41
-24 0.500000 0.062500 0.531250 0.102539 32 41 8 41
-25 0.562500 0.062500 0.593750 0.102539 32 41 8 41
-26 0.625000 0.062500 0.656250 0.102539 32 41 8 41
-27 0.687500 0.062500 0.718750 0.102539 32 41 8 41
-28 0.750000 0.062500 0.781250 0.102539 32 41 8 41
-29 0.812500 0.062500 0.843750 0.102539 32 41 8 41
-30 0.875000 0.062500 0.906250 0.102539 32 41 8 41
-31 0.937500 0.062500 0.968750 0.102539 32 41 8 41
-32 0.000000 0.125000 0.000000 0.125000 0 0 0 0
-33 0.062500 0.125000 0.068359 0.169922 6 46 7 46
-34 0.125000 0.125000 0.141602 0.140625 17 16 3 46
-35 0.187500 0.125000 0.221680 0.169922 35 46 0 46
-36 0.250000 0.125000 0.279297 0.178711 30 55 3 48
-37 0.312500 0.125000 0.360352 0.171875 49 48 4 47
-38 0.375000 0.125000 0.413086 0.171875 39 48 3 47
-39 0.437500 0.125000 0.443359 0.140625 6 16 3 46
-40 0.500000 0.125000 0.515625 0.182617 16 59 4 46
-41 0.562500 0.125000 0.578125 0.182617 16 59 1 46
-42 0.625000 0.125000 0.645508 0.143555 21 19 2 46
-43 0.687500 0.125000 0.717773 0.155273 31 31 3 38
-44 0.750000 0.125000 0.755859 0.139648 6 15 6 6
-45 0.812500 0.125000 0.829102 0.129883 17 5 2 19
-46 0.875000 0.125000 0.880859 0.130859 6 6 6 6
-47 0.937500 0.125000 0.956055 0.169922 19 46 0 46
-48 0.000000 0.187500 0.029297 0.233398 30 47 3 46
-49 0.062500 0.187500 0.079102 0.232422 17 46 7 46
-50 0.125000 0.187500 0.155273 0.232422 31 46 1 46
-51 0.187500 0.187500 0.216797 0.233398 30 47 3 46
-52 0.250000 0.187500 0.281250 0.231445 32 45 1 45
-53 0.312500 0.187500 0.341797 0.232422 30 46 3 45
-54 0.375000 0.187500 0.405273 0.233398 31 47 2 46
-55 0.437500 0.187500 0.466797 0.231445 30 45 3 45
-56 0.500000 0.187500 0.529297 0.233398 30 47 3 46
-57 0.562500 0.187500 0.591797 0.233398 30 47 3 46
-58 0.625000 0.187500 0.630859 0.220703 6 34 6 34
-59 0.687500 0.187500 0.693359 0.229492 6 43 6 34
-60 0.750000 0.187500 0.778320 0.217773 29 31 4 38
-61 0.812500 0.187500 0.841797 0.206055 30 19 3 32
-62 0.875000 0.187500 0.903320 0.217773 29 31 4 38
-63 0.937500 0.187500 0.966797 0.233398 30 47 3 47
-64 0.000000 0.250000 0.057617 0.308594 59 60 3 47
-65 0.062500 0.250000 0.106445 0.294922 45 46 -1 46
-66 0.125000 0.250000 0.159180 0.294922 35 46 5 46
-67 0.187500 0.250000 0.226562 0.296875 40 48 3 47
-68 0.250000 0.250000 0.287109 0.294922 38 46 5 46
-69 0.312500 0.250000 0.346680 0.294922 35 46 5 46
-70 0.375000 0.250000 0.405273 0.294922 31 46 5 46
-71 0.437500 0.250000 0.479492 0.296875 43 48 3 47
-72 0.500000 0.250000 0.535156 0.294922 36 46 5 46
-73 0.562500 0.250000 0.568359 0.294922 6 46 6 46
-74 0.625000 0.250000 0.650391 0.295898 26 47 1 46
-75 0.687500 0.250000 0.724609 0.294922 38 46 5 46
-76 0.750000 0.250000 0.778320 0.294922 29 46 5 46
-77 0.812500 0.250000 0.854492 0.294922 43 46 5 46
-78 0.875000 0.250000 0.910156 0.294922 36 46 5 46
-79 0.937500 0.250000 0.980469 0.296875 44 48 3 47
-80 0.000000 0.312500 0.034180 0.357422 35 46 5 46
-81 0.062500 0.312500 0.105469 0.362305 44 51 3 47
-82 0.125000 0.312500 0.164062 0.357422 40 46 5 46
-83 0.187500 0.312500 0.223633 0.359375 37 48 3 47
-84 0.250000 0.312500 0.285156 0.357422 36 46 2 46
-85 0.312500 0.312500 0.347656 0.358398 36 47 5 46
-86 0.375000 0.312500 0.418945 0.357422 45 46 -1 46
-87 0.437500 0.312500 0.499023 0.357422 63 46 0 46
-88 0.500000 0.312500 0.540039 0.357422 41 46 -1 46
-89 0.562500 0.312500 0.603516 0.357422 42 46 0 46
-90 0.625000 0.312500 0.660156 0.357422 36 46 1 46
-91 0.687500 0.312500 0.699219 0.370117 12 59 4 46
-92 0.750000 0.312500 0.768555 0.357422 19 46 -1 46
-93 0.812500 0.312500 0.824219 0.370117 12 59 2 46
-94 0.875000 0.312500 0.899414 0.336914 25 25 1 47
-95 0.937500 0.312500 0.973633 0.317383 37 5 -1 -8
-96 0.000000 0.375000 0.010742 0.383789 11 9 3 46
-97 0.062500 0.375000 0.091797 0.410156 30 36 3 35
-98 0.125000 0.375000 0.153320 0.420898 29 47 4 46
-99 0.187500 0.375000 0.215820 0.410156 29 36 3 35
-100 0.250000 0.375000 0.278320 0.420898 29 47 2 46
-101 0.312500 0.375000 0.342773 0.410156 31 36 2 35
-102 0.375000 0.375000 0.394531 0.420898 20 47 1 47
-103 0.437500 0.375000 0.465820 0.422852 29 49 2 35
-104 0.500000 0.375000 0.527344 0.419922 28 46 4 46
-105 0.562500 0.375000 0.568359 0.419922 6 46 4 46
-106 0.625000 0.375000 0.637695 0.433594 13 60 -3 46
-107 0.687500 0.375000 0.714844 0.419922 28 46 4 46
-108 0.750000 0.375000 0.755859 0.419922 6 46 4 46
-109 0.812500 0.375000 0.857422 0.409180 46 35 4 35
-110 0.875000 0.375000 0.902344 0.409180 28 35 4 35
-111 0.937500 0.375000 0.966797 0.410156 30 36 3 35
-112 0.000000 0.437500 0.028320 0.484375 29 48 4 35
-113 0.062500 0.437500 0.090820 0.484375 29 48 2 35
-114 0.125000 0.437500 0.142578 0.471680 18 35 4 35
-115 0.187500 0.437500 0.213867 0.472656 27 36 2 35
-116 0.250000 0.437500 0.265625 0.483398 16 47 1 46
-117 0.312500 0.437500 0.339844 0.471680 28 35 4 34
-118 0.375000 0.437500 0.405273 0.470703 31 34 1 34
-119 0.437500 0.437500 0.485352 0.470703 49 34 -1 34
-120 0.500000 0.437500 0.531250 0.470703 32 34 0 34
-121 0.562500 0.437500 0.593750 0.484375 32 48 0 34
-122 0.625000 0.437500 0.653320 0.470703 29 34 1 34
-123 0.687500 0.437500 0.705078 0.497070 18 61 1 47
-124 0.750000 0.437500 0.754883 0.496094 5 60 6 46
-125 0.812500 0.437500 0.830078 0.497070 18 61 2 47
-126 0.875000 0.437500 0.906250 0.448242 32 11 2 28
-127 0.937500 0.437500 0.968750 0.477539 32 41 8 41
-128 0.000000 0.500000 0.031250 0.540039 32 41 8 41
-129 0.062500 0.500000 0.093750 0.540039 32 41 8 41
-130 0.125000 0.500000 0.156250 0.540039 32 41 8 41
-131 0.187500 0.500000 0.218750 0.540039 32 41 8 41
-132 0.250000 0.500000 0.281250 0.540039 32 41 8 41
-133 0.312500 0.500000 0.343750 0.540039 32 41 8 41
-134 0.375000 0.500000 0.406250 0.540039 32 41 8 41
-135 0.437500 0.500000 0.468750 0.540039 32 41 8 41
-136 0.500000 0.500000 0.531250 0.540039 32 41 8 41
-137 0.562500 0.500000 0.593750 0.540039 32 41 8 41
-138 0.625000 0.500000 0.656250 0.540039 32 41 8 41
-139 0.687500 0.500000 0.718750 0.540039 32 41 8 41
-140 0.750000 0.500000 0.781250 0.540039 32 41 8 41
-141 0.812500 0.500000 0.843750 0.540039 32 41 8 41
-142 0.875000 0.500000 0.906250 0.540039 32 41 8 41
-143 0.937500 0.500000 0.968750 0.540039 32 41 8 41
-144 0.000000 0.562500 0.031250 0.602539 32 41 8 41
-145 0.062500 0.562500 0.093750 0.602539 32 41 8 41
-146 0.125000 0.562500 0.156250 0.602539 32 41 8 41
-147 0.187500 0.562500 0.218750 0.602539 32 41 8 41
-148 0.250000 0.562500 0.281250 0.602539 32 41 8 41
-149 0.312500 0.562500 0.343750 0.602539 32 41 8 41
-150 0.375000 0.562500 0.406250 0.602539 32 41 8 41
-151 0.437500 0.562500 0.468750 0.602539 32 41 8 41
-152 0.500000 0.562500 0.531250 0.602539 32 41 8 41
-153 0.562500 0.562500 0.593750 0.602539 32 41 8 41
-154 0.625000 0.562500 0.656250 0.602539 32 41 8 41
-155 0.687500 0.562500 0.718750 0.602539 32 41 8 41
-156 0.750000 0.562500 0.781250 0.602539 32 41 8 41
-157 0.812500 0.562500 0.843750 0.602539 32 41 8 41
-158 0.875000 0.562500 0.906250 0.602539 32 41 8 41
-159 0.937500 0.562500 0.968750 0.602539 32 41 8 41
-160 0.000000 0.625000 0.000000 0.625000 0 0 0 0
-161 0.062500 0.625000 0.068359 0.670898 6 47 7 34
-162 0.125000 0.625000 0.153320 0.682617 29 59 3 46
-163 0.187500 0.625000 0.219727 0.671875 33 48 1 47
-164 0.250000 0.625000 0.281250 0.652344 32 28 1 36
-165 0.312500 0.625000 0.346680 0.669922 35 46 -1 46
-166 0.375000 0.625000 0.379883 0.683594 5 60 6 46
-167 0.437500 0.625000 0.466797 0.683594 30 60 3 47
-168 0.500000 0.625000 0.517578 0.630859 18 6 2 46
-169 0.562500 0.625000 0.608398 0.671875 47 48 0 47
-170 0.625000 0.625000 0.646484 0.647461 22 23 1 47
-171 0.687500 0.625000 0.713867 0.653320 27 29 4 31
-172 0.750000 0.625000 0.779297 0.643555 30 19 3 32
-173 0.812500 0.625000 0.829102 0.629883 17 5 2 19
-174 0.875000 0.625000 0.920898 0.671875 47 48 0 47
-175 0.937500 0.625000 0.973633 0.629883 37 5 -1 54
-176 0.000000 0.687500 0.016602 0.704102 17 17 4 47
-177 0.062500 0.687500 0.092773 0.724609 31 38 2 38
-178 0.125000 0.687500 0.143555 0.709961 19 23 1 47
-179 0.187500 0.687500 0.206055 0.709961 19 23 1 47
-180 0.250000 0.687500 0.260742 0.696289 11 9 7 45
-181 0.312500 0.687500 0.338867 0.733398 27 47 5 34
-182 0.375000 0.687500 0.408203 0.745117 34 59 0 46
-183 0.437500 0.687500 0.443359 0.693359 6 6 6 25
-184 0.500000 0.687500 0.512695 0.701172 13 14 3 0
-185 0.562500 0.687500 0.574219 0.709961 12 23 4 47
-186 0.625000 0.687500 0.645508 0.709961 21 23 1 47
-187 0.687500 0.687500 0.713867 0.715820 27 29 5 31
-188 0.750000 0.687500 0.796875 0.735352 48 49 4 47
-189 0.812500 0.687500 0.859375 0.734375 48 48 4 47
-190 0.875000 0.687500 0.924805 0.735352 51 49 1 47
-191 0.937500 0.687500 0.965820 0.734375 29 48 5 34
-192 0.000000 0.750000 0.043945 0.806641 45 58 -1 58
-193 0.062500 0.750000 0.106445 0.806641 45 58 -1 58
-194 0.125000 0.750000 0.168945 0.806641 45 58 -1 58
-195 0.187500 0.750000 0.231445 0.805664 45 57 -1 57
-196 0.250000 0.750000 0.293945 0.803711 45 55 -1 55
-197 0.312500 0.750000 0.356445 0.803711 45 55 -1 55
-198 0.375000 0.750000 0.435547 0.794922 62 46 -1 46
-199 0.437500 0.750000 0.476562 0.809570 40 61 3 47
-200 0.500000 0.750000 0.534180 0.806641 35 58 5 58
-201 0.562500 0.750000 0.596680 0.806641 35 58 5 58
-202 0.625000 0.750000 0.659180 0.806641 35 58 5 58
-203 0.687500 0.750000 0.721680 0.803711 35 55 5 55
-204 0.750000 0.750000 0.760742 0.806641 11 58 2 58
-205 0.812500 0.750000 0.823242 0.806641 11 58 5 58
-206 0.875000 0.750000 0.894531 0.806641 20 58 -1 58
-207 0.937500 0.750000 0.955078 0.803711 18 55 0 55
-208 0.000000 0.812500 0.041992 0.857422 43 46 0 46
-209 0.062500 0.812500 0.097656 0.868164 36 57 5 57
-210 0.125000 0.812500 0.167969 0.870117 44 59 3 58
-211 0.187500 0.812500 0.230469 0.870117 44 59 3 58
-212 0.250000 0.812500 0.292969 0.870117 44 59 3 58
-213 0.312500 0.812500 0.355469 0.869141 44 58 3 57
-214 0.375000 0.812500 0.417969 0.867188 44 56 3 55
-215 0.437500 0.812500 0.463867 0.838867 27 27 5 36
-216 0.500000 0.812500 0.543945 0.861328 45 50 3 47
-217 0.562500 0.812500 0.597656 0.870117 36 59 5 58
-218 0.625000 0.812500 0.660156 0.870117 36 59 5 58
-219 0.687500 0.812500 0.722656 0.870117 36 59 5 58
-220 0.750000 0.812500 0.785156 0.867188 36 56 5 55
-221 0.812500 0.812500 0.853516 0.869141 42 58 0 58
-222 0.875000 0.812500 0.909180 0.857422 35 46 5 46
-223 0.937500 0.812500 0.968750 0.859375 32 48 5 47
-224 0.000000 0.875000 0.029297 0.920898 30 47 3 46
-225 0.062500 0.875000 0.091797 0.920898 30 47 3 46
-226 0.125000 0.875000 0.154297 0.920898 30 47 3 46
-227 0.187500 0.875000 0.216797 0.919922 30 46 3 45
-228 0.250000 0.875000 0.279297 0.917969 30 44 3 43
-229 0.312500 0.875000 0.341797 0.922852 30 49 3 48
-230 0.375000 0.875000 0.425781 0.910156 52 36 2 35
-231 0.437500 0.875000 0.465820 0.922852 29 49 3 35
-232 0.500000 0.875000 0.530273 0.920898 31 47 2 46
-233 0.562500 0.875000 0.592773 0.920898 31 47 2 46
-234 0.625000 0.875000 0.655273 0.920898 31 47 2 46
-235 0.687500 0.875000 0.717773 0.917969 31 44 2 43
-236 0.750000 0.875000 0.760742 0.919922 11 46 2 46
-237 0.812500 0.875000 0.823242 0.919922 11 46 5 46
-238 0.875000 0.875000 0.894531 0.919922 20 46 -1 46
-239 0.937500 0.875000 0.955078 0.916992 18 43 0 43
-240 0.000000 0.937500 0.030273 0.983398 31 47 2 46
-241 0.062500 0.937500 0.089844 0.981445 28 45 4 45
-242 0.125000 0.937500 0.154297 0.983398 30 47 3 46
-243 0.187500 0.937500 0.216797 0.983398 30 47 3 46
-244 0.250000 0.937500 0.279297 0.983398 30 47 3 46
-245 0.312500 0.937500 0.341797 0.982422 30 46 3 45
-246 0.375000 0.937500 0.404297 0.980469 30 44 3 43
-247 0.437500 0.937500 0.468750 0.961914 32 25 3 35
-248 0.500000 0.937500 0.531250 0.977539 32 41 3 38
-249 0.562500 0.937500 0.589844 0.983398 28 47 4 46
-250 0.625000 0.937500 0.652344 0.983398 28 47 4 46
-251 0.687500 0.937500 0.714844 0.983398 28 47 4 46
-252 0.750000 0.937500 0.777344 0.980469 28 44 4 43
-253 0.812500 0.937500 0.843750 0.996094 32 60 0 46
-254 0.875000 0.937500 0.903320 0.995117 29 59 4 46
-255 0.937500 0.937500 0.968750 0.993164 32 57 0 43
Deleted: Mercury2/testfont.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
