LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Fixed rendering regions. genPOI.py: add new line to baseMakers.js; views.js: add polygons, with all the features that Google provides, polylines work fine; regions.js: example of usage

Browse Source
This commit is contained in:
Koza
2014-12-13 17:17:11 +01:00
parent f3af9555f0
commit f1af25799e
3 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
overviewer_core/aux_files/genPOI.py
View File

@@ -452,6 +452,7 @@ def main():
with open(os.path.join(destdir, "baseMarkers.js"), "w") as output: with open(os.path.join(destdir, "baseMarkers.js"), "w") as output:
output.write("overviewer.util.injectMarkerScript('markersDB.js');\n") output.write("overviewer.util.injectMarkerScript('markersDB.js');\n")
output.write("overviewer.util.injectMarkerScript('markers.js');\n") output.write("overviewer.util.injectMarkerScript('markers.js');\n")
output.write("overviewer.util.injectMarkerScript('regions.js');\n")
output.write("overviewer.collections.haveSigns=true;\n") output.write("overviewer.collections.haveSigns=true;\n")
logging.info("Done") logging.info("Done")

20
overviewer_core/data/js_src/views.js
View File

@@ -496,6 +496,26 @@ overviewer.views.SignControlView = Backbone.View.extend({
'strokeColor': entity['strokeColor'] 'strokeColor': entity['strokeColor']
}); });
dataRoot[i].markerObjs.push(polyline); dataRoot[i].markerObjs.push(polyline);
}
// Polygons
if (typeof entity['polygon'] != 'undefined') {
var polypath = new Array();
for (point in entity.polygon) {
polypath.push(overviewer.util.fromWorldToLatLng(entity.polygon[point].x, entity.polygon[point].y, entity.polygon[point].z, overviewer.mapView.options.currentTileSet));
}
var polygon = new google.maps.Polygon({
'clickable': false,
'fillColor': entity['fillColor'],
'fillOpacity': entity['fillOpacity'],
'map': overviewer.map,
'path': polypath,
'strokeColor': entity['strokeColor'],
'strokeOpacity': entity['strokeOpacity'],
'visible': false
});
dataRoot[i].markerObjs.push(polygon);
} }
} }
dataRoot[i].created = true; dataRoot[i].created = true;

41
overviewer_core/data/web_assets/regions.js
View File

@@ -1,9 +1,34 @@
// This is just an example. You can run some scripts to generate regions that // This is just an example. You can run some scripts to generate regions that
// will be drawn here. /*
overviewer.collections.regionDatas.push([ var groupName = "Regions";
// {"color": "#FFAA00", "opacity": 0.5, "closed": true, "path": [ var displayName = "Areas";
// {"x": 0, "y": 0, "z": 0}, var world = "top";
// {"x": 0, "y": 10, "z": 0},
// {"x": 0, "y": 0, "z": 10} markersDB[groupName] = {
// ]}, "raw": [
]); {
"fillColor": "#00FF00",
"fillOpacity": 0.2,
"strokeColor": "#FF0000",
"strokeOpacity": 1,
"polygon" : [
{"x": 347, "y": 67, "z": 95},
{"x": 347, "y": 77, "z": 95},
{"x": 347, "y": 77, "z": 105},
{"x": 347, "y": 67, "z": 105},
{"x": 347, "y": 67, "z": 105}
]}
],
"name": "Regions",
"created": false
}
markers[world].push(
{
"groupName": groupName,
"icon": "signpost_icon.png",
"createInfoWindow": false,
"displayName": displayName,
"checked": true
});
*/