diff --git a/rhino3dm/cs/SampleCSEmbeddedFiles/SampleCSEmbeddedFiles.csproj b/rhino3dm/cs/SampleCSEmbeddedFiles/SampleCSEmbeddedFiles.csproj index 092503b2..a86d2924 100644 --- a/rhino3dm/cs/SampleCSEmbeddedFiles/SampleCSEmbeddedFiles.csproj +++ b/rhino3dm/cs/SampleCSEmbeddedFiles/SampleCSEmbeddedFiles.csproj @@ -7,7 +7,7 @@ enable - - + + diff --git a/rhino3dm/cs/SampleCSExportObj/SampleCSExportObj.csproj b/rhino3dm/cs/SampleCSExportObj/SampleCSExportObj.csproj index fd512f3d..e3d4e399 100644 --- a/rhino3dm/cs/SampleCSExportObj/SampleCSExportObj.csproj +++ b/rhino3dm/cs/SampleCSExportObj/SampleCSExportObj.csproj @@ -8,7 +8,7 @@ - + diff --git a/rhino3dm/cs/SampleCSJoinCurves/SampleCSJoinCurves.csproj b/rhino3dm/cs/SampleCSJoinCurves/SampleCSJoinCurves.csproj index 0b28bb1e..5cfed796 100644 --- a/rhino3dm/cs/SampleCSJoinCurves/SampleCSJoinCurves.csproj +++ b/rhino3dm/cs/SampleCSJoinCurves/SampleCSJoinCurves.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/rhino3dm/cs/SampleCSPBRMaterial/Program.cs b/rhino3dm/cs/SampleCSPBRMaterial/Program.cs index 4e892424..9b7d758c 100644 --- a/rhino3dm/cs/SampleCSPBRMaterial/Program.cs +++ b/rhino3dm/cs/SampleCSPBRMaterial/Program.cs @@ -16,6 +16,8 @@ var sphere = new Rhino.Geometry.Sphere(Rhino.Geometry.Point3d.Origin, 10); file3dm.Objects.AddSphere(sphere, oa); +//var rc = new Rhino.FileIO.File3dmRenderMaterial(); + file3dm.Write("fileWithMaterial.3dm", null); diff --git a/rhino3dm/cs/SampleCSPBRMaterial/SampleCSPBRMaterial.csproj b/rhino3dm/cs/SampleCSPBRMaterial/SampleCSPBRMaterial.csproj index ab539e91..e3d4e399 100644 --- a/rhino3dm/cs/SampleCSPBRMaterial/SampleCSPBRMaterial.csproj +++ b/rhino3dm/cs/SampleCSPBRMaterial/SampleCSPBRMaterial.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/rhino3dm/cs/SampleCSReadFile/SampleCSReadFile.csproj b/rhino3dm/cs/SampleCSReadFile/SampleCSReadFile.csproj index fd512f3d..e3d4e399 100644 --- a/rhino3dm/cs/SampleCSReadFile/SampleCSReadFile.csproj +++ b/rhino3dm/cs/SampleCSReadFile/SampleCSReadFile.csproj @@ -8,7 +8,7 @@ - + diff --git a/rhino3dm/cs/SampleCSTestSetMesh/SampleCSTestSetMesh.csproj b/rhino3dm/cs/SampleCSTestSetMesh/SampleCSTestSetMesh.csproj index 65cd6fa8..1a4f8925 100644 --- a/rhino3dm/cs/SampleCSTestSetMesh/SampleCSTestSetMesh.csproj +++ b/rhino3dm/cs/SampleCSTestSetMesh/SampleCSTestSetMesh.csproj @@ -8,7 +8,7 @@ - + diff --git a/rhino3dm/js/SampleCircles/index.html b/rhino3dm/js/SampleCircles/index.html index 5b013ce9..33e2f859 100644 --- a/rhino3dm/js/SampleCircles/index.html +++ b/rhino3dm/js/SampleCircles/index.html @@ -15,12 +15,12 @@

Fun with circles

- + diff --git a/rhino3dm/js/SampleJSMakeBrep/index.html b/rhino3dm/js/SampleJSMakeBrep/index.html index 66da08c0..6107eba4 100644 --- a/rhino3dm/js/SampleJSMakeBrep/index.html +++ b/rhino3dm/js/SampleJSMakeBrep/index.html @@ -63,15 +63,14 @@ - + diff --git a/rhino3dm/js/SampleJSMakeBrep/script.js b/rhino3dm/js/SampleJSMakeBrep/script.js index 3fd8cb3c..4333e6f4 100644 --- a/rhino3dm/js/SampleJSMakeBrep/script.js +++ b/rhino3dm/js/SampleJSMakeBrep/script.js @@ -69,6 +69,8 @@ doc.materials().add(magentaMaterial) const magentaThreeMaterial = new THREE.MeshPhysicalMaterial( {color:0xff00ff, metalness:0.2, roughness: 0.9} ) +console.log(doc.materials().count) + // #endregion MATERIALS // // #region LAYERS // @@ -230,7 +232,7 @@ function onWindowResize() { function download() { const options = new rhino.File3dmWriteOptions() - options.version = 7 + options.version = 8 let buffer = doc.toByteArrayOptions(options) saveByteArray('rhinoDocument_' + options.version + '.3dm', buffer) } diff --git a/rhino3dm/js/SampleObjTo3dm/index.html b/rhino3dm/js/SampleObjTo3dm/index.html index 209a35b6..2a7fe8d2 100644 --- a/rhino3dm/js/SampleObjTo3dm/index.html +++ b/rhino3dm/js/SampleObjTo3dm/index.html @@ -33,15 +33,15 @@ - + diff --git a/rhino3dm/js/SampleObjectTypes/index.html b/rhino3dm/js/SampleObjectTypes/index.html index 485626f7..ed4ea81d 100644 --- a/rhino3dm/js/SampleObjectTypes/index.html +++ b/rhino3dm/js/SampleObjectTypes/index.html @@ -44,14 +44,14 @@ - + diff --git a/rhino3dm/js/SampleParse3dmObjects/index.html b/rhino3dm/js/SampleParse3dmObjects/index.html index 61840512..a5588ec2 100644 --- a/rhino3dm/js/SampleParse3dmObjects/index.html +++ b/rhino3dm/js/SampleParse3dmObjects/index.html @@ -33,15 +33,15 @@ - + diff --git a/rhino3dm/js/SampleParse3dmObjects/script.js b/rhino3dm/js/SampleParse3dmObjects/script.js index e63ef955..36147837 100644 --- a/rhino3dm/js/SampleParse3dmObjects/script.js +++ b/rhino3dm/js/SampleParse3dmObjects/script.js @@ -18,7 +18,7 @@ create() function create () { const loader = new Rhino3dmLoader() - loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.0-beta2/' ) + loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.1/' ) doc = new rhino.File3dm() @@ -52,6 +52,21 @@ function create () { const textdot_layer_index = doc.layers().addLayer( 'TextDots', { r: 0, g: 0, b: 255, a: 255 } ) + + // Create two groups + + doc.groups().add(new rhino.Group()) + doc.groups().add(new rhino.Group()) + console.log(`nº of groups ${doc.groups().count}`) + + const group1 = doc.groups().get(0) + console.log(`group id: ${group1.id}`) + console.log(`group index: ${group1.index}`) + + const group2 = doc.groups().get(1) + console.log(`group id: ${group2.id}`) + console.log(`group index: ${group2.index}`) + // -- POINTS / POINTCLOUDS -- // const oa_points = new rhino.ObjectAttributes() diff --git a/rhino3dm/js/SampleSketch2d/index.html b/rhino3dm/js/SampleSketch2d/index.html index f68604a4..6d095ebf 100644 --- a/rhino3dm/js/SampleSketch2d/index.html +++ b/rhino3dm/js/SampleSketch2d/index.html @@ -29,12 +29,12 @@ - + diff --git a/rhino3dm/js/SampleUserStrings/index.html b/rhino3dm/js/SampleUserStrings/index.html index 3eaa506e..e62b1638 100644 --- a/rhino3dm/js/SampleUserStrings/index.html +++ b/rhino3dm/js/SampleUserStrings/index.html @@ -71,15 +71,15 @@ - + diff --git a/rhino3dm/js/SampleUserStrings/script.js b/rhino3dm/js/SampleUserStrings/script.js index 0c8eefad..48f03957 100644 --- a/rhino3dm/js/SampleUserStrings/script.js +++ b/rhino3dm/js/SampleUserStrings/script.js @@ -39,6 +39,8 @@ async function load() { const rhinoObject = objs.get( i ) + console.log(rhinoObject.geometry()) + if ( rhinoObject.geometry().objectType === rhino.ObjectType.Curve ) continue if ( rhinoObject.attributes().userStringCount > 0 ) { @@ -59,7 +61,7 @@ async function load() { // load and pass to threejs const loader = new Rhino3dmLoader() - loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.0-beta3/' ) + loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.1/' ) loader.load( model, function ( object ) { diff --git a/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/index.html b/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/index.html index 2edb1900..cd5d6e3f 100644 --- a/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/index.html +++ b/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/index.html @@ -33,15 +33,15 @@
- + diff --git a/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/script.js b/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/script.js index 2d376284..e149ecad 100644 --- a/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/script.js +++ b/rhino3dm/js/SampleViewer/01.1_basic_3dmLoader/script.js @@ -35,7 +35,7 @@ function init () { function load() { const loader = new Rhino3dmLoader() - loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.0-beta2/' ) + loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.1/' ) const material = new THREE.MeshNormalMaterial() loader.load( model, function ( object ) { diff --git a/rhino3dm/js/SampleViewer/01.2_multipleFiles/index.html b/rhino3dm/js/SampleViewer/01.2_multipleFiles/index.html index c5c04bca..7f0845f7 100644 --- a/rhino3dm/js/SampleViewer/01.2_multipleFiles/index.html +++ b/rhino3dm/js/SampleViewer/01.2_multipleFiles/index.html @@ -44,14 +44,14 @@ - + diff --git a/rhino3dm/js/SampleViewer/01.2_multipleFiles/script.js b/rhino3dm/js/SampleViewer/01.2_multipleFiles/script.js index 8e9518ba..0cd75a0e 100644 --- a/rhino3dm/js/SampleViewer/01.2_multipleFiles/script.js +++ b/rhino3dm/js/SampleViewer/01.2_multipleFiles/script.js @@ -9,7 +9,7 @@ select.onchange = load let model = 'hello_mesh.3dm' const loader = new Rhino3dmLoader() -loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.0-beta2/' ) +loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.1/' ) const material = new THREE.MeshNormalMaterial() diff --git a/rhino3dm/js/SampleViewer/01.3_uploadFiles/index.html b/rhino3dm/js/SampleViewer/01.3_uploadFiles/index.html index 994bc8c7..7d2de794 100644 --- a/rhino3dm/js/SampleViewer/01.3_uploadFiles/index.html +++ b/rhino3dm/js/SampleViewer/01.3_uploadFiles/index.html @@ -41,13 +41,13 @@ - + diff --git a/rhino3dm/js/SampleViewer/01.3_uploadFiles/script.js b/rhino3dm/js/SampleViewer/01.3_uploadFiles/script.js index 3baacba4..da549a7a 100644 --- a/rhino3dm/js/SampleViewer/01.3_uploadFiles/script.js +++ b/rhino3dm/js/SampleViewer/01.3_uploadFiles/script.js @@ -9,7 +9,7 @@ import { Rhino3dmLoader } from 'three/examples/jsm/loaders/3DMLoader' // #region GLOBALS // const loader = new Rhino3dmLoader() -loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.0-beta2/' ) +loader.setLibraryPath( 'https://unpkg.com/rhino3dm@8.0.1/' ) const upload = document.getElementById("file-upload") diff --git a/rhino3dm/js/SampleViewer/01_basic/index.html b/rhino3dm/js/SampleViewer/01_basic/index.html index 84f5319b..16c24681 100644 --- a/rhino3dm/js/SampleViewer/01_basic/index.html +++ b/rhino3dm/js/SampleViewer/01_basic/index.html @@ -15,14 +15,14 @@ - + diff --git a/rhino3dm/js/SampleViewer/02_advanced/index.html b/rhino3dm/js/SampleViewer/02_advanced/index.html index aed767b0..9c78a273 100644 --- a/rhino3dm/js/SampleViewer/02_advanced/index.html +++ b/rhino3dm/js/SampleViewer/02_advanced/index.html @@ -61,13 +61,13 @@ - +