From 1a01d5e2178bbe9dbf0a2c8109371bee6ded3cad Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 9 Feb 2016 00:14:46 +0000 Subject: [PATCH] Get a lot more rendering working --- .../java/mekanism/client/ClientProxy.java | 8 +- .../RenderSolarNeutronActivator.java | 51 -- .../java/mekanism/common/MekanismBlocks.java | 2 +- .../common/tile/TileEntityEntangledBlock.java | 1 - .../common/tile/TileEntityInductionPort.java | 1 - .../common/tile/TileEntityPortableTank.java | 1 - .../tile/TileEntityThermoelectricBoiler.java | 1 - .../blockstates/advanced_factory.json | 26 + .../mekanism/blockstates/basic_factory.json | 26 + .../chemical_dissolution_chamber.json | 24 + .../assets/mekanism/blockstates/combiner.json | 24 + .../assets/mekanism/blockstates/crusher.json | 24 + .../mekanism/blockstates/elite_factory.json | 26 + .../blockstates/energized_smelter.json | 24 + .../blockstates/osmium_compressor.json | 24 + .../blockstates/precision_sawmill.json | 24 + .../pressurized_reaction_chamber.json | 24 + .../blockstates/purification_chamber.json | 24 + .../blockstates/solar_neutron_activator.json | 20 + .../assets/mekanism/models/block/factory.json | 13 + .../models/{ => block}/seismic_vibrator.json | 0 .../mekanism/models/block/solar_tri.obj | 513 ++++++++++++++++++ 22 files changed, 821 insertions(+), 60 deletions(-) delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java create mode 100644 src/main/resources/assets/mekanism/blockstates/advanced_factory.json create mode 100644 src/main/resources/assets/mekanism/blockstates/basic_factory.json create mode 100644 src/main/resources/assets/mekanism/blockstates/chemical_dissolution_chamber.json create mode 100644 src/main/resources/assets/mekanism/blockstates/combiner.json create mode 100644 src/main/resources/assets/mekanism/blockstates/crusher.json create mode 100644 src/main/resources/assets/mekanism/blockstates/elite_factory.json create mode 100644 src/main/resources/assets/mekanism/blockstates/energized_smelter.json create mode 100644 src/main/resources/assets/mekanism/blockstates/osmium_compressor.json create mode 100644 src/main/resources/assets/mekanism/blockstates/precision_sawmill.json create mode 100644 src/main/resources/assets/mekanism/blockstates/pressurized_reaction_chamber.json create mode 100644 src/main/resources/assets/mekanism/blockstates/purification_chamber.json create mode 100644 src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json create mode 100644 src/main/resources/assets/mekanism/models/block/factory.json rename src/main/resources/assets/mekanism/models/{ => block}/seismic_vibrator.json (100%) create mode 100644 src/main/resources/assets/mekanism/models/block/solar_tri.obj diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 21f2cb34c..b9ceb957e 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -88,7 +88,6 @@ import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderSalinationController; import mekanism.client.render.tileentity.RenderSeismicVibrator; -import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; @@ -140,13 +139,11 @@ import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; -import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityMultiblock; -import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; @@ -176,6 +173,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; @@ -323,7 +321,7 @@ public class ClientProxy extends CommonProxy //ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); ClientRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam", new RenderLaserTractorBeam()); - ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); + GameRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator"); GameRegistry.registerTileEntity(TileEntityAmbientAccumulator.class, "AmbientAccumulator"); GameRegistry.registerTileEntity(TileEntityInductionCasing.class, "InductionCasing"); GameRegistry.registerTileEntity(TileEntityInductionPort.class, "InductionPort"); @@ -463,6 +461,8 @@ public class ClientProxy extends CommonProxy MekanismBlocks.registerRender(); + OBJLoader.instance.addDomain("mekanism"); + Mekanism.logger.info("Render registrations complete."); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java deleted file mode 100644 index de8d13506..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java +++ /dev/null @@ -1,51 +0,0 @@ -package mekanism.client.render.tileentity; - -import java.io.IOException; - -import mekanism.common.tile.TileEntitySolarNeutronActivator; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.obj.OBJLoader; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer -{ - private IModel model; - - public RenderSolarNeutronActivator() - { - try - { - model = OBJLoader.instance.loadModel(MekanismUtils.getResource(ResourceType.MODEL, "solar_tri.obj")); - } - catch(IOException e) - {} - } - - @Override - public void renderTileEntityAt(TileEntitySolarNeutronActivator tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float)x+0.5F, (float)y, (float)z+0.5F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - } - - //TODO model.renderAll(); - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 06d3a58c1..452d2fb90 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -155,7 +155,7 @@ public class MekanismBlocks ModelBakery.registerItemVariants(Item.getItemFromBlock(MachineBlock3), new ResourceLocation("mekanism", "entangled_block"), - new ResourceLocation("mekanism", "solat_neutron_activator"), + new ResourceLocation("mekanism", "solar_neutron_activator"), new ResourceLocation("mekanism", "ambient_accumulator"), new ResourceLocation("mekanism", "oredictionificator") ); diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java index 74ebd2c85..5de1d9a05 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java @@ -14,7 +14,6 @@ import mekanism.common.util.CableUtils; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 4f5a60f28..857c9a04e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -27,7 +27,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.common.MinecraftForge; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.Optional.Interface; diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java index b00380fbc..c8985ad72 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java @@ -23,7 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java b/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java index d88269f14..112acd77c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java @@ -24,7 +24,6 @@ import mekanism.common.util.HeatUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory.json new file mode 100644 index 000000000..19ea140c4 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory.json @@ -0,0 +1,26 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/AdvancedFactorySide", + "top": "mekanism:blocks/AdvancedFactoryTop", + "bottom": "mekanism:blocks/AdvancedFactoryBottom", + "front": "mekanism:blocks/AdvancedFactoryFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory.json b/src/main/resources/assets/mekanism/blockstates/basic_factory.json new file mode 100644 index 000000000..2a306a7a5 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory.json @@ -0,0 +1,26 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/BasicFactorySide", + "top": "mekanism:blocks/BasicFactoryTop", + "bottom": "mekanism:blocks/BasicFactoryBottom", + "front": "mekanism:blocks/BasicFactoryFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/chemical_dissolution_chamber.json b/src/main/resources/assets/mekanism/blockstates/chemical_dissolution_chamber.json new file mode 100644 index 000000000..04834c0dc --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/chemical_dissolution_chamber.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/ChemicalDissolutionChamberFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/ChemicalDissolutionChamberFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/combiner.json b/src/main/resources/assets/mekanism/blockstates/combiner.json new file mode 100644 index 000000000..f1c22049c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/combiner.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/CombinerFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/CombinerFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/crusher.json b/src/main/resources/assets/mekanism/blockstates/crusher.json new file mode 100644 index 000000000..e0690c401 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/crusher.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/CrusherFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/CrusherFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory.json b/src/main/resources/assets/mekanism/blockstates/elite_factory.json new file mode 100644 index 000000000..4f6e1ec4a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory.json @@ -0,0 +1,26 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/EliteFactorySide", + "top": "mekanism:blocks/EliteFactoryTop", + "bottom": "mekanism:blocks/EliteFactoryBottom", + "front": "mekanism:blocks/EliteFactoryFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/energized_smelter.json b/src/main/resources/assets/mekanism/blockstates/energized_smelter.json new file mode 100644 index 000000000..c80aebbbb --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/energized_smelter.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/EnergizedSmelterFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/EnergizedSmelterFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json b/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json new file mode 100644 index 000000000..911a5e6f2 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/OsmiumCompressorFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/OsmiumCompressorFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json b/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json new file mode 100644 index 000000000..67dfb77fe --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/PrecisionSawmillFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/PrecisionSawmillFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_reaction_chamber.json b/src/main/resources/assets/mekanism/blockstates/pressurized_reaction_chamber.json new file mode 100644 index 000000000..61b534e79 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_reaction_chamber.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/PressurizedReactionChamberFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/PressurizedReactionChamberFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json new file mode 100644 index 000000000..b2542681d --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SteelCasing", + "front": "mekanism:blocks/PurificationChamberFront" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/PurificationChamberFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json b/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json new file mode 100644 index 000000000..83f97cd16 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:solar_tri.obj" + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/models/block/factory.json b/src/main/resources/assets/mekanism/models/block/factory.json new file mode 100644 index 000000000..ab5e07342 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/factory.json @@ -0,0 +1,13 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "#sides", + "down": "#bottom", + "up": "#top", + "north": "#front", + "east": "#sides", + "south": "#sides", + "west": "#sides" + } +} + diff --git a/src/main/resources/assets/mekanism/models/seismic_vibrator.json b/src/main/resources/assets/mekanism/models/block/seismic_vibrator.json similarity index 100% rename from src/main/resources/assets/mekanism/models/seismic_vibrator.json rename to src/main/resources/assets/mekanism/models/block/seismic_vibrator.json diff --git a/src/main/resources/assets/mekanism/models/block/solar_tri.obj b/src/main/resources/assets/mekanism/models/block/solar_tri.obj new file mode 100644 index 000000000..094ade5c2 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/solar_tri.obj @@ -0,0 +1,513 @@ +# Blender v2.70 (sub 0) OBJ File: 'untitled.blend' +# www.blender.org +o Cube +v 0.775751 0.000000 -0.775751 +v 0.775751 0.000000 0.775751 +v -0.775751 0.000000 0.775751 +v 0.600098 1.245471 -0.600098 +v 0.600098 1.245471 0.600099 +v -0.600098 1.245471 0.600098 +v -0.600098 1.245471 -0.600098 +v -0.775751 0.000000 -0.775751 +v -1.000000 2.000000 -1.000000 +v -0.400000 0.003810 -0.200000 +v -0.597037 0.003810 -1.000000 +v 0.597037 0.003810 -1.000000 +v 0.400000 0.003810 -0.200000 +v -0.210455 1.400000 -0.200000 +v -0.400000 1.400000 -1.000000 +v 0.400000 1.400000 -1.000000 +v 0.210455 1.400000 -0.200000 +v -0.163734 0.001860 0.929790 +v -0.163734 0.001860 0.602323 +v 0.163734 0.001860 0.602323 +v 0.163734 0.001860 0.929790 +v -0.163734 1.681595 0.929790 +v -0.163734 1.681595 0.602323 +v 0.163734 1.681595 0.602323 +v 0.163734 1.681595 0.929790 +v -0.163734 2.317753 0.908083 +v -0.163734 2.154813 0.624031 +v 0.163734 2.154813 0.624031 +v 0.163734 2.317753 0.908083 +v -0.163734 2.494844 0.723671 +v -0.163734 2.332132 0.542139 +v 0.163734 2.332132 0.542139 +v 0.163734 2.494844 0.723671 +v -0.163734 2.557197 0.442637 +v -0.163734 2.438710 0.421698 +v 0.163734 2.438710 0.421698 +v 0.163734 2.557197 0.442637 +v -0.163734 2.705466 -0.790486 +v -0.163734 2.586978 -0.811424 +v 0.163734 2.586978 -0.811424 +v 0.163734 2.705466 -0.790486 +v -0.724969 2.724604 0.442637 +v -0.724969 2.606117 0.421698 +v 0.724969 2.606117 0.421698 +v 0.724969 2.724604 0.442637 +v -0.724969 2.872873 -0.790486 +v -0.724969 2.754385 -0.811424 +v 0.724969 2.754385 -0.811424 +v 0.724969 2.872873 -0.790486 +v -0.208086 1.400000 -0.391914 +v -0.208086 1.400000 -0.808086 +v 0.208086 1.400000 -0.808086 +v 0.208086 1.400000 -0.391914 +v -0.150252 1.687980 -0.469609 +v -0.150252 1.837299 -0.730391 +v 0.150252 1.837299 -0.730391 +v 0.150252 1.687980 -0.469609 +v -0.079605 1.697107 -0.540204 +v -0.079605 1.776218 -0.678369 +v 0.079605 1.776218 -0.678369 +v 0.079605 1.697107 -0.540204 +v 0.444352 2.499090 0.421698 +v 0.444352 2.647359 -0.811424 +v 0.444352 2.765847 -0.790486 +v 0.444352 2.617578 0.442637 +v -0.444352 2.647359 -0.811424 +v -0.444352 2.499090 0.421698 +v -0.444352 2.617578 0.442637 +v -0.444352 2.765847 -0.790486 +v -0.163734 2.599183 -0.359366 +v 0.163734 2.599183 -0.359366 +v 0.163734 2.480696 -0.380305 +v -0.163734 2.480696 -0.380305 +v -0.724969 2.766590 -0.359366 +v 0.724969 2.766590 -0.359366 +v 0.724969 2.648103 -0.380305 +v -0.724969 2.648103 -0.380305 +v 0.444352 2.541076 -0.380305 +v 0.444352 2.659564 -0.359366 +v -0.444352 2.541076 -0.380305 +v -0.444352 2.659564 -0.359366 +vt 0.250000 0.851562 +vt 0.250000 0.656250 +vt 0.437500 0.656250 +vt 0.695312 0.046875 +vt 0.656250 0.250000 +vt 0.460938 0.250000 +vt 0.445312 0.453125 +vt 0.406250 0.656250 +vt 0.218750 0.656250 +vt 0.195312 0.250000 +vt 0.195312 0.000000 +vt 0.445312 0.000000 +vt 0.468750 0.250000 +vt 0.664062 0.250000 +vt 0.695312 0.453125 +vt 0.828125 0.250000 +vt 0.695312 0.250000 +vt 0.695312 0.015625 +vt 0.031250 0.226562 +vt 0.000000 0.000000 +vt 0.187500 0.000000 +vt 0.554688 0.890625 +vt 0.554688 0.664062 +vt 0.687500 0.664062 +vt 0.718750 0.921875 +vt 0.687500 0.703125 +vt 0.820312 0.703125 +vt 0.695312 0.328125 +vt 0.882812 0.328125 +vt 0.851562 0.453125 +vt 0.054688 0.351562 +vt 0.062500 0.312500 +vt 0.132812 0.312500 +vt 0.140625 0.625000 +vt 0.132812 0.359375 +vt 0.179688 0.359375 +vt 0.945312 0.781250 +vt 0.945312 0.507812 +vt 1.000000 0.507812 +vt 0.007812 0.625000 +vt 0.023438 0.359375 +vt 0.078125 0.359375 +vt 0.890625 0.726562 +vt 0.890625 0.453125 +vt 0.945312 0.453125 +vt 1.000000 0.453125 +vt 0.945312 0.726562 +vt 0.945312 0.828125 +vt 0.890625 0.828125 +vt 0.945312 0.867188 +vt 0.890625 0.867188 +vt 0.054688 0.632812 +vt 0.046875 0.703125 +vt 0.000000 0.726562 +vt 1.000000 0.781250 +vt 1.000000 0.851562 +vt 0.945312 0.851562 +vt 0.187500 0.625000 +vt 0.187500 0.726562 +vt 0.945312 0.914062 +vt 0.890625 0.914062 +vt 0.062500 0.734375 +vt 0.031250 0.757812 +vt 1.000000 0.882812 +vt 0.945312 0.882812 +vt 0.140625 0.703125 +vt 0.164062 0.757812 +vt 0.593750 0.585938 +vt 0.593750 0.656250 +vt 0.539062 0.656250 +vt 0.078125 0.750000 +vt 1.000000 0.914062 +vt 0.117188 0.773438 +vt 0.117188 0.750000 +vt 0.585938 0.046875 +vt 0.531250 0.046875 +vt 0.531250 0.031250 +vt 0.820312 0.648438 +vt 0.890625 0.648438 +vt 0.890625 0.695312 +vt 0.820312 0.546875 +vt 0.890625 0.546875 +vt 0.890625 0.601562 +vt 0.687500 0.500000 +vt 0.687500 0.453125 +vt 0.820312 0.453125 +vt 0.132812 0.820312 +vt 0.203125 0.828125 +vt 0.203125 0.851562 +vt 0.125000 0.820312 +vt 0.125000 0.796875 +vt 0.203125 0.796875 +vt 0.640625 0.453125 +vt 0.687500 0.460938 +vt 0.687500 0.585938 +vt 0.492188 0.585938 +vt 0.492188 0.656250 +vt 0.445312 0.656250 +vt 0.632812 0.039062 +vt 0.632812 0.015625 +vt 0.679688 0.000000 +vt 0.484375 0.039062 +vt 0.445312 0.023438 +vt 0.820312 0.296875 +vt 0.867188 0.296875 +vt 0.867188 0.320312 +vt 0.507812 0.828125 +vt 0.500000 0.851562 +vt 0.453125 0.851562 +vt 0.546875 0.710938 +vt 0.492188 0.710938 +vt 0.062500 0.257812 +vt 0.156250 0.226562 +vt 0.132812 0.257812 +vt 0.132812 0.351562 +vt 0.531250 0.718750 +vt 0.507812 0.718750 +vt 0.882812 0.703125 +vt 0.875000 0.773438 +vt 0.554688 0.750000 +vt 0.546875 0.820312 +vt 0.492188 0.820312 +vt 0.742188 0.265625 +vt 0.765625 0.304688 +vt 0.531250 0.742188 +vt 0.507812 0.742188 +vt 0.859375 0.773438 +vt 0.835938 0.765625 +vt 0.531250 0.828125 +vt 0.757812 0.265625 +vt 0.820312 0.601562 +vt 0.593750 0.453125 +vt 0.640625 0.585938 +vt 0.585938 0.031250 +vt 0.773438 0.296875 +vt 0.820312 0.312500 +vt 0.687500 0.546875 +vt 0.820312 0.500000 +vt 0.539062 0.585938 +vt 0.484375 0.015625 +vt 0.554688 0.835938 +vt 0.546875 0.859375 +vt 0.539062 0.453125 +vt 0.687500 0.648438 +vt 0.820312 0.695312 +vt 0.000000 0.835938 +vt 0.000000 0.820312 +vt 0.000000 0.773438 +vt 0.687500 0.656250 +vt 0.492188 0.453125 +vt 0.445312 0.585938 +vt 0.687500 0.601562 +vt 0.640625 0.656250 +vt 0.890625 0.500000 +vt 0.406250 0.250000 +vt 0.195312 0.453125 +vt 0.437500 0.851562 +vt 0.445312 0.046875 +vt 0.445312 0.250000 +vt 0.828125 0.023438 +vt 0.687500 0.890625 +vt 0.789062 0.921875 +vt 0.726562 0.453125 +vt 0.132812 0.734375 +vt 0.070312 0.773438 +vt 0.132812 0.835938 +vt 0.195312 0.820312 +vt 0.679688 0.023438 +vt 0.460938 0.828125 +vt 0.484375 0.664062 +vt 0.828125 0.750000 +vt 0.484375 0.750000 +vt 0.695312 0.320312 +vt 0.765625 0.289062 +vt 0.773438 0.320312 +vt 0.687500 0.695312 +vt 0.000000 0.789062 +vt 0.445312 0.460938 +vt 0.218750 0.250000 +vn 0.000000 1.000000 0.000000 +vn 0.990201 0.139651 0.000001 +vn -0.000001 0.139651 0.990201 +vn 0.000000 -1.000000 0.000000 +vn -0.990201 0.139651 -0.000000 +vn -0.964014 0.136046 0.228405 +vn 0.000000 0.000000 -1.000000 +vn 0.962655 0.130689 0.237099 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 -0.000001 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.034103 0.999418 +vn 0.000000 0.721277 0.692647 +vn 0.000000 0.045825 -0.998949 +vn 0.000000 0.976260 0.216604 +vn 0.000000 -0.419278 -0.907858 +vn 0.000000 0.970931 0.239361 +vn 0.000000 -0.748892 -0.662692 +vn 0.000000 0.174022 -0.984742 +vn 0.347263 -0.910507 -0.224466 +vn 0.000000 -0.970931 -0.239361 +vn -0.355931 -0.933234 -0.048855 +vn -0.355931 0.933234 0.048857 +vn 0.347263 0.910508 0.224464 +vn -0.066225 0.173640 -0.982580 +vn 0.066226 0.173641 -0.982580 +vn 0.066226 -0.173641 0.982580 +vn -0.066225 -0.173640 0.982580 +vn 0.000000 0.260479 0.965479 +vn 0.000000 1.000000 0.000001 +vn 0.000000 0.991746 0.128214 +vn 0.991368 0.131110 0.000000 +vn 0.000000 0.174930 -0.984581 +vn -0.964527 0.229089 0.131172 +vn 0.000000 0.867811 0.496894 +vn -0.358815 0.810023 0.463805 +vn 0.000000 0.648393 0.761306 +vn 0.358814 0.810023 0.463804 +vn 0.204500 -0.950411 -0.234303 +vn -0.210081 0.976347 0.051114 +vn -0.037418 0.173900 -0.984052 +vn 0.037418 -0.173901 0.984052 +vn -0.210081 -0.976347 -0.051112 +vn 0.204501 0.950412 0.234302 +vn 0.037419 0.173901 -0.984052 +vn -0.037418 -0.173900 0.984052 +vn 0.000000 0.998632 0.052280 +vn 0.355931 -0.933234 -0.048857 +vn 0.000000 -0.998632 -0.052280 +vn -0.347263 -0.910508 -0.224464 +vn -0.347263 0.910507 0.224466 +vn 0.355931 0.933234 0.048855 +vn 0.210081 -0.976347 -0.051114 +vn -0.204500 0.950411 0.234303 +vn -0.204501 -0.950412 -0.234302 +vn 0.210081 0.976347 0.051112 +vn 0.000000 0.139652 -0.990201 +vn 0.990201 0.139652 0.000000 +vn 0.000000 0.139651 0.990201 +vn -0.962655 0.130689 0.237099 +vn 0.964014 0.136046 0.228405 +vn 0.000000 0.721278 0.692646 +vn 0.000000 0.045824 -0.998950 +vn 0.000000 0.976260 0.216603 +vn 0.000000 0.970931 0.239362 +vn 0.000000 0.174021 -0.984742 +vn 0.347263 -0.910507 -0.224464 +vn 0.000000 -0.970930 -0.239362 +vn -0.355931 -0.933234 -0.048857 +vn -0.355931 0.933234 0.048855 +vn 0.347263 0.910507 0.224466 +vn -0.066226 0.173641 -0.982580 +vn 0.066225 0.173640 -0.982580 +vn 0.066225 -0.173640 0.982580 +vn -0.066226 -0.173641 0.982580 +vn 0.000000 0.260479 0.965480 +vn 0.000000 0.991746 0.128218 +vn 0.964527 0.229089 0.131172 +vn -0.991368 0.131110 0.000000 +vn 0.000000 0.867812 0.496892 +vn -0.358814 0.810023 0.463804 +vn 0.000000 0.648392 0.761307 +vn 0.358814 0.810023 0.463805 +vn 0.204501 -0.950412 -0.234302 +vn -0.210081 0.976347 0.051112 +vn -0.037418 0.173901 -0.984052 +vn 0.037418 -0.173900 0.984052 +vn -0.210081 -0.976347 -0.051114 +vn 0.204501 0.950411 0.234303 +vn 0.037418 0.173900 -0.984052 +vn -0.037419 -0.173901 0.984052 +vn 0.355931 -0.933234 -0.048855 +vn -0.347263 -0.910507 -0.224466 +vn -0.347263 0.910508 0.224464 +vn 0.355931 0.933234 0.048857 +vn 0.210081 -0.976347 -0.051112 +vn -0.204501 0.950412 0.234302 +vn -0.204500 -0.950411 -0.234304 +vn 0.210081 0.976347 0.051114 +vn 0.000000 0.139651 -0.990201 +s off +f 7/1/1 6/2/1 5/3/1 +f 1/4/2 4/5/2 5/6/2 +f 2/7/3 5/8/3 6/9/3 +f 2/10/4 3/11/4 8/12/4 +f 6/13/5 7/14/5 8/15/5 +f 14/16/6 15/17/6 11/18/6 +f 16/19/7 12/20/7 11/21/7 +f 17/22/8 13/23/8 12/24/8 +f 14/25/9 10/26/9 13/27/9 +f 11/28/4 12/29/4 13/30/4 +f 17/31/10 53/32/10 50/33/10 +f 23/34/11 19/35/11 18/36/11 +f 24/37/7 20/38/7 19/39/7 +f 25/40/12 21/41/12 20/42/12 +f 22/43/9 18/44/9 21/45/9 +f 18/46/4 19/39/4 20/38/4 +f 25/47/13 29/48/13 26/49/13 +f 29/48/14 33/50/14 30/51/14 +f 24/52/12 28/53/12 29/54/12 +f 23/55/15 27/56/15 28/57/15 +f 23/34/11 22/58/11 26/59/11 +f 33/50/16 37/60/16 34/61/16 +f 28/53/12 32/62/12 33/63/12 +f 27/56/17 31/64/17 32/65/17 +f 27/66/11 26/59/11 30/67/11 +f 71/68/18 41/69/18 38/70/18 +f 33/63/12 32/62/12 36/71/12 +f 31/64/19 35/72/19 36/60/19 +f 30/67/11 34/73/11 35/74/11 +f 40/75/20 39/76/20 38/77/20 +f 78/78/21 63/79/21 48/80/21 +f 73/81/22 39/82/22 40/83/22 +f 67/84/23 43/85/23 77/86/23 +f 76/87/12 48/88/12 49/89/12 +f 77/90/11 74/91/11 46/92/11 +f 65/93/24 45/94/24 75/95/24 +f 81/96/25 69/97/25 46/98/25 +f 63/99/26 64/100/26 49/101/26 +f 66/102/27 47/103/27 46/12/27 +f 62/104/28 44/105/28 45/106/28 +f 67/107/29 68/108/29 42/109/29 +f 53/23/30 57/110/30 54/111/30 +f 17/31/1 16/19/1 52/112/1 +f 15/113/31 51/114/31 52/112/31 +f 14/115/1 50/33/1 51/114/1 +f 57/110/32 61/116/32 58/117/32 +f 53/27/33 52/118/33 56/119/33 +f 51/120/34 55/121/34 56/122/34 +f 50/17/35 54/123/35 55/124/35 +f 60/125/36 59/126/36 58/117/36 +f 56/119/37 60/127/37 61/128/37 +f 55/121/38 59/129/38 60/107/38 +f 55/124/39 54/123/39 58/130/39 +f 72/131/40 40/83/40 63/79/40 +f 37/132/41 65/93/41 79/133/41 +f 40/75/42 41/134/42 64/100/42 +f 36/135/43 62/104/43 65/136/43 +f 35/137/44 67/84/44 80/138/44 +f 70/139/45 38/70/45 69/97/45 +f 39/76/46 66/102/46 69/140/46 +f 35/141/47 34/142/47 68/108/47 +f 34/143/48 37/132/48 71/68/48 +f 62/144/49 78/78/49 76/145/49 +f 35/137/50 73/81/50 72/131/50 +f 80/138/51 77/86/51 47/44/51 +f 45/146/12 44/147/12 76/87/12 +f 42/148/11 74/91/11 77/90/11 +f 79/133/52 75/95/52 49/149/52 +f 68/150/53 81/96/53 74/151/53 +f 36/152/54 72/131/54 78/78/54 +f 71/68/55 79/133/55 64/153/55 +f 73/81/56 80/138/56 66/154/56 +f 34/143/57 70/139/57 81/96/57 +f 4/155/58 1/7/58 8/156/58 +f 4/157/1 7/1/1 5/3/1 +f 2/158/59 1/4/59 5/6/59 +f 3/156/60 2/7/60 6/9/60 +f 1/159/4 2/10/4 8/12/4 +f 3/7/5 6/13/5 8/15/5 +f 10/160/61 14/16/61 11/18/61 +f 15/113/7 16/19/7 11/21/7 +f 16/161/62 17/22/62 12/24/62 +f 17/162/9 14/25/9 13/27/9 +f 10/163/4 11/28/4 13/30/4 +f 14/115/1 17/31/1 50/33/1 +f 22/58/11 23/34/11 18/36/11 +f 23/55/7 24/37/7 19/39/7 +f 24/52/12 25/40/12 20/42/12 +f 25/47/9 22/43/9 21/45/9 +f 21/45/4 18/46/4 20/38/4 +f 22/43/13 25/47/13 26/49/13 +f 26/49/63 29/48/63 30/51/63 +f 25/40/12 24/52/12 29/54/12 +f 24/37/64 23/55/64 28/57/64 +f 27/66/11 23/34/11 26/59/11 +f 30/51/65 33/50/65 34/61/65 +f 29/54/12 28/53/12 33/63/12 +f 28/57/17 27/56/17 32/65/17 +f 31/164/11 27/66/11 30/67/11 +f 70/139/66 71/68/66 38/70/66 +f 37/165/12 33/63/12 36/71/12 +f 32/65/19 31/64/19 36/60/19 +f 31/164/11 30/67/11 35/74/11 +f 41/134/67 40/75/67 38/77/67 +f 76/145/68 78/78/68 48/80/68 +f 72/131/69 73/81/69 40/83/69 +f 80/138/70 67/84/70 77/86/70 +f 75/166/12 76/87/12 49/89/12 +f 47/167/11 77/90/11 46/92/11 +f 79/133/71 65/93/71 75/95/71 +f 74/151/72 81/96/72 46/98/72 +f 48/168/73 63/99/73 49/101/73 +f 69/140/74 66/102/74 46/12/74 +f 65/136/75 62/104/75 45/106/75 +f 43/169/76 67/107/76 42/109/76 +f 50/170/77 53/23/77 54/111/77 +f 53/32/1 17/31/1 52/112/1 +f 16/19/1 15/113/1 52/112/1 +f 15/113/1 14/115/1 51/114/1 +f 54/111/78 57/110/78 58/117/78 +f 57/171/79 53/27/79 56/119/79 +f 52/172/34 51/120/34 56/122/34 +f 51/173/80 50/17/80 55/124/80 +f 61/116/81 60/125/81 58/117/81 +f 57/171/82 56/119/82 61/128/82 +f 56/122/83 55/121/83 60/107/83 +f 59/174/84 55/124/84 58/130/84 +f 78/78/85 72/131/85 63/79/85 +f 71/68/86 37/132/86 79/133/86 +f 63/99/87 40/75/87 64/100/87 +f 37/175/88 36/135/88 65/136/88 +f 73/81/89 35/137/89 80/138/89 +f 81/96/90 70/139/90 69/97/90 +f 38/77/91 39/76/91 69/140/91 +f 67/107/92 35/141/92 68/108/92 +f 70/139/48 34/143/48 71/68/48 +f 44/176/93 62/144/93 76/145/93 +f 36/152/50 35/137/50 72/131/50 +f 66/154/94 80/138/94 47/44/94 +f 75/166/12 45/146/12 76/87/12 +f 43/177/11 42/148/11 77/90/11 +f 64/153/95 79/133/95 49/149/95 +f 42/178/96 68/150/96 74/151/96 +f 62/144/97 36/152/97 78/78/97 +f 41/69/98 71/68/98 64/153/98 +f 39/82/99 73/81/99 66/154/99 +f 68/150/100 34/143/100 81/96/100 +f 7/179/101 4/155/101 8/156/101