Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-01-01 05:27:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #309 from mikeprimm/master

Browse Source 
Put model and texture data into own subdirectory (renderdata)
This commit is contained in:
mikeprimm 2011-07-23 07:34:26 -07:00
commit e601a2c661
5 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
models.txt → renderdata/models.txt
View File

0
texture.txt → renderdata/texture.txt
View File

5
src/main/assembly/package.xml
View File

@ -31,8 +31,6 @@
<include>shaders.txt</include> <include>shaders.txt</include>
<include>perspectives.txt</include> <include>perspectives.txt</include>
<include>lightings.txt</include> <include>lightings.txt</include>
<include>models.txt</include>
<include>texture.txt</include>
<include>worlds.txt.sample</include></includes></fileSet> <include>worlds.txt.sample</include></includes></fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/texturepacks</directory> <directory>${project.basedir}/texturepacks</directory>
@ -40,6 +38,9 @@
<fileSet> <fileSet>
<directory>${project.basedir}/templates</directory> <directory>${project.basedir}/templates</directory>
<outputDirectory>/dynmap/templates</outputDirectory></fileSet> <outputDirectory>/dynmap/templates</outputDirectory></fileSet>
<fileSet>
<directory>${project.basedir}/renderdata</directory>
<outputDirectory>/dynmap/renderdata</outputDirectory></fileSet>
</fileSets> </fileSets>
<files> <files>
<file> <file>

16
src/main/java/org/dynmap/hdmap/HDBlockModels.java
View File

@ -250,18 +250,6 @@ public class HDBlockModels {
if((m.databits & (1 << i)) != 0) { if((m.databits & (1 << i)) != 0) {
if(smod == null) smod = m.getScaledMap(scale); if(smod == null) smod = m.getScaledMap(scale);
row[i] = smod; row[i] = smod;
/* if((m.blockid == 50) && (i == 5)) {
String v0 = "";
String v = "";
for(int x = 0; x < m.blockflags.length; x++)
v0 = v0 + " " + m.blockflags[x];
for(int x = 0; x < smod.length; x++) {
v = v + " " + smod[x];
if((x%scale) == (scale-1)) v += "|";
}
Log.info("src=" + v0);
Log.info("scaled=" + v);
} */
} }
} }
} }
@ -275,8 +263,8 @@ public class HDBlockModels {
*/ */
public static void loadModels(File datadir) { public static void loadModels(File datadir) {
/* Load block models */ /* Load block models */
loadModelFile(new File(datadir, "models.txt")); loadModelFile(new File(datadir, "renderdata/models.txt"));
File custom = new File(datadir, "custom-models.txt"); File custom = new File(datadir, "renderdata/custom-models.txt");
if(custom.canRead()) { if(custom.canRead()) {
loadModelFile(custom); loadModelFile(custom);
} }

4
src/main/java/org/dynmap/hdmap/TexturePack.java
View File

@ -557,8 +557,8 @@ public class TexturePack {
/* Initialize map with blank map for all entries */ /* Initialize map with blank map for all entries */
HDTextureMap.initializeTable(); HDTextureMap.initializeTable();
/* Load block models */ /* Load block models */
loadTextureFile(new File(datadir, "texture.txt")); loadTextureFile(new File(datadir, "renderdata/texture.txt"));
File custom = new File(datadir, "custom-texture.txt"); File custom = new File(datadir, "renderdata/custom-texture.txt");
if(custom.canRead()) { if(custom.canRead()) {
loadTextureFile(custom); loadTextureFile(custom);
} }