Move cube model generation to test utils.

This commit is contained in:
Viktor Kovacs 2021-05-15 12:52:55 +02:00
parent 39ecb7af61
commit ee271cb06b
3 changed files with 41 additions and 29 deletions

View File

@ -121,32 +121,7 @@ describe ('Model Utils', function () {
return Math.sqrt (areaSquare); return Math.sqrt (areaSquare);
} }
var model = new OV.Model (); var model = testUtils.GetCubeModel ();
var cube = new OV.Mesh ();
cube.AddVertex (new OV.Coord3D (0.0, 0.0, 0.0));
cube.AddVertex (new OV.Coord3D (1.0, 0.0, 0.0));
cube.AddVertex (new OV.Coord3D (1.0, 1.0, 0.0));
cube.AddVertex (new OV.Coord3D (0.0, 1.0, 0.0));
cube.AddVertex (new OV.Coord3D (0.0, 0.0, 1.0));
cube.AddVertex (new OV.Coord3D (1.0, 0.0, 1.0));
cube.AddVertex (new OV.Coord3D (1.0, 1.0, 1.0));
cube.AddVertex (new OV.Coord3D (0.0, 1.0, 1.0));
cube.AddTriangle (new OV.Triangle (0, 1, 5));
cube.AddTriangle (new OV.Triangle (0, 5, 4));
cube.AddTriangle (new OV.Triangle (1, 2, 6));
cube.AddTriangle (new OV.Triangle (1, 6, 5));
cube.AddTriangle (new OV.Triangle (2, 3, 7));
cube.AddTriangle (new OV.Triangle (2, 7, 6));
cube.AddTriangle (new OV.Triangle (3, 0, 4));
cube.AddTriangle (new OV.Triangle (3, 4, 7));
cube.AddTriangle (new OV.Triangle (0, 3, 2));
cube.AddTriangle (new OV.Triangle (0, 2, 1));
cube.AddTriangle (new OV.Triangle (4, 5, 6));
cube.AddTriangle (new OV.Triangle (4, 6, 7));
model.AddMesh (cube);
OV.FinalizeModel (model, function () {
return new OV.Material ();
});
let surface = 0.0; let surface = 0.0;
let volume = 0.0; let volume = 0.0;
for (let i = 0; i < model.MeshCount (); i++) { for (let i = 0; i < model.MeshCount (); i++) {

View File

@ -1,7 +1,7 @@
var assert = require ('assert'); var assert = require ('assert');
describe ('Task Runner', function () { describe ('Task Runner', function () {
it ('Run task zero times', function () { it ('Run task zero times', function (done) {
var tr = new OV.TaskRunner (); var tr = new OV.TaskRunner ();
var numbers = []; var numbers = [];
tr.Run (0, { tr.Run (0, {
@ -11,11 +11,12 @@ describe ('Task Runner', function () {
}, },
onReady : function () { onReady : function () {
assert.deepStrictEqual (numbers, []); assert.deepStrictEqual (numbers, []);
done ();
} }
}); });
}); });
it ('Run task three times', function () { it ('Run task three times', function (done) {
var tr = new OV.TaskRunner (); var tr = new OV.TaskRunner ();
var numbers = []; var numbers = [];
tr.Run (3, { tr.Run (3, {
@ -25,6 +26,7 @@ describe ('Task Runner', function () {
}, },
onReady : function () { onReady : function () {
assert.deepStrictEqual (numbers, [0, 1, 2]); assert.deepStrictEqual (numbers, [0, 1, 2]);
done ();
} }
}); });
}); });

View File

@ -135,5 +135,40 @@ module.exports =
} }
return obj; return obj;
} },
GetCubeMesh ()
{
var cube = new OV.Mesh ();
cube.AddVertex (new OV.Coord3D (0.0, 0.0, 0.0));
cube.AddVertex (new OV.Coord3D (1.0, 0.0, 0.0));
cube.AddVertex (new OV.Coord3D (1.0, 1.0, 0.0));
cube.AddVertex (new OV.Coord3D (0.0, 1.0, 0.0));
cube.AddVertex (new OV.Coord3D (0.0, 0.0, 1.0));
cube.AddVertex (new OV.Coord3D (1.0, 0.0, 1.0));
cube.AddVertex (new OV.Coord3D (1.0, 1.0, 1.0));
cube.AddVertex (new OV.Coord3D (0.0, 1.0, 1.0));
cube.AddTriangle (new OV.Triangle (0, 1, 5));
cube.AddTriangle (new OV.Triangle (0, 5, 4));
cube.AddTriangle (new OV.Triangle (1, 2, 6));
cube.AddTriangle (new OV.Triangle (1, 6, 5));
cube.AddTriangle (new OV.Triangle (2, 3, 7));
cube.AddTriangle (new OV.Triangle (2, 7, 6));
cube.AddTriangle (new OV.Triangle (3, 0, 4));
cube.AddTriangle (new OV.Triangle (3, 4, 7));
cube.AddTriangle (new OV.Triangle (0, 3, 2));
cube.AddTriangle (new OV.Triangle (0, 2, 1));
cube.AddTriangle (new OV.Triangle (4, 5, 6));
cube.AddTriangle (new OV.Triangle (4, 6, 7));
return cube;
},
GetCubeModel ()
{
var model = new OV.Model ();
var cube = this.GetCubeMesh ();
model.AddMesh (cube);
OV.FinalizeModel (model, function () { new OV.Material () });
return model;
}
} }