Skip to content

Adds basic support for .obj vertex colors #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Adds basic support for .obj vertex colors #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 44 additions & 6 deletions src/import/importerobj.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ JSM.ReadObjFile = function (stringBuffer, callbacks)
}
}

function OnColorVertex (x, y, z, r, g, b)
{
if (typeof(callbacks.onColorVertex) === 'function') {
callbacks.onColorVertex (x, y, z, r, g, b);
}
}

function OnNormal (x, y, z)
{
if (callbacks.onNormal !== undefined && callbacks.onNormal !== null) {
Expand Down Expand Up @@ -127,7 +134,11 @@ JSM.ReadObjFile = function (stringBuffer, callbacks)
return;
}
objectCounter.vertexCount += 1;
OnVertex (parseFloat (lineParts[1]), parseFloat (lineParts[2]), parseFloat (lineParts[3]));
if (lineParts.length < 7) {
OnVertex (parseFloat (lineParts[1]), parseFloat (lineParts[2]), parseFloat (lineParts[3]));
} else {
OnColorVertex (parseFloat (lineParts[1]), parseFloat (lineParts[2]), parseFloat (lineParts[3]), parseFloat (lineParts[4]), parseFloat (lineParts[5]), parseFloat (lineParts[6]));
}
} else if (lineParts[0] == 'vn') {
if (lineParts.length < 4) {
return;
Expand Down Expand Up @@ -250,8 +261,9 @@ JSM.ConvertObjToJsonData = function (stringBuffer, callbacks)
var materialNameToIndex = {};
var currentMaterial = null;
var currentMaterialIndex = null;

var globalVertices = [];
var globalVertexMaterialIndices = [];
var globalNormals = [];
var globalUVs = [];

Expand Down Expand Up @@ -323,6 +335,24 @@ JSM.ConvertObjToJsonData = function (stringBuffer, callbacks)
},
onVertex : function (x, y, z) {
globalVertices.push (new JSM.Coord (x, y, z));
globalVertexMaterialIndices.push (undefined);
},
onColorVertex : function (x, y, z, r, g, b) {
var colorMaterialName = 'Color #' + ((Math.round (255 * r) << 16) | (Math.round (255 * g) << 8) | Math.round (255 * b)).toString (16);
var materialIndex = materialNameToIndex[colorMaterialName];
if (materialIndex === undefined) {
materialIndex = triangleModel.AddMaterial ({
name : colorMaterialName
});
var colorMaterial = triangleModel.GetMaterial (materialIndex);
colorMaterial.ambient = [r / 4, g / 4, b / 4];
colorMaterial.diffuse = [r, g, b];
colorMaterial.specular = [ 1, 1, 1 ];
colorMaterial.shininess = 0.01;
materialNameToIndex[colorMaterialName] = materialIndex;
}
globalVertices.push (new JSM.Coord (x, y, z));
globalVertexMaterialIndices.push (materialIndex);
},
onNormal : function (x, y, z) {
globalNormals.push (new JSM.Coord (x, y, z));
Expand Down Expand Up @@ -366,14 +396,17 @@ JSM.ConvertObjToJsonData = function (stringBuffer, callbacks)
});
}

var i, v0, v1, v2, triangle, triangleIndex;
var i, gv0, gv1, gv2, v0, v1, v2, triangle, triangleIndex;
var hasNormals = (normals.length == vertices.length);
var hasUVs = (uvs.length == vertices.length);
var count = vertices.length;
gv0 = vertices[0];
v0 = GetLocalVertexIndex (currentBody, globalVertices, globalToLocalVertices, gv0);
for (i = 0; i < count - 2; i++) {
v0 = GetLocalVertexIndex (currentBody, globalVertices, globalToLocalVertices, vertices[0]);
v1 = GetLocalVertexIndex (currentBody, globalVertices, globalToLocalVertices, vertices[(i + 1) % count]);
v2 = GetLocalVertexIndex (currentBody, globalVertices, globalToLocalVertices, vertices[(i + 2) % count]);
gv1 = vertices[(i + 1) % count];
gv2 = vertices[(i + 2) % count];
v1 = GetLocalVertexIndex (currentBody, globalVertices, globalToLocalVertices, gv1);
v2 = GetLocalVertexIndex (currentBody, globalVertices, globalToLocalVertices, gv2);
triangleIndex = currentBody.AddTriangle (v0, v1, v2);
triangle = currentBody.GetTriangle (triangleIndex);
if (hasNormals) {
Expand All @@ -388,6 +421,11 @@ JSM.ConvertObjToJsonData = function (stringBuffer, callbacks)
}
if (currentMaterialIndex !== null) {
triangle.mat = currentMaterialIndex;
} else {
var materialIndex = globalVertexMaterialIndices[gv0];
if (materialIndex !== undefined && materialIndex === globalVertexMaterialIndices[gv1] && materialIndex === globalVertexMaterialIndices[gv2]) {
triangle.mat = materialIndex;
}
}
}
},
Expand Down
14 changes: 11 additions & 3 deletions test/unittest/tests/visual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,27 @@ function DrawAndCheck (body, drawMode, referenceFile)
var drawer = new DummyDrawer ();
JSM.DrawProjectedBody (body, null, camera, drawMode, true, drawer);

function normalized (buffer) {
return buffer.toString().replace(/(.*)[\r\n]+/g, function (match, group) {
return group + "\n"
});
}

var fs = require ('fs');
var path = require ('path');
var fullReferencePath = path.join (__dirname, '..', 'references', referenceFile);
var succeeded = false;
if (fs.existsSync (fullReferencePath)) {
refFileContent = fs.readFileSync (fullReferencePath);
if (refFileContent == drawer.GetSvgContent ()) {
if (normalized(refFileContent) == normalized(drawer.GetSvgContent ())) {
succeeded = true;
}
}
if (!succeeded) {
var differenceDir = path.join (__dirname, '../differences/')
fs.mkdir (differenceDir);
var differenceDir = path.join (__dirname, '../differences/');
if (!fs.existsSync (differenceDir)) {
fs.mkdirSync (differenceDir);
}
fs.writeFileSync (path.join (differenceDir, referenceFile), drawer.GetSvgContent ());
}
return succeeded;
Expand Down