gered/gdx-tilemap3d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update to libgdx 0.9.9 stable

Browse source
This commit is contained in:
Gered 2013-11-10 17:06:29 -05:00
parent 22a8e6575e
commit 2225a67d77
5 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/com/blarg/gdx/tilemap3d/TileChunk.java
View file

@ -4,10 +4,10 @@ import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Mesh;
import com.badlogic.gdx.graphics.g3d.Renderable;
import com.badlogic.gdx.graphics.g3d.RenderableProvider;
import com.badlogic.gdx.graphics.g3d.materials.BlendingAttribute;
import com.badlogic.gdx.graphics.g3d.materials.FloatAttribute;
import com.badlogic.gdx.graphics.g3d.materials.Material;
import com.badlogic.gdx.graphics.g3d.materials.TextureAttribute;
import com.badlogic.gdx.graphics.g3d.attributes.BlendingAttribute;
import com.badlogic.gdx.graphics.g3d.attributes.FloatAttribute;
import com.badlogic.gdx.graphics.g3d.Material;
import com.badlogic.gdx.graphics.g3d.attributes.TextureAttribute;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.utils.Array;
@ -210,7 +210,7 @@ public class TileChunk extends TileContainer implements TileRawDataContainer, Re
renderable.meshPartSize = mesh.getNumVertices();
renderable.primitiveType = GL20.GL_TRIANGLES;
renderable.bones = null;
renderable.lights = null;
renderable.environment = null;
renderable.shader = null;
renderable.userData = userData;
renderable.material = material;

18
src/com/blarg/gdx/tilemap3d/TileMapRenderer.java
View file

@ -1,9 +1,9 @@
package com.blarg.gdx.tilemap3d;
import com.badlogic.gdx.graphics.Camera;
import com.badlogic.gdx.graphics.g3d.Environment;
import com.badlogic.gdx.graphics.g3d.ModelBatch;
import com.badlogic.gdx.graphics.g3d.Shader;
import com.badlogic.gdx.graphics.g3d.lights.Lights;
public class TileMapRenderer {
public void render(ModelBatch modelBatch, TileMap tileMap, Camera camera) {
@ -14,14 +14,14 @@ public class TileMapRenderer {
render(modelBatch, tileMap, camera, shader, null);
}
public void render(ModelBatch modelBatch, TileMap tileMap, Camera camera, Lights lights) {
render(modelBatch, tileMap, camera, null, lights);
public void render(ModelBatch modelBatch, TileMap tileMap, Camera camera, Environment environment) {
render(modelBatch, tileMap, camera, null, environment);
}
public void render(ModelBatch modelBatch, TileMap tileMap, Camera camera, Shader shader, Lights lights) {
public void render(ModelBatch modelBatch, TileMap tileMap, Camera camera, Shader shader, Environment environment) {
TileChunk[] chunks = tileMap.chunks;
for (int i = 0; i < chunks.length; ++i)
render(modelBatch, chunks[i], camera, shader, lights);
render(modelBatch, chunks[i], camera, shader, environment);
}
public void render(ModelBatch modelBatch, TileChunk chunk, Camera camera) {
@ -32,12 +32,12 @@ public class TileMapRenderer {
render(modelBatch, chunk, camera, shader, null);
}
public void render(ModelBatch modelBatch, TileChunk chunk, Camera camera, Lights lights) {
render(modelBatch, chunk, camera, null, lights);
public void render(ModelBatch modelBatch, TileChunk chunk, Camera camera, Environment environment) {
render(modelBatch, chunk, camera, null, environment);
}
public void render(ModelBatch modelBatch, TileChunk chunk, Camera camera, Shader shader, Lights lights) {
public void render(ModelBatch modelBatch, TileChunk chunk, Camera camera, Shader shader, Environment environment) {
if (camera.frustum.boundsInFrustum(chunk.getMeshBounds()))
modelBatch.render(chunk, lights, shader);
modelBatch.render(chunk, environment, shader);
}
}

2
src/com/blarg/gdx/tilemap3d/tilemesh/BaseModelTileMesh.java
View file

@ -114,7 +114,7 @@ public abstract class BaseModelTileMesh extends TileMesh {
}
protected void getScaleFactorForModel(Model model, Vector3 scaleToSize, Vector3 out) {
model.getBoundingBox(tmpBounds);
model.calculateBoundingBox(tmpBounds);
MathHelpers.getScaleFactor(tmpBounds.getDimensions(), scaleToSize, out);
}

14
src/com/blarg/gdx/tilemap3d/tilemesh/ModelTileMesh.java
View file

@ -2,23 +2,13 @@ package com.blarg.gdx.tilemap3d.tilemesh;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.VertexAttribute;
import com.badlogic.gdx.graphics.VertexAttributes;
import com.badlogic.gdx.graphics.g3d.Model;
import com.badlogic.gdx.graphics.g3d.model.MeshPart;
import com.badlogic.gdx.graphics.g3d.model.Node;
import com.badlogic.gdx.graphics.g3d.model.NodePart;
import com.badlogic.gdx.math.Matrix4;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.utils.Array;
import com.blarg.gdx.graphics.atlas.TextureAtlas;
import com.blarg.gdx.graphics.Vertices;
import com.blarg.gdx.math.MathHelpers;
import java.nio.FloatBuffer;
import java.nio.ShortBuffer;
public class ModelTileMesh extends BaseModelTileMesh {
static final Vector3 tmpPosition = new Vector3();
static final Vector3 tmpNormal = new Vector3();
@ -82,7 +72,7 @@ public class ModelTileMesh extends BaseModelTileMesh {
VertexAttribute.TexCoords(0)
);
model.getBoundingBox(tmpModelBounds);
model.calculateBoundingBox(tmpModelBounds);
if (scaleToSize != null) {
MathHelpers.getScaleFactor(tmpModelBounds.getDimensions(), scaleToSize, tmpScaleFactor);
bounds = new BoundingBox().set(Vector3.Zero, scaleToSize);
@ -97,7 +87,7 @@ public class ModelTileMesh extends BaseModelTileMesh {
private void setupCollisionVertices(Model collisionModel) {
if (scaleToSize != null) {
collisionModel.getBoundingBox(tmpModelBounds);
collisionModel.calculateBoundingBox(tmpModelBounds);
MathHelpers.getScaleFactor(tmpModelBounds.getDimensions(), scaleToSize, tmpScaleFactor);
} else
tmpScaleFactor.set(1.0f, 1.0f, 1.0f);

4
src/com/blarg/gdx/tilemap3d/tilemesh/MultiModelTileMesh.java
View file

@ -100,7 +100,7 @@ public class MultiModelTileMesh extends BaseModelTileMesh {
BoundingBox submodelBounds = new BoundingBox();
Vector3 scaleFactor = new Vector3();
submodel.getBoundingBox(tmpBounds);
submodel.calculateBoundingBox(tmpBounds);
if (scaleToSize != null) {
MathHelpers.getScaleFactor(tmpBounds.getDimensions(), scaleToSize, scaleFactor);
submodelBounds.set(Vector3.Zero, scaleToSize);
@ -142,7 +142,7 @@ public class MultiModelTileMesh extends BaseModelTileMesh {
Vector3 scaleFactor = new Vector3();
if (scaleToSize != null) {
collisionModel.getBoundingBox(tmpBounds);
collisionModel.calculateBoundingBox(tmpBounds);
MathHelpers.getScaleFactor(tmpBounds.getDimensions(), scaleToSize, scaleFactor);
} else
scaleFactor.set(1.0f, 1.0f, 1.0f);