thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-26 12:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix tornado rendering finally

Browse source
This commit is contained in:
RandomityGuy 2022-08-14 21:48:04 +05:30
parent 049fe44d81
commit b2cd2d63a3
5 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/DtsObject.hx
View file

@ -815,9 +815,9 @@ class DtsObject extends GameObject {
if (pos >= prim.points.length) { if (pos >= prim.points.length) {
meshIndex++; meshIndex++;
if (prim.buffer != null) { if (prim.buffer != null) {
prim.addNormals(); // prim.addNormals();
for (norm in prim.normals) // for (norm in prim.normals)
norm = norm.multiply(-1); // norm = norm.multiply(-1);
prim.flush(); prim.flush();
} }
mesh.primitive = prim; mesh.primitive = prim;
@ -831,7 +831,7 @@ class DtsObject extends GameObject {
var vertex = info.vertices[i]; var vertex = info.vertices[i];
var normal = info.normals[i]; var normal = info.normals[i];
prim.points[pos] = vertex.toPoint(); prim.points[pos] = vertex.toPoint();
prim.normals[pos] = normal.toPoint().normalized(); prim.normals[pos] = normal.toPoint(); // .normalized();
if (prim.buffer != null) { if (prim.buffer != null) {
prim.dirtyFlags[pos] = true; prim.dirtyFlags[pos] = true;
} }

4
src/InstanceManager.hx
View file

@ -111,12 +111,12 @@ class InstanceManager {
if (dtsshader != null) { if (dtsshader != null) {
minfo.meshbatch.material.mainPass.removeShader(minfo.meshbatch.material.textureShader); minfo.meshbatch.material.mainPass.removeShader(minfo.meshbatch.material.textureShader);
minfo.meshbatch.material.mainPass.addShader(dtsshader); minfo.meshbatch.material.mainPass.addShader(dtsshader);
minfo.meshbatch.material.mainPass.culling = mat.mainPass.culling; // minfo.meshbatch.material.mainPass.culling = mat.mainPass.culling;
} }
minfo.transparencymeshbatch = new MeshBatch(cast(cast(obj, Mesh).primitive), cast(cast(obj, Mesh)).material.clone(), scene); minfo.transparencymeshbatch = new MeshBatch(cast(cast(obj, Mesh).primitive), cast(cast(obj, Mesh)).material.clone(), scene);
minfo.transparencymeshbatch.material.mainPass.removeShader(minfo.meshbatch.material.textureShader); minfo.transparencymeshbatch.material.mainPass.removeShader(minfo.meshbatch.material.textureShader);
minfo.transparencymeshbatch.material.mainPass.addShader(dtsshader); minfo.transparencymeshbatch.material.mainPass.addShader(dtsshader);
minfo.transparencymeshbatch.material.mainPass.culling = mat.mainPass.culling; // minfo.transparencymeshbatch.material.mainPass.culling = mat.mainPass.culling;
// minfo.meshbatch.material.mainPass.removeShader(minfo.meshbatch.material.mainPass.getShader(PropsValues)); // minfo.meshbatch.material.mainPass.removeShader(minfo.meshbatch.material.mainPass.getShader(PropsValues));
// minfo.transparencymeshbatch.material.mainPass.removeShader(minfo.transparencymeshbatch.material.mainPass.getShader(PropsValues)); // minfo.transparencymeshbatch.material.mainPass.removeShader(minfo.transparencymeshbatch.material.mainPass.getShader(PropsValues));

2
src/collision/Grid.hx
View file

@ -9,7 +9,7 @@ class Grid {
public var cellSize:Vector; // The dimensions of one cell public var cellSize:Vector; // The dimensions of one cell
public static var CELL_DIV = new Vector(16, 16, 16); // split the bounds into cells of dimensions 1/16th of the corresponding dimensions of the bounds public static var CELL_DIV = new Vector(12, 12, 12); // split the bounds into cells of dimensions 1/16th of the corresponding dimensions of the bounds
var map:Map<Int, Array<Int>> = new Map(); var map:Map<Int, Array<Int>> = new Map();

6
src/shaders/DtsTexture.hx
View file

@ -4,6 +4,10 @@ class DtsTexture extends hxsl.Shader {
static var SRC = { static var SRC = {
@input var input:{ @input var input:{
var uv:Vec2; var uv:Vec2;
var normal:Vec3;
};
@global var global:{
@perObject var modelView:Mat4;
}; };
@const var additive:Bool; @const var additive:Bool;
@const var killAlpha:Bool; @const var killAlpha:Bool;
@ -14,8 +18,10 @@ class DtsTexture extends hxsl.Shader {
var calculatedUV:Vec2; var calculatedUV:Vec2;
var pixelColor:Vec4; var pixelColor:Vec4;
var specColor:Vec3; var specColor:Vec3;
var transformedNormal:Vec3;
function vertex() { function vertex() {
calculatedUV = input.uv; calculatedUV = input.uv;
transformedNormal = (input.normal * global.modelView.mat3());
} }
function fragment() { function fragment() {
var c = texture.get(calculatedUV); var c = texture.get(calculatedUV);

4
src/shapes/Tornado.hx
View file

@ -49,8 +49,8 @@ class Tornado extends ForceObject {
this.soundChannel = AudioManager.playSound(ResourceLoader.getResource("data/sound/tornado.wav", ResourceLoader.getAudio, this.soundResources), this.soundChannel = AudioManager.playSound(ResourceLoader.getResource("data/sound/tornado.wav", ResourceLoader.getAudio, this.soundResources),
new Vector(1e8, 1e8, 1e8), true); new Vector(1e8, 1e8, 1e8), true);
for (material in this.materials) { for (material in this.materials) {
// material.blendMode = Alpha; material.blendMode = Alpha;
material.mainPass.culling = h3d.mat.Data.Face.None; // material.mainPass.culling = h3d.mat.Data.Face.None;
} }
} }