Merge pull request #25221 from savuor:rv/bench_3d
OBJ and PLY loaders extention to support texture coordinates and difused colors #25221 ### This PR changes * Texture coordinates support added to `loadMesh()` and `saveMesh()` * `loadMesh()` changes its behavior: all vertex attribute arrays (vertex coordinates, colors, normals, texture coordinates) now have the same size and same-index corresponce - This makes sense for OBJ files where vertex attribute arrays are independent from each other and are randomly accessed when defining faces - Looks like this behavior may also happen in some PLY files; however, it is not implemented until we encounter such files in a wild nature - At the same time `loadPointCloud()` keeps its behavior and loads vertex attributes as they are given in the file * PLY loader supports synonyms for the properties: `diffuse_red`, `diffuse_green` and `diffuse_blue` along with `red`, `green` and `blue` * `std::vector<cv::Vec3i>` supported as an index array type * Colors are loaded as [0, 1] floats instead of uchars - Since colors are usually saved as floats, internal conversion to uchar at loading significantly drops accuracy - Performing uchar conversion does not always makes sense and can be performed by a user if they needs it * PLY loading fixed: wrong offset ruined x coordinate * Python tests added for `loadPointCloud` and `loadMesh` ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMakepull/25335/head
Rostislav Vasilikhin
12 months ago
committed by
GitHub
parent
65074651a4
commit
82038be4cd
12 changed files with 633 additions and 189 deletions
@ -0,0 +1,46 @@ |
||||
#!/usr/bin/env python |
||||
|
||||
# Python 2/3 compatibility |
||||
from __future__ import print_function |
||||
|
||||
import os, numpy |
||||
import math |
||||
import unittest |
||||
import cv2 as cv |
||||
|
||||
from tests_common import NewOpenCVTests |
||||
|
||||
class raster_test(NewOpenCVTests): |
||||
|
||||
def test_loadCloud(self): |
||||
fin = self.find_file("pointcloudio/orig.obj") |
||||
points, normals, colors = cv.loadPointCloud(fin) |
||||
|
||||
if points.shape != (8, 1, 3): |
||||
self.fail('point array should be 8x1x3') |
||||
if normals.shape != (6, 1, 3): |
||||
self.fail('normals array should be 6x1x3') |
||||
if colors.shape != (8, 1, 3): |
||||
self.fail('colors array should be 8x1x3') |
||||
|
||||
def test_loadMesh(self): |
||||
fin = self.find_file("pointcloudio/orig.obj") |
||||
points, indices, normals, colors, texCoords = cv.loadMesh(fin) |
||||
goodShapes = [(1, 18, 3), (18, 1, 3)] |
||||
errorMsg = "%s array should be 18x1x3 or 1x18x3" |
||||
for a, s in [(points, 'points'), (normals, 'normals'), (colors, 'colors')]: |
||||
if a.shape not in goodShapes: |
||||
self.fail(errorMsg % s) |
||||
|
||||
if texCoords.shape not in [(1, 18, 2), (18, 1, 2)]: |
||||
self.fail('texture coordinates array should be 1x18x2 or 18x1x2') |
||||
if isinstance(indices, numpy.ndarray): |
||||
if indices.shape not in [(1, 6, 3), (6, 1, 3)]: |
||||
self.fail('indices array should be 1x6x3 or 6x1x3') |
||||
elif isinstance(indices, list) or isinstance(indices, tuple): |
||||
for i in indices: |
||||
if len(indices) != 6 or i.shape != (1, 3): |
||||
self.fail('indices array should be 1x6x3 or 6x1x3') |
||||
|
||||
if __name__ == '__main__': |
||||
NewOpenCVTests.bootstrap() |
||||
Loading…
Reference in new issue