Fix frame model generation crash

This commit is contained in:
MrTJP committed 2015-06-30 14:27:00 -04:00
1 parent e5d3aa0561
commit 40c8b78ee5
5 files changed
+18 -55

No files matched your search

+10
View File
@@ -0,0 +1,10 @@
/*
* Copyright (c) 2015.
* Created by MrTJP.
* All rights reserved.
*/
//@API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = "@VERSION@.@BUILD_NUMBER@")
package mrtjp.mcframes.api;
import cpw.mods.fml.common.API;
+3 -5
View File
@@ -102,11 +102,8 @@ object RenderFrame extends ISimpleBlockRenderingHandler
"/assets/mcframes/obj/"+name+".obj").openStream(),
7, InvertX).values())
m.shrinkUVs(0.0005)
m.apply(new Scale(1.00075, 1.00075, 1.00075))
m.apply(new Translation(Vector3.center))
m.computeNormals
m.computeLighting(LightModel.standardLightModel)
m
}
@@ -168,7 +165,7 @@ object RenderFrame extends ISimpleBlockRenderingHandler
var m = models(mask&0x3F)
if (m == null)
{
m = combine(Seq(model, FrameModelGen.generate(mask)))
m = FrameModelGen.generate(model, mask)
models(mask&0x3F) = m
}
m
@@ -183,7 +180,7 @@ object FrameModelGen
val u = 0.5
val v = 0.5
def generate(mask:Int) =
def generate(box:CCModel, mask:Int) =
{
var m = generateSinglePeg
m = generateQuartRotated(m)
@@ -191,6 +188,7 @@ object FrameModelGen
m = generateBackface(m)
var b = Seq.newBuilder[CCModel]
b += box
for (s <- 0 until 6) if ((mask&1<<s) == 0)
b += generateSided(m.copy, s)
+1 -1
View File
@@ -4,7 +4,7 @@
* All rights reserved.
*/
@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = "0.0.1a")
@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = "@VERSION@.@BUILD_NUMBER@")
package mrtjp.relocation.api;
import cpw.mods.fml.common.API;