forked from mattebb/3delightblender
-
Notifications
You must be signed in to change notification settings - Fork 134
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'revert-e94bf810' into 'main'
Revert "Merge branch 'revert-b09668de' into 'main'" See merge request renderman/projects/RenderManForBlender!23
- Loading branch information
Showing
97 changed files
with
5,739 additions
and
3,125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import unittest | ||
| import bpy | ||
| from ..rfb_utils import mesh_utils | ||
|
|
||
|
|
||
| class GeoTest(unittest.TestCase): | ||
|
|
||
| @classmethod | ||
| def add_tests(self, suite): | ||
| suite.addTest(GeoTest('test_mesh_export')) | ||
|
|
||
| def test_mesh_export(self): | ||
|
|
||
| def test_eq(a, b, msg=None): | ||
| if a != b: | ||
| msg = "Mesh export test failed" | ||
| bpy.ops.object.delete() | ||
| raise self.failureException(msg) | ||
|
|
||
| nverts = [4, 4, 4, 4, 4, 4] | ||
| verts = [0, 1, 3, 2, 2, 3, 7, 6, 6, 7, 5, 4, 4, 5, 1, 0, 2, 6, 4, 0, 7, 3, 1, 5] | ||
| P = [[-1.0, -1.0, -1.0], [-1.0, -1.0, 1.0], [-1.0, 1.0, -1.0], [-1.0, 1.0, 1.0], [1.0, -1.0, -1.0], [1.0, -1.0, 1.0], [1.0, 1.0, -1.0], [1.0, 1.0, 1.0]] | ||
| N = [[-1.0, -0.0, 0.0], [0.0, 1.0, 0.0], [1.0, -0.0, 0.0], [0.0, -1.0, 0.0], [0.0, 0.0, -1.0], [0.0, -0.0, 1.0]] | ||
|
|
||
| mesh = mesh_utils.RmanMesh(nverts, verts, P, N) | ||
|
|
||
| bpy.ops.mesh.primitive_cube_add() | ||
| ob = bpy.context.object | ||
|
|
||
| mesh_test = mesh_utils.get_mesh(ob.data, get_normals=True) | ||
|
|
||
| self.addTypeEqualityFunc(mesh_utils.RmanMesh, test_eq) | ||
| self.assertEqual(mesh, mesh_test) | ||
| bpy.ops.object.delete() | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import unittest | ||
| import bpy | ||
| from ..rfb_utils import string_utils, property_utils | ||
| from .. import rfb_api | ||
| import rman | ||
|
|
||
| class ShaderNodesTest(unittest.TestCase): | ||
|
|
||
| @classmethod | ||
| def add_tests(self, suite): | ||
| suite.addTest(ShaderNodesTest('test_value_conversion')) | ||
| suite.addTest(ShaderNodesTest('test_rtparamlist')) | ||
|
|
||
| # test getvar | ||
| def test_value_conversion(self): | ||
| import mathutils | ||
|
|
||
| mat, n1 = rfb_api.create_bxdf('PxrSurface') | ||
| n2 = rfb_api.create_pattern('PxrPrimvar', mat) | ||
| n3 = rfb_api.create_pattern('PxrDirt', mat) | ||
|
|
||
| diffuse_color = [0.18, 0.18, 0.18] | ||
| diffuse_color_test = string_utils.convert_val(n1.diffuseColor, type_hint='color') | ||
| bias_direction = [0.0, 0.0, 0.0] | ||
| bias_direction_test = string_utils.convert_val(n3.biasDirection) | ||
|
|
||
| bl_mtx = string_utils.convert_val(mathutils.Matrix.Identity(4)) | ||
| rman_mtx = [1.0, 0.0, 0.0, 0.0, | ||
| 0.0, 1.0, 0.0, 0.0, | ||
| 0.0, 0.0, 1.0, 0.0, | ||
| 0.0, 0.0, 0.0, 1.0 | ||
| ] | ||
|
|
||
| unitLength = 0.1 | ||
| diffuseDoubleSided = 0 | ||
| var_type = 'float' | ||
|
|
||
| for i in range(3): | ||
| self.assertAlmostEqual(diffuse_color[i], diffuse_color_test[i]) | ||
|
|
||
| for i in range(3): | ||
| self.assertAlmostEqual(bias_direction[i], bias_direction_test[i]) | ||
|
|
||
| for i in range(16): | ||
| self.assertAlmostEqual(rman_mtx[i], bl_mtx[i]) | ||
|
|
||
| self.assertAlmostEqual(unitLength, string_utils.convert_val(n1.unitLength, type_hint='float')) | ||
| self.assertEqual(diffuseDoubleSided, string_utils.convert_val(n1.diffuseDoubleSided, type_hint='int')) | ||
| self.assertEqual(var_type, string_utils.convert_val(n2.type, type_hint='string')) | ||
|
|
||
| bpy.data.materials.remove(mat) | ||
|
|
||
| # test RtParamList | ||
| def test_rtparamlist(self): | ||
| from ..rfb_utils import prefs_utils | ||
| diffuse_params = [ | ||
| 'diffuseColor', | ||
| 'transmissionBehavior', | ||
| 'transmissionColor', | ||
| 'presence', | ||
| 'bumpNormal', | ||
| 'shadowBumpTerminator' | ||
| ] | ||
|
|
||
| def test_eq(a, b, msg=None): | ||
| # for now, we can only check the existence | ||
| # of a parameter | ||
| # we cannot retrieve its value | ||
| for nm in diffuse_params: | ||
| if not b.HasParam(nm): | ||
| msg = "%s is not in RtParamList" % nm | ||
| raise self.failureException(msg) | ||
|
|
||
| mat, node = rfb_api.create_bxdf('PxrDiffuse') | ||
| params = rman.Types.RtParamList() | ||
| params_test = rman.Types.RtParamList() | ||
|
|
||
| params.SetColor("diffuseColor", [0.5, 0.5, 0.5]) | ||
| params.SetInteger("transmissionBehavior", 2) | ||
| params.SetColor("transmissionColor", [0.0, 0.0, 0.0]) | ||
| params.SetFloat("presence", 1.0) | ||
| params.SetNormal("bumpNormal", [0.0, 0.0, 0.0]) | ||
| params.SetInteger("shadowBumpTerminator", 1) | ||
|
|
||
| prefs = prefs_utils.get_addon_prefs() | ||
| pref_val = prefs_utils.get_pref('rman_emit_default_params', False) | ||
| prefs.rman_emit_default_params = True | ||
| property_utils.set_node_rixparams(node, None, params_test) | ||
| self.addTypeEqualityFunc(rman.Types.RtParamList, test_eq) | ||
| self.assertEqual(params, params_test) | ||
|
|
||
| prefs.rman_emit_default_params = pref_val | ||
| bpy.data.materials.remove(mat) | ||
|
|
Oops, something went wrong.