Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add helper function for color conversion.

Browse Source
This commit is contained in:
kovacsv 2021-12-28 17:22:38 +01:00
parent 1213bbee22
commit 5c40815a7d
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/threejs/threeconverter.js
View File

@ -121,7 +121,7 @@ OV.ConvertModelToThreeObject = function (model, params, output, callbacks)
} }
let material = model.GetMaterial (materialIndex); let material = model.GetMaterial (materialIndex);
let baseColor = new THREE.Color (material.color.r / 255.0, material.color.g / 255.0, material.color.b / 255.0); let baseColor = OV.ConvertColorToThreeColor (material.color);
if (material.vertexColors) { if (material.vertexColors) {
baseColor.setRGB (1.0, 1.0, 1.0); baseColor.setRGB (1.0, 1.0, 1.0);
} }
@ -143,7 +143,7 @@ OV.ConvertModelToThreeObject = function (model, params, output, callbacks)
if (shadingType === OV.ShadingType.Phong) { if (shadingType === OV.ShadingType.Phong) {
threeMaterial = new THREE.MeshPhongMaterial (materialParams); threeMaterial = new THREE.MeshPhongMaterial (materialParams);
if (material.type === OV.MaterialType.Phong) { if (material.type === OV.MaterialType.Phong) {
let specularColor = new THREE.Color (material.specular.r / 255.0, material.specular.g / 255.0, material.specular.b / 255.0); let specularColor = OV.ConvertColorToThreeColor (material.specular);
if (OV.IsEqual (material.shininess, 0.0)) { if (OV.IsEqual (material.shininess, 0.0)) {
specularColor.setRGB (0.0, 0.0, 0.0); specularColor.setRGB (0.0, 0.0, 0.0);
} }
@ -167,7 +167,7 @@ OV.ConvertModelToThreeObject = function (model, params, output, callbacks)
} }
} }
let emissiveColor = new THREE.Color (material.emissive.r / 255.0, material.emissive.g / 255.0, material.emissive.b / 255.0); let emissiveColor = OV.ConvertColorToThreeColor (material.emissive);
threeMaterial.emissive = emissiveColor; threeMaterial.emissive = emissiveColor;
LoadTexture (stateHandler, threeMaterial, material.diffuseMap, (threeTexture) => { LoadTexture (stateHandler, threeMaterial, material.diffuseMap, (threeTexture) => {
@ -239,13 +239,13 @@ OV.ConvertModelToThreeObject = function (model, params, output, callbacks)
vertices.push (v0.x, v0.y, v0.z, v1.x, v1.y, v1.z, v2.x, v2.y, v2.z); vertices.push (v0.x, v0.y, v0.z, v1.x, v1.y, v1.z, v2.x, v2.y, v2.z);
if (meshHasVertexColors) { if (meshHasVertexColors) {
let vc0 = mesh.GetVertexColor (triangle.v0); let vc0 = OV.ConvertColorToThreeColor (mesh.GetVertexColor (triangle.v0));
let vc1 = mesh.GetVertexColor (triangle.v1); let vc1 = OV.ConvertColorToThreeColor (mesh.GetVertexColor (triangle.v1));
let vc2 = mesh.GetVertexColor (triangle.v2); let vc2 = OV.ConvertColorToThreeColor (mesh.GetVertexColor (triangle.v2));
vertexColors.push ( vertexColors.push (
vc0.r / 255.0, vc0.g / 255.0, vc0.b / 255.0, vc0.r, vc0.g, vc0.b,
vc1.r / 255.0, vc1.g / 255.0, vc1.b / 255.0, vc1.r, vc1.g, vc1.b,
vc2.r / 255.0, vc2.g / 255.0, vc2.b / 255.0 vc2.r, vc2.g, vc2.b
); );
} }

9
source/threejs/threeutils.js
View File

@ -89,6 +89,15 @@ OV.ConvertThreeColorToColor = function (threeColor)
); );
}; };
OV.ConvertColorToThreeColor = function (color)
{
return new THREE.Color (
color.r / 255.0,
color.g / 255.0,
color.b / 255.0
);
};
OV.ConvertThreeGeometryToMesh = function (threeGeometry, materialIndex) OV.ConvertThreeGeometryToMesh = function (threeGeometry, materialIndex)
{ {
let mesh = new OV.Mesh (); let mesh = new OV.Mesh ();