proper package naming (leading 'ca' vs 'com')

This commit is contained in:
Gered 2013-11-18 17:21:56 -05:00
parent 2225a67d77
commit 26b306dafa
36 changed files with 152 additions and 137 deletions

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Mesh;
@ -7,10 +7,10 @@ import com.badlogic.gdx.graphics.g3d.utils.MeshBuilder;
import com.badlogic.gdx.graphics.g3d.utils.MeshPartBuilder;
import com.badlogic.gdx.math.Matrix4;
import com.badlogic.gdx.math.Vector3;
import com.blarg.gdx.graphics.Vertices;
import com.blarg.gdx.tilemap3d.tilemesh.CubeTileMesh;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import ca.blarg.gdx.graphics.Vertices;
import ca.blarg.gdx.tilemap3d.tilemesh.CubeTileMesh;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
public class ChunkVertexGenerator {
public class GeneratedChunkMeshes {

View file

@ -1,10 +1,10 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Matrix4;
import com.badlogic.gdx.math.Vector3;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.math.MathHelpers;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.math.MathHelpers;
public final class Tile {
static final Matrix4 faceNorthRotation = new Matrix4().setToRotation(Vector3.Y, 0.0f);

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Mesh;

View file

@ -1,14 +1,15 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.badlogic.gdx.math.Intersector;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.math.collision.Ray;
import com.blarg.gdx.math.IntersectionTester;
import com.blarg.gdx.math.MathHelpers;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import ca.blarg.gdx.math.IntersectionTester;
import ca.blarg.gdx.math.MathHelpers;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
public abstract class TileContainer {
static final Vector3 tmp1 = new Vector3();

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import com.badlogic.gdx.math.Vector3;

View file

@ -1,12 +1,12 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.utils.Disposable;
import com.blarg.gdx.math.IntersectionTester;
import com.blarg.gdx.tilemap3d.lighting.TileMapLighter;
import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import ca.blarg.gdx.math.IntersectionTester;
import ca.blarg.gdx.tilemap3d.lighting.TileMapLighter;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
public class TileMap extends TileContainer implements Disposable {
final TileChunk[] chunks;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import com.badlogic.gdx.graphics.Camera;
import com.badlogic.gdx.graphics.g3d.Environment;

View file

@ -1,12 +1,13 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.badlogic.gdx.math.Matrix4;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.blarg.gdx.math.SweptSphere;
import com.blarg.gdx.math.SweptSphereCollisionTester;
import com.blarg.gdx.math.SweptSphereWorldCollisionChecker;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.math.SweptSphere;
import ca.blarg.gdx.math.SweptSphereCollisionTester;
import ca.blarg.gdx.math.SweptSphereWorldCollisionChecker;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
public class TileMapSweptSphereCollisionChecker implements SweptSphereWorldCollisionChecker {
static final TileCoord min = new TileCoord();

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d;
package ca.blarg.gdx.tilemap3d;
public interface TileRawDataContainer {
Tile[] getData();

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.json;
package ca.blarg.gdx.tilemap3d.json;
import java.util.ArrayList;

View file

@ -1,7 +1,7 @@
package com.blarg.gdx.tilemap3d.json;
package ca.blarg.gdx.tilemap3d.json;
import com.blarg.gdx.tilemap3d.Tile;
import com.blarg.gdx.tilemap3d.TileRawDataContainer;
import ca.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.tilemap3d.TileRawDataContainer;
import java.nio.ByteBuffer;

View file

@ -1,15 +1,16 @@
package com.blarg.gdx.tilemap3d.json;
package ca.blarg.gdx.tilemap3d.json;
import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Base64Coder;
import com.badlogic.gdx.utils.Json;
import com.blarg.gdx.Strings;
import com.blarg.gdx.tilemap3d.ChunkVertexGenerator;
import com.blarg.gdx.tilemap3d.TileChunk;
import com.blarg.gdx.tilemap3d.TileMap;
import com.blarg.gdx.tilemap3d.lighting.TileMapLighter;
import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import ca.blarg.gdx.Strings;
import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator;
import ca.blarg.gdx.tilemap3d.TileChunk;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.lighting.TileMapLighter;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.nio.ByteBuffer;

View file

@ -1,9 +1,10 @@
package com.blarg.gdx.tilemap3d.lighting;
package ca.blarg.gdx.tilemap3d.lighting;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.tilemap3d.Tile;
import com.blarg.gdx.tilemap3d.TileMap;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
public abstract class BaseTileMapLighter implements TileMapLighter {
protected void resetLightValues(TileMap tileMap) {

View file

@ -1,8 +1,10 @@
package com.blarg.gdx.tilemap3d.lighting;
package ca.blarg.gdx.tilemap3d.lighting;
import com.blarg.gdx.tilemap3d.Tile;
import com.blarg.gdx.tilemap3d.TileMap;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
public class LightSpreadingTileMapLighter extends BaseTileMapLighter {
private boolean doSkyLight;

View file

@ -1,16 +1,21 @@
package com.blarg.gdx.tilemap3d.lighting;
package ca.blarg.gdx.tilemap3d.lighting;
import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator;
import ca.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.tilemap3d.TileChunk;
import ca.blarg.gdx.tilemap3d.TileCoord;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g3d.utils.MeshBuilder;
import com.badlogic.gdx.math.Matrix4;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.blarg.gdx.graphics.Vertices;
import com.blarg.gdx.tilemap3d.ChunkVertexGenerator;
import com.blarg.gdx.tilemap3d.Tile;
import com.blarg.gdx.tilemap3d.TileChunk;
import com.blarg.gdx.tilemap3d.TileCoord;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.graphics.Vertices;
import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator;
import ca.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.tilemap3d.TileChunk;
import ca.blarg.gdx.tilemap3d.TileCoord;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
public class LitChunkVertexGenerator extends ChunkVertexGenerator {

View file

@ -0,0 +1,19 @@
package ca.blarg.gdx.tilemap3d.lighting;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.lighting.TileMapLighter;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
public class SimpleTileMapLighter extends BaseTileMapLighter {
public SimpleTileMapLighter() {
}
@Override
public void light(TileMap tileMap) {
resetLightValues(tileMap);
castSkyLightDown(tileMap);
}
}

View file

@ -0,0 +1,8 @@
package ca.blarg.gdx.tilemap3d.lighting;
import ca.blarg.gdx.tilemap3d.TileMap;
import ca.blarg.gdx.tilemap3d.TileMap;
public interface TileMapLighter {
void light(TileMap tileMap);
}

View file

@ -1,10 +1,11 @@
package com.blarg.gdx.tilemap3d.prefabs;
package ca.blarg.gdx.tilemap3d.prefabs;
import ca.blarg.gdx.tilemap3d.TileContainer;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.blarg.gdx.tilemap3d.Tile;
import com.blarg.gdx.tilemap3d.TileContainer;
import com.blarg.gdx.tilemap3d.TileRawDataContainer;
import ca.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.tilemap3d.TileContainer;
import ca.blarg.gdx.tilemap3d.TileRawDataContainer;
public class TilePrefab extends TileContainer implements TileRawDataContainer {
public enum Rotation {

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.prefabs.json;
package ca.blarg.gdx.tilemap3d.prefabs.json;
public class JsonTilePrefab {
public int width;

View file

@ -1,12 +1,12 @@
package com.blarg.gdx.tilemap3d.prefabs.json;
package ca.blarg.gdx.tilemap3d.prefabs.json;
import ca.blarg.gdx.tilemap3d.prefabs.TilePrefab;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Base64Coder;
import com.badlogic.gdx.utils.Json;
import com.blarg.gdx.Strings;
import com.blarg.gdx.tilemap3d.json.TileDataSerializer;
import com.blarg.gdx.tilemap3d.prefabs.TilePrefab;
import ca.blarg.gdx.Strings;
import ca.blarg.gdx.tilemap3d.json.TileDataSerializer;
import java.nio.ByteBuffer;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package ca.blarg.gdx.tilemap3d.tilemesh;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.VertexAttributes;
@ -11,9 +11,9 @@ 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.Vertices;
import com.blarg.gdx.graphics.atlas.TextureAtlas;
import com.blarg.gdx.math.MathHelpers;
import ca.blarg.gdx.graphics.Vertices;
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.math.MathHelpers;
import java.nio.FloatBuffer;
import java.nio.ShortBuffer;

View file

@ -1,14 +1,14 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package ca.blarg.gdx.tilemap3d.tilemesh;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.VertexAttribute;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.graphics.atlas.TextureAtlas;
import com.blarg.gdx.graphics.Vertices;
import com.blarg.gdx.math.MathHelpers;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.graphics.Vertices;
import ca.blarg.gdx.math.MathHelpers;
public class CubeTileMesh extends TileMesh {
static final Vector3 A = new Vector3(-0.5f, -0.5f, -0.5f);

View file

@ -1,8 +1,8 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package ca.blarg.gdx.tilemap3d.tilemesh;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Vector2;
import com.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import java.util.HashMap;
import java.util.Map;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package ca.blarg.gdx.tilemap3d.tilemesh;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.VertexAttribute;
@ -6,8 +6,8 @@ import com.badlogic.gdx.graphics.g3d.Model;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.utils.Array;
import com.blarg.gdx.graphics.Vertices;
import com.blarg.gdx.math.MathHelpers;
import ca.blarg.gdx.graphics.Vertices;
import ca.blarg.gdx.math.MathHelpers;
public class ModelTileMesh extends BaseModelTileMesh {
static final Vector3 tmpPosition = new Vector3();

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package ca.blarg.gdx.tilemap3d.tilemesh;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.VertexAttribute;
@ -6,8 +6,8 @@ import com.badlogic.gdx.graphics.g3d.Model;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.utils.Array;
import com.blarg.gdx.graphics.Vertices;
import com.blarg.gdx.math.MathHelpers;
import ca.blarg.gdx.graphics.Vertices;
import ca.blarg.gdx.math.MathHelpers;
public class MultiModelTileMesh extends BaseModelTileMesh {
BoundingBox bounds;

View file

@ -1,11 +1,11 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package ca.blarg.gdx.tilemap3d.tilemesh;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.utils.Disposable;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.graphics.Vertices;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.graphics.Vertices;
public abstract class TileMesh implements Disposable {
public static final Vector3 OFFSET = new Vector3(0.5f, 0.5f, 0.5f);

View file

@ -1,13 +1,14 @@
package com.blarg.gdx.tilemap3d.tilemesh;
package ca.blarg.gdx.tilemap3d.tilemesh;
import ca.blarg.gdx.tilemap3d.Tile;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.g3d.Model;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Array;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.graphics.atlas.TextureAtlas;
import com.blarg.gdx.tilemap3d.Tile;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.tilemap3d.Tile;
public class TileMeshCollection {
public final TextureAtlas atlas;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh.json;
package ca.blarg.gdx.tilemap3d.tilemesh.json;
public class JsonCubeTextures {
public int top;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh.json;
package ca.blarg.gdx.tilemap3d.tilemesh.json;
public class JsonMaterialMapping {
public String name;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh.json;
package ca.blarg.gdx.tilemap3d.tilemesh.json;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector3;

View file

@ -0,0 +1,11 @@
package ca.blarg.gdx.tilemap3d.tilemesh.json;
import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping;
import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition;
import java.util.ArrayList;
public class JsonTileMeshCollection {
public ArrayList<JsonMaterialMapping> materials;
public ArrayList<JsonTileDefinition> tiles;
}

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh.json;
package ca.blarg.gdx.tilemap3d.tilemesh.json;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector3;

View file

@ -1,4 +1,4 @@
package com.blarg.gdx.tilemap3d.tilemesh.json;
package ca.blarg.gdx.tilemap3d.tilemesh.json;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.loaders.ModelLoader;
@ -10,16 +10,16 @@ import com.badlogic.gdx.graphics.g3d.loader.G3dModelLoader;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.JsonReader;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.graphics.atlas.TextureAtlas;
import com.blarg.gdx.io.FileHelpers;
import com.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileMeshCollection;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileSubModels;
import ca.blarg.gdx.Bitfield;
import ca.blarg.gdx.graphics.atlas.TextureAtlas;
import ca.blarg.gdx.io.FileHelpers;
import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping;
import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition;
import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileMeshCollection;
import ca.blarg.gdx.tilemap3d.tilemesh.json.JsonTileSubModels;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.util.HashMap;

View file

@ -1,18 +0,0 @@
package com.blarg.gdx.tilemap3d.lighting;
import com.blarg.gdx.Bitfield;
import com.blarg.gdx.tilemap3d.Tile;
import com.blarg.gdx.tilemap3d.TileMap;
import com.blarg.gdx.tilemap3d.lighting.TileMapLighter;
import com.blarg.gdx.tilemap3d.tilemesh.TileMesh;
public class SimpleTileMapLighter extends BaseTileMapLighter {
public SimpleTileMapLighter() {
}
@Override
public void light(TileMap tileMap) {
resetLightValues(tileMap);
castSkyLightDown(tileMap);
}
}

View file

@ -1,7 +0,0 @@
package com.blarg.gdx.tilemap3d.lighting;
import com.blarg.gdx.tilemap3d.TileMap;
public interface TileMapLighter {
void light(TileMap tileMap);
}

View file

@ -1,11 +0,0 @@
package com.blarg.gdx.tilemap3d.tilemesh.json;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonMaterialMapping;
import com.blarg.gdx.tilemap3d.tilemesh.json.JsonTileDefinition;
import java.util.ArrayList;
public class JsonTileMeshCollection {
public ArrayList<JsonMaterialMapping> materials;
public ArrayList<JsonTileDefinition> tiles;
}