Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Merge pull request #146 from mikeprimm/master

Browse source 
Memory optimization for render
This commit is contained in:
mikeprimm 2011-05-15 22:46:22 -07:00
commit d8458ddcc0
7 changed files with 159 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/org/dynmap/Color.java Normal file
View file

@ -0,0 +1,46 @@
package org.dynmap;
/**
* Simple replacement for java.awt.Color for dynmap - it's not an invariant, so we don't make millions
* of them during rendering
*/
public class Color {
/* RGBA value */
private int val;
public static final int TRANSPARENT = 0;
public Color(int red, int green, int blue, int alpha) {
setRGBA(red, green, blue, alpha);
}
public Color(int red, int green, int blue) {
setRGBA(red, green, blue, 0xFF);
}
public Color() {
setTransparent();
}
public final int getRed() {
return (val >> 24) & 0xFF;
}
public final int getGreen() {
return (val >> 16) & 0xFF;
}
public final int getBlue() {
return (val >> 8) & 0xFF;
}
public final int getAlpha() {
return (val & 0xFF);
}
public final boolean isTransparent() {
return (val == TRANSPARENT);
}
public final void setTransparent() {
val = TRANSPARENT;
}
public final void setColor(Color c) {
val = c.val;
}
public final void setRGBA(int red, int green, int blue, int alpha) {
val = ((red & 0xFF) << 24) | ((green & 0xFF) << 16) | ((blue & 0xFF) << 8) | (alpha & 0xFF);
}
}

2
src/main/java/org/dynmap/ColorScheme.java
View file

@ -1,6 +1,6 @@
package org.dynmap; package org.dynmap;
import java.awt.Color; import org.dynmap.Color;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

2
src/main/java/org/dynmap/flat/FlatMap.java
View file

@ -1,6 +1,6 @@
package org.dynmap.flat; package org.dynmap.flat;
import java.awt.Color; import org.dynmap.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster; import java.awt.image.WritableRaster;
import java.io.File; import java.io.File;

11
src/main/java/org/dynmap/kzedmap/CaveTileRenderer.java
View file

@ -1,6 +1,6 @@
package org.dynmap.kzedmap; package org.dynmap.kzedmap;
import java.awt.Color; import org.dynmap.Color;
import java.util.Map; import java.util.Map;
import org.bukkit.World; import org.bukkit.World;
@ -12,12 +12,12 @@ public class CaveTileRenderer extends DefaultTileRenderer {
} }
@Override @Override
protected Color scan(World world, int x, int y, int z, int seq, boolean isnether) { protected void scan(World world, int x, int y, int z, int seq, boolean isnether, final Color result) {
boolean air = true; boolean air = true;
result.setTransparent();
for (;;) { for (;;) {
if (y < 0) if (y < 0)
return translucent; return;
int id = world.getBlockTypeIdAt(x, y, z); int id = world.getBlockTypeIdAt(x, y, z);
if(isnether) { /* Make ceiling into air in nether */ if(isnether) { /* Make ceiling into air in nether */
@ -93,7 +93,8 @@ public class CaveTileRenderer extends DefaultTileRenderer {
cg = cg * mult / 256; cg = cg * mult / 256;
cb = cb * mult / 256; cb = cb * mult / 256;
return new Color(cr, cg, cb); result.setRGBA(cr, cg, cb, 255);
return;
} }
} }
} }

74
src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
View file

@ -1,6 +1,6 @@
package org.dynmap.kzedmap; package org.dynmap.kzedmap;
import java.awt.Color; import org.dynmap.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -66,23 +66,27 @@ public class DefaultTileRenderer implements MapTileRenderer {
int x, y; int x, y;
Color c1 = new Color();
Color c2 = new Color();
int[] rgb = new int[3];
/* draw the map */ /* draw the map */
for (y = 0; y < KzedMap.tileHeight;) { for (y = 0; y < KzedMap.tileHeight;) {
jx = ix; jx = ix;
jz = iz; jz = iz;
for (x = KzedMap.tileWidth - 1; x >= 0; x -= 2) { for (x = KzedMap.tileWidth - 1; x >= 0; x -= 2) {
Color c1 = scan(world, jx, iy, jz, 0, isnether); scan(world, jx, iy, jz, 0, isnether, c1);
Color c2 = scan(world, jx, iy, jz, 2, isnether); scan(world, jx, iy, jz, 2, isnether, c2);
isempty = isempty && c1 == translucent && c2 == translucent; if(c1.isTransparent() == false) {
r.setPixel(x, y, new int[] { rgb[0] = c1.getRed(); rgb[1] = c1.getGreen(); rgb[2] = c1.getBlue();
c1.getRed(), r.setPixel(x, y, rgb);
c1.getGreen(), isempty = false;
c1.getBlue() }); }
r.setPixel(x - 1, y, new int[] { if(c2.isTransparent() == false) {
c2.getRed(), rgb[0] = c2.getRed(); rgb[1] = c2.getGreen(); rgb[2] = c2.getBlue();
c2.getGreen(), r.setPixel(x - 1, y, rgb);
c2.getBlue() }); isempty = false;
}
jx++; jx++;
jz++; jz++;
@ -95,19 +99,21 @@ public class DefaultTileRenderer implements MapTileRenderer {
jz = iz - 1; jz = iz - 1;
for (x = KzedMap.tileWidth - 1; x >= 0; x -= 2) { for (x = KzedMap.tileWidth - 1; x >= 0; x -= 2) {
Color c1 = scan(world, jx, iy, jz, 2, isnether); scan(world, jx, iy, jz, 2, isnether, c1);
jx++; jx++;
jz++; jz++;
Color c2 = scan(world, jx, iy, jz, 0, isnether); scan(world, jx, iy, jz, 0, isnether, c2);
isempty = isempty && c1 == translucent && c2 == translucent; if(c1.isTransparent() == false) {
r.setPixel(x, y, new int[] { rgb[0] = c1.getRed(); rgb[1] = c1.getGreen(); rgb[2] = c1.getBlue();
c1.getRed(), r.setPixel(x, y, rgb);
c1.getGreen(), isempty = false;
c1.getBlue() }); }
r.setPixel(x - 1, y, new int[] { if(c2.isTransparent() == false) {
c2.getRed(), rgb[0] = c2.getRed(); rgb[1] = c2.getGreen(); rgb[2] = c2.getBlue();
c2.getGreen(),
c2.getBlue() }); r.setPixel(x - 1, y, rgb);
isempty = false;
}
} }
y++; y++;
@ -205,20 +211,20 @@ public class DefaultTileRenderer implements MapTileRenderer {
} }
protected Color scan(World world, int x, int y, int z, int seq, boolean isnether) { protected void scan(World world, int x, int y, int z, int seq, boolean isnether, final Color result) {
Color result = translucent; result.setTransparent();
for (;;) { for (;;) {
if (y < 0) { if (y < 0) {
return result; return;
} }
int id = world.getBlockTypeIdAt(x, y, z); int id = world.getBlockTypeIdAt(x, y, z);
byte data = 0; byte data = 0;
if(isnether) { /* Make bedrock ceiling into air in nether */ if(isnether) { /* Make bedrock ceiling into air in nether */
if(id != 0) { if(id != 0) {
/* Remember first color we see, in case we wind up solid */ /* Remember first color we see, in case we wind up solid */
if(result == translucent) if(result.isTransparent())
if(colorScheme.colors[id] != null) if(colorScheme.colors[id] != null)
result = colorScheme.colors[id][seq]; result.setColor(colorScheme.colors[id][seq]);
id = 0; id = 0;
} }
else else
@ -246,7 +252,8 @@ public class DefaultTileRenderer implements MapTileRenderer {
if (id != 0) { if (id != 0) {
if (highlightBlocks.contains(id)) { if (highlightBlocks.contains(id)) {
return highlightColor; result.setColor(highlightColor);
return;
} }
Color[] colors; Color[] colors;
if(data != 0) if(data != 0)
@ -259,11 +266,12 @@ public class DefaultTileRenderer implements MapTileRenderer {
/* we found something that isn't transparent! */ /* we found something that isn't transparent! */
if (c.getAlpha() == 255) { if (c.getAlpha() == 255) {
/* it's opaque - the ray ends here */ /* it's opaque - the ray ends here */
return c; result.setColor(c);
return;
} }
/* this block is transparent, so recurse */ /* this block is transparent, so recurse */
Color bg = scan(world, x, y, z, seq, isnether); scan(world, x, y, z, seq, isnether, result);
int cr = c.getRed(); int cr = c.getRed();
int cg = c.getGreen(); int cg = c.getGreen();
@ -273,8 +281,8 @@ public class DefaultTileRenderer implements MapTileRenderer {
cg *= ca; cg *= ca;
cb *= ca; cb *= ca;
int na = 255 - ca; int na = 255 - ca;
result.setRGBA((result.getRed() * na + cr) >> 8, (result.getGreen() * na + cg) >> 8, (result.getBlue() * na + cb) >> 8, 255);
return new Color((bg.getRed() * na + cr) >> 8, (bg.getGreen() * na + cg) >> 8, (bg.getBlue() * na + cb) >> 8); return;
} }
} }
} }

30
src/main/java/org/dynmap/kzedmap/HighlightTileRenderer.java
View file

@ -1,6 +1,6 @@
package org.dynmap.kzedmap; package org.dynmap.kzedmap;
import java.awt.Color; import org.dynmap.Color;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -23,9 +23,8 @@ public class HighlightTileRenderer extends DefaultTileRenderer {
} }
@Override @Override
protected Color scan(World world, int x, int y, int z, int seq, boolean isnether) { protected void scan(World world, int x, int y, int z, int seq, boolean isnether, final Color result) {
Color result = translucent; result.setTransparent();
int top_nether_id = 0;
for (;;) { for (;;) {
if (y < 0) { if (y < 0) {
break; break;
@ -35,9 +34,9 @@ public class HighlightTileRenderer extends DefaultTileRenderer {
if(isnether) { /* Make bedrock ceiling into air in nether */ if(isnether) { /* Make bedrock ceiling into air in nether */
if(id != 0) { if(id != 0) {
/* Remember first color we see, in case we wind up solid */ /* Remember first color we see, in case we wind up solid */
if(result == translucent) if(result.isTransparent())
if(colorScheme.colors[id] != null) if(colorScheme.colors[id] != null)
result = colorScheme.colors[id][seq]; result.setColor(colorScheme.colors[id][seq]);
id = 0; id = 0;
} }
else else
@ -75,7 +74,8 @@ public class HighlightTileRenderer extends DefaultTileRenderer {
Color c = colors[seq]; Color c = colors[seq];
if (highlightBlocks.contains(id)) { if (highlightBlocks.contains(id)) {
return c; result.setColor(c);
return;
} }
if (c.getAlpha() > 0) { if (c.getAlpha() > 0) {
@ -88,26 +88,22 @@ public class HighlightTileRenderer extends DefaultTileRenderer {
// No need to blend if result is opaque. // No need to blend if result is opaque.
if (result.getAlpha() < 255) { if (result.getAlpha() < 255) {
Color bg = c; int cr = result.getRed();
c = result; int cg = result.getGreen();
int cb = result.getBlue();
int cr = c.getRed(); int ca = result.getAlpha();
int cg = c.getGreen();
int cb = c.getBlue();
int ca = c.getAlpha();
cr *= ca; cr *= ca;
cg *= ca; cg *= ca;
cb *= ca; cb *= ca;
int na = 255 - ca; int na = 255 - ca;
result = new Color((bg.getRed() * na + cr) >> 8, (bg.getGreen() * na + cg) >> 8, (bg.getBlue() * na + cb) >> 8, result.setRGBA((c.getRed() * na + cr) >> 8, (c.getGreen() * na + cg) >> 8, (c.getBlue() * na + cb) >> 8,
Math.min(255, bg.getAlpha()+c.getAlpha()) // Not really correct, but gets the job done without recursion while still looking ok. Math.min(255, c.getAlpha()+ca) // Not really correct, but gets the job done without recursion while still looking ok.
); );
} }
} }
} }
} }
} }
return result;
} }
} }

50
src/main/java/org/dynmap/kzedmap/KzedMap.java
View file

@ -138,6 +138,26 @@ public class KzedMap extends MapType {
onTileInvalidated.trigger(tile); onTileInvalidated.trigger(tile);
} }
/**
* Test if point x,z is inside rectangle with corner at r0x,r0z and with
* size vectors s1x,s1z and s2x,s2z
*
*/
private boolean testPointInRectangle(int x, int z, int r0x, int r0z, int s1x, int s1z,
int s2x, int s2z) {
int xr = x - r0x;
int zr = z - r0z; /* Get position relative to rectangle corner */
int dots1 = xr*s1x + zr*s1z;
int dots2 = xr*s2x + zr*s2z;
/* If dot product of relative point and each side is between zero and dot product
* of each side and itself, we're inside
*/
if((dots1 >= 0) && (dots1 <= (s1x*s1x+s1z*s1z)) &&
(dots2 >= 0) && (dots2 <= (s2x*s2x+s2z*s2z))) {
return true;
}
return false;
}
@Override @Override
public DynmapChunk[] getRequiredChunks(MapTile tile) { public DynmapChunk[] getRequiredChunks(MapTile tile) {
if (tile instanceof KzedMapTile) { if (tile instanceof KzedMapTile) {
@ -155,13 +175,43 @@ public class KzedMap extends MapType {
int x, z; int x, z;
/* Actual pattern of chunks needed is create by the slanted
* square prism corresponding to the render path of the tile.
* Top of prism (corresponding to y=127) is diamond shape from
* ix, iz to ix+64,iz+64 to ix+128,iz to ix+64,iz-64
* Bottom is same shape, offset by -64 on x, +64 on z (net
* render path to y=0), correspond to ix-64, iz+64 to
* ix,iz+128 to ix+64,iz+64 to ix,iz. Projection of
* the prism on to the x,z plane (which is all that matters for
* chunks) yields a diagonal rectangular area from ix-64(x1),iz+64
* to ix,iz+128(z2) to ix+128(x2),iz to ix+64,iz-64(z1).
* Chunks outside this are not needed - we scan a simple rectangle
* (chunk grid aligned) and skip adding the ones that are outside.
* This results in 42% less chunks being loaded.
*/
ArrayList<DynmapChunk> chunks = new ArrayList<DynmapChunk>(); ArrayList<DynmapChunk> chunks = new ArrayList<DynmapChunk>();
for (x = x1; x < x2; x += 16) { for (x = x1; x < x2; x += 16) {
for (z = z1; z < z2; z += 16) { for (z = z1; z < z2; z += 16) {
/* If any of the chunk corners are inside the rectangle, we need it */
if((!testPointInRectangle(x, z, x1, iz + KzedMap.tileWidth/2,
KzedMap.tileWidth/2, KzedMap.tileHeight/2,
KzedMap.tileWidth, -KzedMap.tileHeight)) &&
(!testPointInRectangle(x+15, z, x1, iz + KzedMap.tileWidth/2,
KzedMap.tileWidth/2, KzedMap.tileHeight/2,
KzedMap.tileWidth, -KzedMap.tileHeight)) &&
(!testPointInRectangle(x+15, z+15, x1, iz + KzedMap.tileWidth/2,
KzedMap.tileWidth/2, KzedMap.tileHeight/2,
KzedMap.tileWidth, -KzedMap.tileHeight)) &&
(!testPointInRectangle(x, z+15, x1, iz + KzedMap.tileWidth/2,
KzedMap.tileWidth/2, KzedMap.tileHeight/2,
KzedMap.tileWidth, -KzedMap.tileHeight)))
continue;
DynmapChunk chunk = new DynmapChunk(x / 16, z / 16); DynmapChunk chunk = new DynmapChunk(x / 16, z / 16);
chunks.add(chunk); chunks.add(chunk);
} }
} }
DynmapChunk[] result = new DynmapChunk[chunks.size()]; DynmapChunk[] result = new DynmapChunk[chunks.size()];
chunks.toArray(result); chunks.toArray(result);
return result; return result;