Skip to content

Commit a397f4b

Browse files
FexcraftFexcraft
committed
Returned to use FCL's TMT
1 parent 51a5389 commit a397f4b

27 files changed

+30
-2386
lines changed

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ targetCompatibility = 1.8
2929
compileJava.options.encoding = 'UTF-8'
3030

3131
//@formatter:off
32-
def log4j_version = '2.3'
32+
def log4j_version = '2.5'
3333
def commons_version = '3.4'
3434
def commons_collections = '4.1'
3535
def guava_version = '19.0'
@@ -106,7 +106,7 @@ dependencies {
106106
runtime group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: lwjgl_version, changing: true, classifier: 'natives-linux'
107107
runtime group: 'org.lwjgl', name: 'lwjgl-tinyfd', version: lwjgl_version, changing: true, classifier: 'natives-macos'
108108

109-
runtime files('libs/discord-rpc.jar', 'libs/FCL-1.XII.52.jar', 'libs/VOXtoFMT-1.jar')
109+
runtime files('libs/discord-rpc.jar', 'libs/VOXtoFMT-1.jar')
110110
//@formatter:on
111111
testCompile group: 'junit', name: 'junit', version: '4.11'
112112
}

‎localrepos

Whitespace-only changes.

‎src/net/fexcraft/app/fmt/FMTB.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@
8080
import net.fexcraft.app.fmt.wrappers.GroupCompound;
8181
import net.fexcraft.app.fmt.wrappers.TurboList;
8282
import net.fexcraft.lib.common.Static;
83+
import net.fexcraft.lib.common.math.AxisRotator;
8384
import net.fexcraft.lib.common.math.RGB;
8485
import net.fexcraft.lib.common.math.Time;
8586
import net.fexcraft.lib.common.utils.HttpUtil;
86-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
87+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
8788

8889
/**
8990
* @author Ferdinand Calo' (FEX___96)
@@ -169,6 +170,7 @@ public void run() throws InterruptedException, IOException, NoSuchMethodExceptio
169170
ggr = new GGR(0, 4, 4);
170171
ggr.rotation.xCoord = 45;
171172
//
173+
AxisRotator.setDefImpl(Axis3DL.class);
172174
NO_POLYGON_SELECTED = Translator.translate("error.no_polygon_selected");
173175
NO_PREVIEW_SELECTED = Translator.translate("error.no_preview_selected");
174176
Settings.THEME_CHANGE_LISTENER.add(bool -> {

‎src/net/fexcraft/app/fmt/demo/ModelSteve.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.lwjgl.opengl.GL11;
44

5-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
5+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
66

77
public class ModelSteve {
88

‎src/net/fexcraft/app/fmt/demo/ModelT1P.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import net.fexcraft.lib.common.Static;
44
import net.fexcraft.lib.common.math.RGB;
5-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
65
import net.fexcraft.lib.tmt.ModelBase;
6+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
77

88

99
/**
@@ -1236,7 +1236,7 @@ public void render(){
12361236
} bodyLines.render();*/
12371237
}
12381238

1239-
private void render(ModelRendererTurbo[] model){
1239+
public void render(ModelRendererTurbo[] model){
12401240
for(ModelRendererTurbo turbo : model) turbo.render();
12411241
}
12421242

‎src/net/fexcraft/app/fmt/porters/DFMExporter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.fexcraft.app.fmt.wrappers.TurboList;
2424
import net.fexcraft.lib.common.math.TexturedPolygon;
2525
import net.fexcraft.lib.common.math.TexturedVertex;
26-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
26+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
2727

2828
/**
2929
*

‎src/net/fexcraft/app/fmt/porters/MTBImporter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import net.fexcraft.app.fmt.wrappers.TurboList;
2929
import net.fexcraft.lib.common.math.Vec3f;
3030
import net.fexcraft.lib.common.utils.ZipUtil;
31-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
31+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
3232

3333
/**
3434
* @author EternalBlueFlame, FEX___96

‎src/net/fexcraft/app/fmt/utils/Axis3DL.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import org.joml.Matrix4f;
44
import org.joml.Vector3f;
55

6+
import net.fexcraft.lib.common.math.AxisRotator;
67
import net.fexcraft.lib.common.math.Vec3f;
78

89
/** Taken from FVTM and adjusted/shortened. "Lite" Version. */
9-
public class Axis3DL {
10+
public class Axis3DL implements AxisRotator {
1011

1112
private Matrix4f matrix;
1213
private float yaw, pitch, roll;

‎src/net/fexcraft/app/fmt/wrappers/BBWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import net.fexcraft.app.fmt.utils.texture.TextureManager;
66
import net.fexcraft.lib.common.math.Vec3f;
7-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
7+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
88

99
/**
1010
* Bounding Box Wrapper

‎src/net/fexcraft/app/fmt/wrappers/BoxWrapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.gson.JsonObject;
55

66
import net.fexcraft.lib.common.math.Vec3f;
7-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
7+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
88

99
public class BoxWrapper extends PolygonWrapper {
1010

@@ -17,7 +17,7 @@ public BoxWrapper(GroupCompound compound){
1717

1818
protected ModelRendererTurbo newMRT(){
1919
return new ModelRendererTurbo(null, textureX, textureY, compound.tx(getTurboList()), compound.ty(getTurboList()))
20-
.addBox(off.xCoord, off.yCoord, off.zCoord, size.xCoord, size.yCoord, size.zCoord, 0, 1f, sides)
20+
.addBox(off.xCoord, off.yCoord, off.zCoord, size.xCoord, size.yCoord, size.zCoord, 0f, 1f, sides)
2121
.setRotationPoint(pos.xCoord, pos.yCoord, pos.zCoord)
2222
.setRotationAngle(rot.xCoord, rot.yCoord, rot.zCoord);
2323
}

‎src/net/fexcraft/app/fmt/wrappers/CylinderWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import net.fexcraft.app.fmt.ui.editor.GeneralEditor;
77
import net.fexcraft.lib.common.math.Vec3f;
8-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
8+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
99

1010
public class CylinderWrapper extends PolygonWrapper {
1111

‎src/net/fexcraft/app/fmt/wrappers/FlexTrapezoidWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.gson.JsonObject;
44

55
import net.fexcraft.lib.common.math.Vec3f;
6-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
6+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
77

88
public class FlexTrapezoidWrapper extends BoxWrapper {
99

‎src/net/fexcraft/app/fmt/wrappers/FlexboxWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.gson.JsonObject;
44

55
import net.fexcraft.lib.common.math.Vec3f;
6-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
6+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
77

88
public class FlexboxWrapper extends BoxWrapper {
99

‎src/net/fexcraft/app/fmt/wrappers/MarkerWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import net.fexcraft.app.fmt.utils.texture.TextureManager;
1010
import net.fexcraft.lib.common.Static;
1111
import net.fexcraft.lib.common.math.RGB;
12-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
12+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
1313

1414
public class MarkerWrapper extends PolygonWrapper {
1515

‎src/net/fexcraft/app/fmt/wrappers/ObjPreviewWrapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.gson.JsonObject;
99

1010
import net.fexcraft.lib.common.utils.WavefrontObjUtil;
11-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
11+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
1212

1313
public class ObjPreviewWrapper extends PolygonWrapper {
1414

@@ -29,7 +29,7 @@ protected PolygonWrapper createClone(GroupCompound compound){
2929

3030
protected ModelRendererTurbo newMRT(){
3131
try{
32-
String str[][] = WavefrontObjUtil.findValues(new FileInputStream(source), "# FlipAxes:");
32+
String str[][] = WavefrontObjUtil.findValues(new FileInputStream(source), null, "# FlipAxes:");
3333
boolean bool = str.length == 0 ? false : Boolean.parseBoolean(str[0][0]);
3434
return new ModelRendererTurbo(null, textureX, textureY, compound.tx(getTurboList()), compound.ty(getTurboList()))
3535
.setRotationPoint(pos.xCoord, pos.yCoord, pos.zCoord)

‎src/net/fexcraft/app/fmt/wrappers/PolygonWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import net.fexcraft.app.fmt.utils.texture.TextureGroup;
1616
import net.fexcraft.lib.common.math.RGB;
1717
import net.fexcraft.lib.common.math.Vec3f;
18-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
18+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
1919

2020
public abstract class PolygonWrapper {
2121

‎src/net/fexcraft/app/fmt/wrappers/QuadWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.gson.JsonObject;
44

55
import net.fexcraft.lib.common.math.Vec3f;
6-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
6+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
77

88
public class QuadWrapper extends BoxWrapper {
99

‎src/net/fexcraft/app/fmt/wrappers/ShapeQuadWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.fexcraft.app.fmt.utils.Settings;
88
import net.fexcraft.lib.common.math.RGB;
99
import net.fexcraft.lib.common.math.Vec3f;
10-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
10+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
1111

1212
public class ShapeQuadWrapper extends QuadWrapper {
1313

‎src/net/fexcraft/app/fmt/wrappers/ShapeboxWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.fexcraft.app.fmt.utils.Settings;
99
import net.fexcraft.lib.common.math.RGB;
1010
import net.fexcraft.lib.common.math.Vec3f;
11-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
11+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
1212

1313
public class ShapeboxWrapper extends BoxWrapper {
1414

‎src/net/fexcraft/app/fmt/wrappers/TexrectWrapperB.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.gson.JsonObject;
55

66
import net.fexcraft.lib.common.math.Vec3f;
7-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
7+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
88

99
public class TexrectWrapperB extends ShapeboxWrapper {
1010

‎src/net/fexcraft/app/fmt/wrappers/TrapezoidWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.gson.JsonObject;
44

55
import net.fexcraft.lib.common.math.Vec3f;
6-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
6+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
77

88
public class TrapezoidWrapper extends BoxWrapper {
99

‎src/net/fexcraft/app/fmt/wrappers/VoxelWrapper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import com.google.gson.JsonObject;
99

1010
import net.fexcraft.lib.common.math.RGB;
11-
import net.fexcraft.lib.local_tmt.ColorIndexedVoxelBuilder;
12-
import net.fexcraft.lib.local_tmt.ModelRendererTurbo;
13-
import net.fexcraft.lib.local_tmt.VoxelBuilder;
11+
import net.fexcraft.lib.tmt.ColorIndexedVoxelBuilder;
12+
import net.fexcraft.lib.tmt.ModelRendererTurbo;
13+
import net.fexcraft.lib.tmt.VoxelBuilder;
1414

1515
public class VoxelWrapper extends PolygonWrapper {
1616

‎src/net/fexcraft/lib/local_tmt/Coord2D.java

-30
This file was deleted.

0 commit comments

Comments
 (0)