thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

redo dif building and handle custom stuff

Browse source
This commit is contained in:
RandomityGuy 2023-05-26 14:34:15 +05:30
parent 8b28d74e04
commit e36f4e824a
5 changed files with 143 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/DifBuilder.hx
View file

@ -305,7 +305,6 @@ class DifBuilder {
difresource.acquire();
var dif = difresource.resource;
var geo = so == -1 ? dif.interiors[0] : dif.subObjects[so];
var hulls = geo.convexHulls;
var triangles = [];
var textures = [];
var collider = new CollisionEntity(itr);
@ -323,11 +322,8 @@ class DifBuilder {
var vertexBuckets = new Map<Point3F, Array<VertexBucket>>();
var edges = [];
var colliderSurfaces = [];
for (i in 0...hulls.length) {
var hullTris = [];
var hull = hulls[i];
for (j in hull.surfaceStart...(hull.surfaceStart + hull.surfaceCount)) {
var surfaceindex = geo.hullSurfaceIndices[j];
for (i in 0...geo.surfaces.length) {
var surfaceindex = i;
var surface = geo.surfaces[surfaceindex];
if (surface == null)
continue;
@ -412,7 +408,6 @@ class DifBuilder {
tri.uv2 = uv2;
tri.uv3 = uv3;
triangles.push(tri);
hullTris.push(tri);
var materialName = stripTexName(texture).toLowerCase();
var hasMaterialInfo = materialDict.exists(materialName);
if (hasMaterialInfo) {
@ -462,7 +457,6 @@ class DifBuilder {
collider.addSurface(colliderSurface);
colliderSurfaces.push(colliderSurface);
}
}
var edgeMap:Map<Int, TriangleEdge> = new Map();
var internalEdges:Map<Int, Bool> = new Map();
var difEdges:Map<Int, Edge> = [];

2
src/MarbleGame.hx
View file

@ -259,7 +259,7 @@ class MarbleGame {
canvas.setContent(new MainMenuGui());
#end
} else {
if (!world.mission.isClaMission) {
if (!world.mission.isClaMission && !world.mission.isCustom) {
PlayMissionGui.currentCategoryStatic = world.mission.type;
}
var pmg = new PlayMissionGui();

1
src/Mission.hx
View file

@ -39,6 +39,7 @@ class Mission {
public var isClaMission:Bool;
public var game:String;
public var hasEgg:Bool;
public var isCustom:Bool;
var next:Mission;

7
src/MissionList.hx
View file

@ -35,7 +35,14 @@ class MissionList {
var misParser = new MisParser(file.getText());
var mInfo = misParser.parseMissionInfo();
var mission = Mission.fromMissionInfo(file.path, mInfo);
if (game != "custom")
mission.game = game;
else if (mInfo.game != null && mInfo.game != "")
mission.game = mInfo.game.toLowerCase();
else
mission.game = game; // Last case scenario
if (game == "custom")
mission.isCustom = true;
// do egg thing
if (StringTools.contains(file.getText().toLowerCase(), 'datablock = "easteregg"')) { // Ew
mission.hasEgg = true;

1
src/mis/MissionElement.hx
View file

@ -57,6 +57,7 @@ class MissionElementScriptObject extends MissionElementBase {
var ultimatetime:String;
var music:String;
var alarmstarttime:String;
var game:String;
public function new() {
_type = MissionElementType.ScriptObject;