small fixes, ivy mike and heat exchanger models

This commit is contained in:
Bob 2022-11-29 21:34:50 +01:00
parent 84587c25ef
commit 7b370075d7
13 changed files with 6507 additions and 551 deletions

View File

@ -3682,7 +3682,7 @@ public class ModItems {
plate_fuel_u233 = new ItemPlateFuel(2200000).setFunction(FunctionEnum.SQUARE_ROOT, 50).setUnlocalizedName("plate_fuel_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_u233");
plate_fuel_u235 = new ItemPlateFuel(2200000).setFunction(FunctionEnum.SQUARE_ROOT, 40).setUnlocalizedName("plate_fuel_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_u235");
plate_fuel_mox = new ItemPlateFuel(2400000).setFunction(FunctionEnum.LOGARITHM, 50).setUnlocalizedName("plate_fuel_mox").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_mox");
plate_fuel_pu239 = new ItemPlateFuel(2000000).setFunction(FunctionEnum.NEGATIVE_QUADRATIC, 25).setUnlocalizedName("plate_fuel_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_pu239");
plate_fuel_pu239 = new ItemPlateFuel(2000000).setFunction(FunctionEnum.NEGATIVE_QUADRATIC, 50).setUnlocalizedName("plate_fuel_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_pu239");
plate_fuel_sa326 = new ItemPlateFuel(2000000).setFunction(FunctionEnum.LINEAR, 80).setUnlocalizedName("plate_fuel_sa326").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_sa326");
plate_fuel_ra226be = new ItemPlateFuel(1300000).setFunction(FunctionEnum.PASSIVE, 30).setUnlocalizedName("plate_fuel_ra226be").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_ra226be");
plate_fuel_pu238be = new ItemPlateFuel(1000000).setFunction(FunctionEnum.PASSIVE, 50).setUnlocalizedName("plate_fuel_pu238be").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_pu238be");

View File

@ -171,7 +171,7 @@ public class ModEventHandler {
EntityPlayer player = event.player;
if(player.getUniqueID().toString().equals(Library.Dr_Nostalgia) && !player.worldObj.isRemote) {
if((player.getUniqueID().toString().equals(Library.Dr_Nostalgia) || player.getDisplayName().equals("Dr_Nostalgia")) && !player.worldObj.isRemote) {
if(!player.inventory.hasItem(ModItems.hat))
player.inventory.addItemStackToInventory(new ItemStack(ModItems.hat));

View File

@ -62,6 +62,7 @@ public class ResourceManager {
public static final IModelCustom heater_oven = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/heating_oven.obj"));
public static final IModelCustom heater_oilburner = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/oilburner.obj"));
public static final IModelCustom heater_electric = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/electric_heater.obj"), false);
public static final IModelCustom heater_heatex = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/heatex.obj"));
//Heat Engines
public static final IModelCustom stirling = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/stirling.obj"));
@ -233,7 +234,7 @@ public class ResourceManager {
public static final IModelCustom bomb_gadget = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/TheGadget3.obj"));
public static final IModelCustom bomb_boy = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/LilBoy1.obj"));
public static final IModelCustom bomb_man = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/FatMan.obj")).asDisplayList();
public static final IModelCustom bomb_mike = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/IvyMike.obj"));
public static final IModelCustom bomb_mike = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/ivymike.obj"));
public static final IModelCustom bomb_tsar = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/TsarBomba.obj"));
public static final IModelCustom bomb_prototype = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/Prototype.obj"));
public static final IModelCustom bomb_fleija = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/Fleija.obj"));
@ -391,6 +392,7 @@ public class ResourceManager {
public static final ResourceLocation heater_oven_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/heating_oven.png");
public static final ResourceLocation heater_oilburner_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/oilburner.png");
public static final ResourceLocation heater_electric_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/electric_heater.png");
public static final ResourceLocation heater_heatex_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/heater_heatex.png");
//Heat Engines
public static final ResourceLocation stirling_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/stirling.png");
@ -579,7 +581,7 @@ public class ResourceManager {
public static final ResourceLocation bomb_gadget_tex = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_tex.png");
public static final ResourceLocation bomb_boy_tex = new ResourceLocation(RefStrings.MODID, "textures/models/lilboy.png");
public static final ResourceLocation bomb_man_tex = new ResourceLocation(RefStrings.MODID, "textures/models/FatMan.png");
public static final ResourceLocation bomb_mike_tex = new ResourceLocation(RefStrings.MODID, "textures/models/IvyMike.png");
public static final ResourceLocation bomb_mike_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/ivymike.png");
public static final ResourceLocation bomb_tsar_tex = new ResourceLocation(RefStrings.MODID, "textures/models/TsarBomba.png");
public static final ResourceLocation bomb_prototype_tex = new ResourceLocation(RefStrings.MODID, "textures/models/Prototype.png");
public static final ResourceLocation bomb_fleija_tex = new ResourceLocation(RefStrings.MODID, "textures/models/Fleija.png");

View File

@ -442,17 +442,6 @@ public class ItemRenderLibrary {
ResourceManager.bomb_boy.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_mike), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -5, 0);
GL11.glScaled(2.5, 2.5, 2.5);
}
public void renderCommon() {
GL11.glRotated(90, 0, 1, 0);
bindTexture(ResourceManager.bomb_mike_tex);
ResourceManager.bomb_mike.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_tsar), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(2.25, 2.25, 2.25);

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable;
import com.hbm.blocks.ModBlocks;
import com.hbm.main.ResourceManager;
import com.hbm.render.item.ItemRenderBase;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -20,13 +21,16 @@ public class RenderHeaterHeatex extends TileEntitySpecialRenderer implements IIt
GL11.glEnable(GL11.GL_LIGHTING);
switch(tile.getBlockMetadata() - BlockDummyable.offset) {
case 3: GL11.glRotatef(0, 0F, 1F, 0F); break;
case 5: GL11.glRotatef(90, 0F, 1F, 0F); break;
case 2: GL11.glRotatef(180, 0F, 1F, 0F); break;
case 4: GL11.glRotatef(270, 0F, 1F, 0F); break;
case 3: GL11.glRotatef(270, 0F, 1F, 0F); break;
case 5: GL11.glRotatef(0, 0F, 1F, 0F); break;
case 2: GL11.glRotatef(90, 0F, 1F, 0F); break;
case 4: GL11.glRotatef(180, 0F, 1F, 0F); break;
}
//TODO
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.heater_heatex_tex);
ResourceManager.heater_heatex.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glPopMatrix();
}
@ -44,7 +48,10 @@ public class RenderHeaterHeatex extends TileEntitySpecialRenderer implements IIt
GL11.glScaled(3.25, 3.25, 3.25);
}
public void renderCommon() {
//TODO
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.heater_heatex_tex);
ResourceManager.heater_heatex.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
}};
}
}

View File

@ -2,38 +2,58 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.blocks.ModBlocks;
import com.hbm.main.ResourceManager;
import com.hbm.render.item.ItemRenderBase;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.client.IItemRenderer;
public class RenderNukeMike extends TileEntitySpecialRenderer {
public class RenderNukeMike extends TileEntitySpecialRenderer implements IItemRendererProvider {
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
switch(tileEntity.getBlockMetadata())
{
case 3:
GL11.glRotatef(90, 0F, 1F, 0F); break;
case 5:
GL11.glRotatef(180, 0F, 1F, 0F); break;
case 2:
GL11.glRotatef(270, 0F, 1F, 0F); break;
case 4:
GL11.glRotatef(0, 0F, 1F, 0F); break;
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) {
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
switch(tileEntity.getBlockMetadata()) {
case 3: GL11.glRotatef(0, 0F, 1F, 0F); break;
case 5: GL11.glRotatef(90, 0F, 1F, 0F); break;
case 2: GL11.glRotatef(180, 0F, 1F, 0F); break;
case 4: GL11.glRotatef(270, 0F, 1F, 0F); break;
}
bindTexture(ResourceManager.bomb_mike_tex);
ResourceManager.bomb_mike.renderAll();
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.bomb_mike_tex);
ResourceManager.bomb_mike.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}
GL11.glPopMatrix();
}
@Override
public Item getItemForRenderer() {
return Item.getItemFromBlock(ModBlocks.nuke_mike);
}
@Override
public IItemRenderer getRenderer() {
return new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -5, 0);
GL11.glScaled(2.25, 2.25, 2.25);
}
public void renderCommon() {
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.bomb_mike_tex);
ResourceManager.bomb_mike.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
}};
}
}

View File

@ -86,11 +86,11 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
public boolean isItemValidForSlot(int i, ItemStack itemStack) {
ItemStack full = FluidContainerRegistry.getFullContainer(itemStack, tank.getTankType());
//if fillable and the fill being possible for this tank size
if(i == 2 && full != null && FluidContainerRegistry.getFluidContent(full, tank.getTankType()) <= tank.getMaxFill())
if(i == 4 && full != null && FluidContainerRegistry.getFluidContent(full, tank.getTankType()) <= tank.getMaxFill())
return true;
int content = FluidContainerRegistry.getFluidContent(itemStack, tank.getTankType());
//if content is above 0 but still within capacity
if(i == 4 && content > 0 && content <= tank.getMaxFill())
if(i == 2 && content > 0 && content <= tank.getMaxFill())
return true;
return false;

View File

@ -1,504 +0,0 @@
# Blender v2.76 (sub 0) OBJ File: 'IvyMike.blend'
# www.blender.org
o Circle
v 0.000000 0.000000 -0.900000
v -0.344415 0.000000 -0.831492
v -0.636396 0.000000 -0.636396
v -0.831492 0.000000 -0.344415
v -0.900000 0.000000 0.000000
v -0.831492 0.000000 0.344415
v -0.636396 0.000000 0.636396
v -0.344415 0.000000 0.831492
v -0.000000 0.000000 0.900000
v 0.344415 0.000000 0.831492
v 0.636396 0.000000 0.636396
v 0.831492 0.000000 0.344415
v 0.900000 0.000000 -0.000000
v 0.831491 0.000000 -0.344415
v 0.636396 0.000000 -0.636396
v 0.344415 0.000000 -0.831492
v 0.000000 0.200000 -1.000000
v 0.000000 5.200000 -1.000000
v 0.382683 0.200000 -0.923880
v 0.382683 5.200000 -0.923880
v 0.707107 0.200000 -0.707107
v 0.707107 5.200000 -0.707107
v 0.923880 0.200000 -0.382683
v 0.923880 5.200000 -0.382683
v 1.000000 0.200000 0.000000
v 1.000000 5.200000 0.000000
v 0.923880 0.200000 0.382684
v 0.923880 5.200000 0.382684
v 0.707107 0.200000 0.707107
v 0.707107 5.200000 0.707107
v 0.382683 0.200000 0.923880
v 0.382683 5.200000 0.923880
v 0.000000 0.200000 1.000000
v 0.000000 5.200000 1.000000
v -0.382683 0.200000 0.923880
v -0.382683 5.200000 0.923880
v -0.707107 0.200000 0.707107
v -0.707107 5.200000 0.707107
v -0.923880 0.200000 0.382684
v -0.923880 5.200000 0.382684
v -1.000000 0.200000 -0.000000
v -1.000000 5.200000 -0.000000
v -0.923879 0.200000 -0.382684
v -0.923879 5.200000 -0.382684
v -0.707107 0.200000 -0.707107
v -0.707107 5.200000 -0.707107
v -0.382683 0.200000 -0.923880
v -0.382683 5.200000 -0.923880
v 0.000000 5.800000 -0.900000
v -0.344415 5.800000 -0.831492
v -0.636396 5.800000 -0.636396
v -0.831492 5.800000 -0.344415
v -0.900000 5.800000 0.000000
v -0.831492 5.800000 0.344415
v -0.636396 5.800000 0.636396
v -0.344415 5.800000 0.831492
v -0.000000 5.800000 0.900000
v 0.344415 5.800000 0.831492
v 0.636396 5.800000 0.636396
v 0.831492 5.800000 0.344415
v 0.900000 5.800000 -0.000000
v 0.831491 5.800000 -0.344415
v 0.636396 5.800000 -0.636396
v 0.344415 5.800000 -0.831492
v 0.000000 5.800000 -1.000000
v -0.382683 5.800000 -0.923880
v -0.707107 5.800000 -0.707107
v -0.923880 5.800000 -0.382683
v -1.000000 5.800000 0.000000
v -0.923880 5.800000 0.382684
v -0.707107 5.800000 0.707107
v -0.382683 5.800000 0.923880
v -0.000000 5.800000 1.000000
v 0.382683 5.800000 0.923880
v 0.707107 5.800000 0.707107
v 0.923880 5.800000 0.382684
v 1.000000 5.800000 -0.000000
v 0.923879 5.800000 -0.382684
v 0.707107 5.800000 -0.707107
v 0.382683 5.800000 -0.923880
v 0.600000 1.900000 1.100000
v 0.600000 1.900000 0.500000
v -0.600000 1.900000 0.500000
v -0.600000 1.900000 1.100000
v 0.600000 1.100000 1.100000
v 0.600000 1.100000 0.500000
v -0.600000 1.100000 0.500000
v -0.600000 1.100000 1.100000
v 0.000000 6.000000 0.000000
vt 0.617150 0.518932
vt 0.579584 0.518932
vt 0.579586 0.037535
vt 0.542018 0.518932
vt 0.542019 0.037534
vt 0.504451 0.518932
vt 0.504453 0.037534
vt 0.466885 0.518932
vt 0.466886 0.037534
vt 0.429318 0.518932
vt 0.429320 0.037534
vt 0.391752 0.518932
vt 0.391753 0.037534
vt 0.354185 0.518931
vt 0.354186 0.037534
vt 0.316619 0.518931
vt 0.316620 0.037534
vt 0.279052 0.518931
vt 0.279053 0.037534
vt 0.241486 0.518931
vt 0.241486 0.037534
vt 0.203920 0.518931
vt 0.203920 0.037534
vt 0.166353 0.518931
vt 0.166353 0.037533
vt 0.128787 0.518931
vt 0.128787 0.037533
vt 0.091220 0.518931
vt 0.091220 0.037533
vt 0.314740 0.577466
vt 0.280931 0.577466
vt 0.053654 0.518931
vt 0.016087 0.518931
vt 0.016087 0.037534
vt 0.053653 0.037533
vt 0.782454 0.173122
vt 0.662264 0.149215
vt 0.686172 0.029025
vt 0.427441 0.016087
vt 0.465008 0.016087
vt 0.468765 0.016087
vt 0.502575 0.016087
vt 0.506331 0.016087
vt 0.540141 0.016088
vt 0.543898 0.016088
vt 0.577708 0.016088
vt 0.581464 0.016088
vt 0.615274 0.016088
vt 0.617153 0.037535
vt 0.017965 0.016087
vt 0.051775 0.016087
vt 0.055532 0.016087
vt 0.089342 0.016087
vt 0.093098 0.016087
vt 0.126908 0.016087
vt 0.130665 0.016087
vt 0.164475 0.016087
vt 0.202042 0.016087
vt 0.239608 0.016087
vt 0.277175 0.016087
vt 0.314741 0.016087
vt 0.352308 0.016087
vt 0.389875 0.016087
vt 0.352307 0.577466
vt 0.318497 0.577466
vt 0.389873 0.577466
vt 0.427440 0.577466
vt 0.393630 0.577466
vt 0.465006 0.577466
vt 0.502573 0.577466
vt 0.468763 0.577466
vt 0.540139 0.577466
vt 0.577706 0.577467
vt 0.543896 0.577467
vt 0.615272 0.577467
vt 0.581462 0.577467
vt 0.051776 0.577466
vt 0.017966 0.577466
vt 0.089342 0.577466
vt 0.055532 0.577466
vt 0.126908 0.577466
vt 0.093099 0.577466
vt 0.164475 0.577466
vt 0.130665 0.577466
vt 0.202041 0.577466
vt 0.168231 0.577466
vt 0.239608 0.577466
vt 0.277174 0.577466
vt 0.116571 0.796777
vt 0.106943 0.796777
vt 0.114272 0.759932
vt 0.123167 0.763617
vt 0.135143 0.728697
vt 0.170063 0.716721
vt 0.141951 0.735505
vt 0.166378 0.707826
vt 0.203223 0.700497
vt 0.203223 0.710125
vt 0.240068 0.707826
vt 0.236383 0.716721
vt 0.271303 0.728697
vt 0.264495 0.735505
vt 0.292174 0.759932
vt 0.283279 0.763617
vt 0.299503 0.796777
vt 0.289875 0.796777
vt 0.292174 0.833621
vt 0.264495 0.858049
vt 0.283279 0.829937
vt 0.271303 0.864857
vt 0.240068 0.885728
vt 0.203223 0.883429
vt 0.236383 0.876833
vt 0.203223 0.893056
vt 0.166379 0.885728
vt 0.123167 0.829937
vt 0.114272 0.833621
vt 0.141951 0.858049
vt 0.135143 0.864857
vt 0.170063 0.876833
vt 0.595837 0.802200
vt 0.480301 0.802200
vt 0.480301 0.744432
vt 0.240447 0.983913
vt 0.165999 0.983913
vt 0.097219 0.955423
vt 0.044577 0.902781
vt 0.016087 0.834001
vt 0.016087 0.759553
vt 0.044576 0.690772
vt 0.097219 0.638130
vt 0.165999 0.609640
vt 0.480301 0.609640
vt 0.595836 0.609640
vt 0.595836 0.667408
vt 0.480301 0.667408
vt 0.595837 0.744432
vt 0.653604 0.667408
vt 0.422533 0.744432
vt 0.422533 0.667408
vt 0.390360 0.834001
vt 0.361870 0.902781
vt 0.390360 0.759553
vt 0.361870 0.690772
vt 0.309227 0.638130
vt 0.309227 0.955423
vt 0.240447 0.609640
vt 0.717408 0.016087
vt 0.751218 0.016087
vt 0.782454 0.029025
vt 0.806361 0.052932
vt 0.819300 0.084168
vt 0.819300 0.117978
vt 0.806361 0.149215
vt 0.751218 0.186060
vt 0.717408 0.186060
vt 0.686172 0.173122
vt 0.649326 0.117978
vt 0.649326 0.084168
vt 0.662264 0.052932
vt 0.393631 0.016087
vt 0.431198 0.016087
vt 0.168232 0.016087
vt 0.205798 0.016087
vt 0.243365 0.016087
vt 0.280931 0.016087
vt 0.318498 0.016087
vt 0.356065 0.016087
vt 0.356064 0.577466
vt 0.431196 0.577466
vt 0.506329 0.577466
vt 0.205798 0.577466
vt 0.243364 0.577466
vt 0.653604 0.744432
vn 0.195100 0.000000 -0.980800
vn 0.555600 0.000000 -0.831500
vn 0.831500 0.000000 -0.555600
vn 0.980800 0.000000 -0.195100
vn 0.980800 0.000000 0.195100
vn 0.831500 0.000000 0.555600
vn 0.555600 0.000000 0.831500
vn 0.195100 0.000000 0.980800
vn -0.195100 0.000000 0.980800
vn -0.555600 0.000000 0.831500
vn -0.831500 0.000000 0.555600
vn -0.980800 0.000000 0.195100
vn -0.980800 0.000000 -0.195100
vn -0.831500 0.000000 -0.555600
vn -0.192500 0.161300 0.967900
vn -0.195100 0.000000 -0.980800
vn -0.555600 0.000000 -0.831500
vn 0.000000 -1.000000 0.000000
vn 0.746500 -0.440300 0.498800
vn 0.880600 -0.440300 0.175200
vn 0.880600 -0.440300 -0.175200
vn 0.746500 -0.440300 -0.498800
vn 0.498800 -0.440300 -0.746500
vn 0.175200 -0.440300 -0.880600
vn -0.175200 -0.440300 -0.880600
vn -0.498800 -0.440300 -0.746500
vn -0.746500 -0.440300 -0.498800
vn -0.880600 -0.440300 -0.175200
vn -0.880600 -0.440300 0.175200
vn -0.746500 -0.440300 0.498800
vn -0.498800 -0.440300 0.746500
vn -0.175200 -0.440300 0.880600
vn 0.175200 -0.440300 0.880600
vn 0.498800 -0.440300 0.746500
vn 0.192500 0.161300 0.967900
vn 0.548300 0.161300 0.820600
vn 0.820600 0.161300 0.548300
vn 0.967900 0.161300 0.192500
vn 0.967900 0.161300 -0.192500
vn 0.820600 0.161300 -0.548300
vn 0.548300 0.161300 -0.820600
vn 0.192500 0.161300 -0.967900
vn -0.192500 0.161300 -0.967900
vn -0.548300 0.161300 -0.820600
vn -0.820600 0.161300 -0.548300
vn -0.967900 0.161300 -0.192500
vn -0.967900 0.161300 0.192500
vn -0.820600 0.161300 0.548300
vn -0.548300 0.161300 0.820600
vn 0.000000 1.000000 0.000000
vn 0.039000 0.979800 0.196000
vn -0.039000 0.979800 0.196000
vn -0.111000 0.979800 0.166100
vn -0.166100 0.979800 0.111000
vn -0.196000 0.979800 0.039000
vn -0.196000 0.979800 -0.039000
vn -0.166100 0.979800 -0.111000
vn -0.111000 0.979800 -0.166100
vn -0.039000 0.979800 -0.196000
vn 0.000000 0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.196000 0.979800 0.039000
vn 0.166100 0.979800 0.111000
vn 0.196000 0.979800 -0.039000
vn 0.166100 0.979800 -0.111000
vn 0.111000 0.979800 -0.166100
vn 0.111000 0.979800 0.166100
vn 0.039000 0.979800 -0.196000
s off
f 18/1/1 20/2/1 19/3/1
f 20/2/2 22/4/2 21/5/2
f 22/4/3 24/6/3 23/7/3
f 24/6/4 26/8/4 25/9/4
f 26/8/5 28/10/5 27/11/5
f 28/10/6 30/12/6 29/13/6
f 30/12/7 32/14/7 31/15/7
f 32/14/8 34/16/8 33/17/8
f 34/16/9 36/18/9 35/19/9
f 36/18/10 38/20/10 37/21/10
f 38/20/11 40/22/11 39/23/11
f 40/22/12 42/24/12 41/25/12
f 42/24/13 44/26/13 43/27/13
f 44/26/14 46/28/14 45/29/14
f 34/16/15 57/30/15 56/31/15
f 48/32/16 18/33/16 17/34/16
f 46/28/17 48/32/17 47/35/17
f 11/36/18 7/37/18 3/38/18
f 12/39/19 27/11/19 29/13/19
f 13/40/20 25/9/20 27/11/20
f 13/41/21 14/42/21 23/7/21
f 14/43/22 15/44/22 21/5/22
f 15/45/23 16/46/23 19/3/23
f 16/47/24 1/48/24 17/49/24
f 1/50/25 2/51/25 47/35/25
f 2/52/26 3/53/26 45/29/26
f 3/54/27 4/55/27 43/27/27
f 4/56/28 5/57/28 41/25/28
f 6/58/29 39/23/29 41/25/29
f 7/59/30 37/21/30 39/23/30
f 8/60/31 35/19/31 37/21/31
f 9/61/32 33/17/32 35/19/32
f 10/62/33 31/15/33 33/17/33
f 11/63/34 29/13/34 31/15/34
f 32/14/35 58/64/35 57/65/35
f 32/14/36 30/12/36 59/66/36
f 28/10/37 60/67/37 59/68/37
f 28/10/38 26/8/38 61/69/38
f 24/6/39 62/70/39 61/71/39
f 24/6/40 22/4/40 63/72/40
f 20/2/41 64/73/41 63/74/41
f 18/1/42 49/75/42 64/76/42
f 48/32/43 50/77/43 49/78/43
f 46/28/44 51/79/44 50/80/44
f 44/26/45 52/81/45 51/82/45
f 42/24/46 53/83/46 52/84/46
f 40/22/47 54/85/47 53/86/47
f 40/22/48 38/20/48 55/87/48
f 38/20/49 36/18/49 56/88/49
f 53/89/18 69/90/18 68/91/18
f 52/92/18 68/91/18 67/93/18
f 50/94/18 51/95/18 67/93/18
f 50/94/18 66/96/18 65/97/18
f 49/98/18 65/97/18 80/99/18
f 64/100/18 80/99/18 79/101/18
f 63/102/18 79/101/18 78/103/18
f 62/104/18 78/103/18 77/105/18
f 61/106/18 77/105/18 76/107/18
f 59/108/18 60/109/18 76/107/18
f 59/108/18 75/110/18 74/111/18
f 57/112/18 58/113/18 74/111/18
f 57/112/18 73/114/18 72/115/18
f 53/89/18 54/116/18 70/117/18
f 55/118/18 71/119/18 70/117/18
f 56/120/18 72/115/18 71/119/18
f 82/121/50 83/122/50 84/123/50
f 73/114/51 74/111/51 89/124/51
f 72/115/52 73/114/52 89/125/52
f 71/119/53 72/115/53 89/126/53
f 70/117/54 71/119/54 89/127/54
f 69/90/55 70/117/55 89/128/55
f 68/91/56 69/90/56 89/129/56
f 67/93/57 68/91/57 89/130/57
f 66/96/58 67/93/58 89/131/58
f 65/97/59 66/96/59 89/132/59
f 87/133/18 86/134/18 85/135/18
f 84/123/60 88/136/60 85/135/60
f 81/137/61 85/135/61 86/138/61
f 83/139/62 87/140/62 88/136/62
f 76/107/63 77/105/63 89/141/63
f 75/110/64 76/107/64 89/142/64
f 77/105/65 78/103/65 89/143/65
f 78/103/66 79/101/66 89/144/66
f 80/99/67 89/145/67 79/101/67
f 74/111/68 75/110/68 89/146/68
f 80/99/69 65/97/69 89/147/69
f 17/49/1 18/1/1 19/3/1
f 19/3/2 20/2/2 21/5/2
f 21/5/3 22/4/3 23/7/3
f 23/7/4 24/6/4 25/9/4
f 25/9/5 26/8/5 27/11/5
f 27/11/6 28/10/6 29/13/6
f 29/13/7 30/12/7 31/15/7
f 31/15/8 32/14/8 33/17/8
f 33/17/9 34/16/9 35/19/9
f 35/19/10 36/18/10 37/21/10
f 37/21/11 38/20/11 39/23/11
f 39/23/12 40/22/12 41/25/12
f 41/25/13 42/24/13 43/27/13
f 43/27/14 44/26/14 45/29/14
f 36/18/15 34/16/15 56/31/15
f 47/35/16 48/32/16 17/34/16
f 45/29/17 46/28/17 47/35/17
f 3/38/18 2/148/18 1/149/18
f 1/149/18 16/150/18 15/151/18
f 15/151/18 14/152/18 13/153/18
f 13/153/18 12/154/18 11/36/18
f 11/36/18 10/155/18 9/156/18
f 9/156/18 8/157/18 7/37/18
f 7/37/18 6/158/18 5/159/18
f 5/159/18 4/160/18 3/38/18
f 3/38/18 1/149/18 15/151/18
f 15/151/18 13/153/18 3/38/18
f 11/36/18 9/156/18 7/37/18
f 7/37/18 5/159/18 3/38/18
f 3/38/18 13/153/18 11/36/18
f 11/161/19 12/39/19 29/13/19
f 12/162/20 13/40/20 27/11/20
f 25/9/21 13/41/21 23/7/21
f 23/7/22 14/43/22 21/5/22
f 21/5/23 15/45/23 19/3/23
f 19/3/24 16/47/24 17/49/24
f 17/34/25 1/50/25 47/35/25
f 47/35/26 2/52/26 45/29/26
f 45/29/27 3/54/27 43/27/27
f 43/27/28 4/56/28 41/25/28
f 5/163/29 6/58/29 41/25/29
f 6/164/30 7/59/30 39/23/30
f 7/165/31 8/60/31 37/21/31
f 8/166/32 9/61/32 35/19/32
f 9/167/33 10/62/33 33/17/33
f 10/168/34 11/63/34 31/15/34
f 34/16/35 32/14/35 57/65/35
f 58/169/36 32/14/36 59/66/36
f 30/12/37 28/10/37 59/68/37
f 60/170/38 28/10/38 61/69/38
f 26/8/39 24/6/39 61/71/39
f 62/171/40 24/6/40 63/72/40
f 22/4/41 20/2/41 63/74/41
f 20/2/42 18/1/42 64/76/42
f 18/33/43 48/32/43 49/78/43
f 48/32/44 46/28/44 50/80/44
f 46/28/45 44/26/45 51/82/45
f 44/26/46 42/24/46 52/84/46
f 42/24/47 40/22/47 53/86/47
f 54/172/48 40/22/48 55/87/48
f 55/173/49 38/20/49 56/88/49
f 52/92/18 53/89/18 68/91/18
f 51/95/18 52/92/18 67/93/18
f 66/96/18 50/94/18 67/93/18
f 49/98/18 50/94/18 65/97/18
f 64/100/18 49/98/18 80/99/18
f 63/102/18 64/100/18 79/101/18
f 62/104/18 63/102/18 78/103/18
f 61/106/18 62/104/18 77/105/18
f 60/109/18 61/106/18 76/107/18
f 75/110/18 59/108/18 76/107/18
f 58/113/18 59/108/18 74/111/18
f 73/114/18 57/112/18 74/111/18
f 56/120/18 57/112/18 72/115/18
f 69/90/18 53/89/18 70/117/18
f 54/116/18 55/118/18 70/117/18
f 55/118/18 56/120/18 71/119/18
f 81/137/50 82/121/50 84/123/50
f 88/136/18 87/133/18 85/135/18
f 81/137/60 84/123/60 85/135/60
f 82/174/61 81/137/61 86/138/61
f 84/123/62 83/139/62 88/136/62

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB