mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
fix some texture paths
This commit is contained in:
parent
9b342f4a23
commit
e87411794c
3 changed files with 17 additions and 2 deletions
|
|
@ -173,7 +173,15 @@ class DifBuilder {
|
||||||
"mmg_ice_shadow" => {
|
"mmg_ice_shadow" => {
|
||||||
friction: 0.03,
|
friction: 0.03,
|
||||||
restitution: 0.95
|
restitution: 0.95
|
||||||
}
|
},
|
||||||
|
"friction_mp_high" => {
|
||||||
|
friction: 6,
|
||||||
|
restitution: 0.3
|
||||||
|
},
|
||||||
|
"friction_mp_high_shadow" => {
|
||||||
|
friction: 6,
|
||||||
|
restitution: 0.3
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
static function createPhongMaterial(onFinish:hxsl.Shader->Void, baseTexture:String, normalTexture:String, shininess:Float, specularColor:Vector,
|
static function createPhongMaterial(onFinish:hxsl.Shader->Void, baseTexture:String, normalTexture:String, shininess:Float, specularColor:Vector,
|
||||||
|
|
@ -268,6 +276,7 @@ class DifBuilder {
|
||||||
'interiors_mbu/wall_beginner.png' => (onFinish) -> createPhongMaterial(onFinish, 'wall_beginner.png', 'wall_mbu.normal.png', 12,
|
'interiors_mbu/wall_beginner.png' => (onFinish) -> createPhongMaterial(onFinish, 'wall_beginner.png', 'wall_mbu.normal.png', 12,
|
||||||
new Vector(0.8, 0.8, 0.6, 1)),
|
new Vector(0.8, 0.8, 0.6, 1)),
|
||||||
'interiors_mbu/edge_white.png' => (onFinish) -> createPhongMaterial(onFinish, 'edge_white.png', 'edge.normal.png', 50, new Vector(0.8, 0.8, 0.8, 1)),
|
'interiors_mbu/edge_white.png' => (onFinish) -> createPhongMaterial(onFinish, 'edge_white.png', 'edge.normal.png', 50, new Vector(0.8, 0.8, 0.8, 1)),
|
||||||
|
'interiors_mbu/edge_white.jpg' => (onFinish) -> createPhongMaterial(onFinish, 'edge_white.png', 'edge.normal.png', 50, new Vector(0.8, 0.8, 0.8, 1)),
|
||||||
'interiors_mbu/edge_white_shadow.png' => (onFinish) -> createPhongMaterial(onFinish, 'edge_white_shadow.png', 'edge.normal.png', 50,
|
'interiors_mbu/edge_white_shadow.png' => (onFinish) -> createPhongMaterial(onFinish, 'edge_white_shadow.png', 'edge.normal.png', 50,
|
||||||
new Vector(0.2, 0.2, 0.2, 0.2)),
|
new Vector(0.2, 0.2, 0.2, 0.2)),
|
||||||
'interiors_mbu/beam.png' => (onFinish) -> createPhongMaterial(onFinish, 'beam.png', 'beam.normal.png', 12, new Vector(0.8, 0.8, 0.6, 1)),
|
'interiors_mbu/beam.png' => (onFinish) -> createPhongMaterial(onFinish, 'beam.png', 'beam.normal.png', 12, new Vector(0.8, 0.8, 0.6, 1)),
|
||||||
|
|
@ -275,6 +284,8 @@ class DifBuilder {
|
||||||
new Vector(0.8, 0.8, 0.6, 1)),
|
new Vector(0.8, 0.8, 0.6, 1)),
|
||||||
'interiors_mbu/friction_low.png' => (onFinish) -> createPhongMaterial(onFinish, 'friction_low.png', 'friction_low.normal.png', 128,
|
'interiors_mbu/friction_low.png' => (onFinish) -> createPhongMaterial(onFinish, 'friction_low.png', 'friction_low.normal.png', 128,
|
||||||
new Vector(1, 1, 1, 0.8)),
|
new Vector(1, 1, 1, 0.8)),
|
||||||
|
'interiors_mbu/friction_low.jpg' => (onFinish) -> createPhongMaterial(onFinish, 'friction_low.png', 'friction_low.normal.png', 128,
|
||||||
|
new Vector(1, 1, 1, 0.8)),
|
||||||
'interiors_mbu/friction_low_shadow.png' => (onFinish) -> createPhongMaterial(onFinish, 'friction_low_shadow.png', 'friction_low.normal.png', 128,
|
'interiors_mbu/friction_low_shadow.png' => (onFinish) -> createPhongMaterial(onFinish, 'friction_low_shadow.png', 'friction_low.normal.png', 128,
|
||||||
new Vector(0.3, 0.3, 0.35, 1)),
|
new Vector(0.3, 0.3, 0.35, 1)),
|
||||||
'interiors_mbu/friction_high.png' => (onFinish) -> createPhongMaterial(onFinish, 'friction_high.png', 'friction_high.normal.png', 10,
|
'interiors_mbu/friction_high.png' => (onFinish) -> createPhongMaterial(onFinish, 'friction_high.png', 'friction_high.normal.png', 10,
|
||||||
|
|
@ -402,7 +413,7 @@ class DifBuilder {
|
||||||
tri.uv3 = uv3;
|
tri.uv3 = uv3;
|
||||||
triangles.push(tri);
|
triangles.push(tri);
|
||||||
hullTris.push(tri);
|
hullTris.push(tri);
|
||||||
var materialName = stripTexName(texture);
|
var materialName = stripTexName(texture).toLowerCase();
|
||||||
var hasMaterialInfo = materialDict.exists(materialName);
|
var hasMaterialInfo = materialDict.exists(materialName);
|
||||||
if (hasMaterialInfo) {
|
if (hasMaterialInfo) {
|
||||||
var minfo = materialDict.get(materialName);
|
var minfo = materialDict.get(materialName);
|
||||||
|
|
|
||||||
|
|
@ -214,6 +214,9 @@ class Mission {
|
||||||
if (ResourceLoader.exists(path))
|
if (ResourceLoader.exists(path))
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
path = StringTools.replace(path, "lbinteriors", "interiors"); // This shit ew
|
||||||
|
if (ResourceLoader.exists(path))
|
||||||
|
return path;
|
||||||
Console.error("Interior resource not found: " + rawElementPath);
|
Console.error("Interior resource not found: " + rawElementPath);
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -466,6 +466,7 @@ class ResourceLoader {
|
||||||
#end
|
#end
|
||||||
if (game == 'gold')
|
if (game == 'gold')
|
||||||
fname = StringTools.replace(fname, 'interiors/', 'interiors_mbg/');
|
fname = StringTools.replace(fname, 'interiors/', 'interiors_mbg/');
|
||||||
|
fname = StringTools.replace(fname, "lbinteriors", "interiors"); // Normalize
|
||||||
if (exists(fname))
|
if (exists(fname))
|
||||||
continue;
|
continue;
|
||||||
Console.log("Loaded zip entry: " + fname);
|
Console.log("Loaded zip entry: " + fname);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue