Work on transmitter models, not working yet

This commit is contained in:
aidancbrady committed 2016-05-24 13:18:54 -04:00
1 parent c820c1ae86
commit 6eddd30478
31 files changed
+381 -251

No files matched your search

@@ -1,11 +1,6 @@
package mekanism.client.render.obj;
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -26,53 +21,33 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.IFlexibleBakedModel;
import net.minecraftforge.client.model.IModelState;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.TRSRTransformation;
import net.minecraftforge.client.model.obj.OBJModel;
import net.minecraftforge.client.model.obj.OBJModel.Face;
import net.minecraftforge.client.model.obj.OBJModel.Group;
import net.minecraftforge.client.model.obj.OBJModel.Normal;
import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel;
import net.minecraftforge.client.model.obj.OBJModel.OBJState;
import net.minecraftforge.client.model.obj.OBJModel.TextureCoordinate;
import net.minecraftforge.client.model.obj.OBJModel.Vertex;
import net.minecraftforge.client.model.pipeline.LightUtil;
import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
import net.minecraftforge.common.property.IExtendedBlockState;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartModel
public class GlowPanelModel extends OBJBakedModelBase implements ISmartMultipartModel
{
private IBakedModel baseModel;
private HashMap<TransformType, Matrix4f> transformationMap = new HashMap<TransformType, Matrix4f>();
private static Map<Integer, GlowPanelModel> glowPanelCache = new HashMap<Integer, GlowPanelModel>();
private static Map<Integer, GlowPanelModel> glowPanelItemCache = new HashMap<Integer, GlowPanelModel>();
private Set<BakedQuad> bakedQuads;
private IBlockState tempState;
private TextureAtlasSprite tempSprite;
private ItemStack tempStack;
private ImmutableMap<String, TextureAtlasSprite> textureMap;
public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap<String, TextureAtlasSprite> textures, HashMap<TransformType, Matrix4f> transform)
{
model.super(model, state, format, textures);
baseModel = base;
transformationMap = transform;
textureMap = textures;
super(base, model, state, format, textures, transform);
}
public static void forceRebake()
@@ -104,7 +79,7 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode
if(!glowPanelCache.containsKey(hash))
{
GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap);
GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), textureMap, transformationMap);
model.tempState = state;
glowPanelCache.put(hash, model);
}
@@ -148,176 +123,19 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode
return bakedModel;
}
@Override
public List<BakedQuad> getGeneralQuads()
{
if(bakedQuads == null)
{
bakedQuads = Collections.synchronizedSet(new LinkedHashSet<BakedQuad>());
Set<Face> faces = Collections.synchronizedSet(new LinkedHashSet<Face>());
Optional<TRSRTransformation> transform = Optional.absent();
Set<Face> coloredFaces = new HashSet<Face>();
for(Group g : getModel().getMatLib().getGroups().values())
{
if(getState() instanceof OBJState)
{
OBJState state = (OBJState)getState();
if(state.parent != null)
{
transform = state.parent.apply(Optional.absent());
}
if(state.getGroupsWithVisibility(true).contains(g.getName()))
{
LinkedHashSet<Face> tempFaces = g.applyTransform(transform);
faces.addAll(tempFaces);
if(g.getName().equals("light"))
{
coloredFaces.addAll(tempFaces);
}
}
}
else {
transform = getState().apply(Optional.absent());
LinkedHashSet<Face> tempFaces = g.applyTransform(transform);
faces.addAll(tempFaces);
if(g.getName().equals("light"))
{
coloredFaces.addAll(tempFaces);
}
}
}
for(Face f : faces)
{
if(getModel().getMatLib().getMaterial(f.getMaterialName()).isWhite())
{
for(Vertex v : f.getVertices())
{
if(!v.getMaterial().equals(getModel().getMatLib().getMaterial(v.getMaterial().getName())))
{
v.setMaterial(getModel().getMatLib().getMaterial(v.getMaterial().getName()));
}
}
tempSprite = ModelLoader.White.instance;
}
else {
tempSprite = textureMap.get(f.getMaterialName());
}
float[] color = new float[] { 1, 1, 1, 1 };
if(coloredFaces.contains(f))
{
EnumColor c = getColor();
color = new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1};
}
UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(getFormat());
builder.setQuadOrientation(EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z));
builder.setQuadColored();
builder.setQuadTint(0);
Normal faceNormal = f.getNormal();
putVertexData(builder, f.getVertices()[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], tempSprite, getFormat(), color);
putVertexData(builder, f.getVertices()[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], tempSprite, getFormat(), color);
putVertexData(builder, f.getVertices()[2], faceNormal, TextureCoordinate.getDefaultUVs()[2], tempSprite, getFormat(), color);
putVertexData(builder, f.getVertices()[3], faceNormal, TextureCoordinate.getDefaultUVs()[3], tempSprite, getFormat(), color);
bakedQuads.add(builder.build());
}
}
List<BakedQuad> quadList = Collections.synchronizedList(Lists.newArrayList(bakedQuads));
return quadList;
}
private static final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, VertexFormat format, float[] color)
{
for(int e = 0; e < format.getElementCount(); e++)
{
switch(format.getElement(e).getUsage())
{
case POSITION:
builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, v.getPos().w);
break;
case COLOR:
float d;
if(v.hasNormal())
{
d = LightUtil.diffuseLight(v.getNormal().x, v.getNormal().y, v.getNormal().z);
}
else {
d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z);
}
if(v.getMaterial() != null)
{
builder.put(e, d * v.getMaterial().getColor().x * color[0], d * v.getMaterial().getColor().y * color[1], d * v.getMaterial().getColor().z * color[2], v.getMaterial().getColor().w * color[3]);
}
else {
builder.put(e, d, d, d, 1);
}
break;
case UV:
if(!v.hasTextureCoordinate())
{
builder.put(e, sprite.getInterpolatedU(defUV.u * 16), sprite.getInterpolatedV((1 - defUV.v) * 16), 0, 1);
}
else {
builder.put(e, sprite.getInterpolatedU(v.getTextureCoordinate().u * 16), sprite.getInterpolatedV((1 - v.getTextureCoordinate().v) * 16), 0, 1);
}
break;
case NORMAL:
if(!v.hasNormal())
{
builder.put(e, faceNormal.x, faceNormal.y, faceNormal.z, 0);
}
else {
builder.put(e, v.getNormal().x, v.getNormal().y, v.getNormal().z, 0);
}
break;
default:
builder.put(e);
}
}
}
private static Field f_textures;
public static ImmutableMap<String, TextureAtlasSprite> getTexturesForOBJModel(IBakedModel model)
@Override
public float[] getOverrideColor(Face f, String groupName)
{
try {
if(f_textures == null)
{
f_textures = OBJBakedModel.class.getDeclaredField("textures");
f_textures.setAccessible(true);
}
return (ImmutableMap<String, TextureAtlasSprite>)f_textures.get(model);
} catch(Exception e) {
e.printStackTrace();
if(groupName.equals("light"))
{
EnumColor c = getColor();
return new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1};
}
return null;
}
public ImmutableMap<String, TextureAtlasSprite> getTextures()
{
return getTexturesForOBJModel(this);
}
private Pair<IPerspectiveAwareModel, Matrix4f> thirdPersonTransform;
@Override