forked from MagicBane/Server
Height from zone center.
This commit is contained in:
@@ -66,14 +66,6 @@ public class Terrain {
|
|||||||
this.blend_values.x = this.zone.template.max_blend;
|
this.blend_values.x = this.zone.template.max_blend;
|
||||||
this.blend_values.y = this.zone.template.min_blend;
|
this.blend_values.y = this.zone.template.min_blend;
|
||||||
|
|
||||||
// Zones with a zero blend inherit from their parent terrain
|
|
||||||
|
|
||||||
if (this.zone.template.max_blend == 0) {
|
|
||||||
Zone parentZone = getNextZoneWithTerrain(this.zone.parent);
|
|
||||||
this.blend_values.x = parentZone.template.max_blend;
|
|
||||||
this.blend_values.y = parentZone.template.min_blend;
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector2f major_blend = new Vector2f(this.blend_values.x / this.zone.major_radius,
|
Vector2f major_blend = new Vector2f(this.blend_values.x / this.zone.major_radius,
|
||||||
this.blend_values.y / this.zone.major_radius);
|
this.blend_values.y / this.zone.major_radius);
|
||||||
|
|
||||||
@@ -128,7 +120,7 @@ public class Terrain {
|
|||||||
// Transform world loc into zone space coordinate system
|
// Transform world loc into zone space coordinate system
|
||||||
|
|
||||||
Vector2f terrainLoc = ZoneManager.worldToTerrainSpace(world_loc, terrainZone);
|
Vector2f terrainLoc = ZoneManager.worldToTerrainSpace(world_loc, terrainZone);
|
||||||
Vector2f parentLoc = ZoneManager.worldToTerrainSpace(world_loc, parentZone);
|
Vector2f parentLoc = ZoneManager.worldToTerrainSpace(parentZone.getLoc(), parentZone);
|
||||||
|
|
||||||
// Offset from origin needed for blending function
|
// Offset from origin needed for blending function
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user