Merge pull request #64 from Esri/develop

Merge develop to main

Jenkinsfile

@@ -133,6 +133,6 @@ def buildConfig(String src, String tgt, Map cfg, List deps, List defs) {
 	unstash(name: SOURCE_STASH)
 	deps.each { d -> papl.fetchDependency(d, cfg) }
 	dir(path: 'build') {
-		papl.runCMakeBuild(src, tgt, cfg, defs)
+		papl.runCMakeBuild(src, tgt, cfg, defs, JenkinsTools.CMAKE319)
 	}
 }

README.md

@@ -73,15 +73,15 @@ Please note that the individual example READMEs may include further requirements
 
 ### All Platforms
 
-* To load custom encoders built with the latest SDK, CityEngine 2023.0 is required. For older versions of CityEngine an older version of the SDK might have to be used, see [Release History](#release-history-and-changelog). Some SDK versions don't have a matching CityEngine.
-* A license for the corresponding CityEngine version. For example, a license for CityEngine 2023.0 to author Rule Packages for the current SDK release.
-* CMake 3.3 or later (<https://www.cmake.org>)
+* To load custom encoders built with the latest SDK, CityEngine 2023.1 is required. For older versions of CityEngine an older version of the SDK might have to be used, see [Release History](#release-history-and-changelog). Some SDK versions don't have a matching CityEngine.
+* A license for the corresponding CityEngine version. For example, a license for CityEngine 2023.1 to author Rule Packages for the current SDK release.
+* CMake 3.19 or later (<https://www.cmake.org>)
 
 ### Windows
 
 * Windows 10 or 11 (64bit)
 * Required C++ compiler: Visual Studio 2019 with Toolset MSVC 14.27 or later
-* Required flags for extension libraries release mode: `/std:c++17 /bigobj /GR /EHsc /MD` (use `/MDd` to debug)
+* Required flags for extension libraries release mode: `/std:c++17 /bigobj /GR /EHsc /MD`
 
 ### Linux
 
@@ -93,6 +93,7 @@ Please note that the individual example READMEs may include further requirements
 
 A detailed list of changes to the API, CGA language and built-in codecs can be found in the [Changelog](changelog.md).
 
+* [v3.1.9666 (2023-11-20, CityEngine 2023.1)](https://github.com/Esri/cityengine-sdk/releases/tag/3.1.9666)
 * [v3.0.8961 (2023-10-05, no matching CityEngine version)](https://github.com/Esri/cityengine-sdk/releases/tag/3.0.8961)
 * [v3.0.8905 (2023-06-10, CityEngine 2023.0)](https://github.com/Esri/cityengine-sdk/releases/tag/3.0.8905)
 * [v2.7.8603 (2023-02-22, no matching CityEngine version)](https://github.com/Esri/cityengine-sdk/releases/tag/2.7.8603)

changelog.md

@@ -1,3 +1,63 @@
+# CITYENGINE SDK 3.1.9666 CHANGELOG
+
+This section lists changes compared to CityEngine SDK 3.0.8961.
+
+## General Info
+* CityEngine SDK 3.1.9666 is used in CityEngine 2023.1.9666.
+
+## PRT API
+* `prt::init()`: Now ensures the current working directory does not change when loading extension libraries.
+
+## PRTX API
+* `prtx::Material`, `prtx::MaterialBuilder`: added getters, setters and keys for the new "doubleSided" attribute. The default value is true.
+* `prtx::Shape`: 
+  * added keys for the new "doubleSided" material attribute.
+  * switched `getShapeSymbol()` to in64_t and fixed a shapesymbol collision bug (repeated CGA imports).
+* `prtx::LogFormatter`:
+  * added new `operator%(const std::vector< uint32_t > &v)`.
+  * `log(uint32_t const *array, size_t count)` : switched count from uint32_t to size_t.
+
+## CGA
+* New features:
+  * With the new auto-tag feature, selected operations automatically apply semantic information to output geometry components:
+    * setback, setbackToArea, setbackPerEdge, shapeLUO, splitAndSetbackPerimeter operations: Each output edge is tagged as "setback.front", "setback.side", "setback.back" or "setback.remainder".
+    * roofGable, roofHip, roofPyramid, roofRidge, roofShed operations: Each output face is tagged as "roof.bottom", "roof.side", or "roof.top".
+    * extrude operation: Each output face is tagged as "extrude.bottom", "extrude.side.inner", "extrude.side.outer", or "extrude.top".
+    * envelope operation: Each output face is tagged as "envelope.bottom", "envelope.side.base", "envelope.side.slope", "envelope.side.inner", or "envelope.top".
+    * taper operation: Each output face is tagged as "taper.bottom" or "taper.side".
+
+    The component tags can be queried with the new isTagged selector in the comp, setback, setbackToArea, setbackPerEdge operations and the comp function. 
+
+* New operations:
+  * deleteTags operation
+  * setTagsFromEdgeAttrs operation
+* New functions:
+  * geometry.hasTags function
+  * geometry.tags function
+* New attributes:
+  * material.doubleSided attribute
+* Changes to existing features:
+  * comp, setback, setbackToArea, setbackPerEdge operations, comp function:
+        Existing selectors can be combined in logical selector expressions (e.g. left || right).
+        User-defined functions and all built-in functions can be used in logical selector expressions.
+        Added new isTagged selector.
+* Bugfixes:
+  * comp operation: Fixed a bug where using the combine operator (=) created a new shape even when no components were selected.
+
+## Built-In Codecs
+* Collada Decoder:
+  * Now detects if a Collada file has been written by SketchUp with the "two-sided" option enabled. In this case, the decoder will set the "doubleSided" material attribute to false. 
+  * Made the decoder more robust against invalid Collada tags.
+* USD Decoder:
+  * The USD importer has been improved to accept resolve map keys for textures which represent absolute and relative paths.
+* USD Encoder:
+  * The USD exporter now uses separate indices for all vertex attributes. This allows for "watertight" meshes with hard edges (i.e. a shared point but different vertex normals). 
+  *	The USD exporter has been improved to pass validation checks for default prims, stage up-axis and material binding API.
+* GLTF Decoder & Encoder:
+  * The glTF material attribute "doubleSided" is now handled both by the exporter and importer. It is translated to and from the CGA material attribute of same name.   
+* Unreal Encoder:
+  * Does not change the curent working directory anymore when being loaded in `prt:init()`.
+
 # CITYENGINE SDK 3.0.8961 CHANGELOG
 
 This section lists changes compared to CityEngine SDK 3.0.8905.

examples/prt4cmd/src/CMakeLists.txt

@@ -1,5 +1,8 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.19)
 cmake_policy(SET CMP0015 NEW)
+if(POLICY CMP0135)
+	cmake_policy(SET CMP0135 NEW)
+endif()
 
 
 ### project definition
@@ -34,7 +37,7 @@ if(NOT prt_DIR)
 		set(PRT_TC "gcc93")
 	endif()
 
-	set(PRT_VERSION "3.0.8905")
+	set(PRT_VERSION "3.1.9666")
 	set(PRT_CLS     "${PRT_OS}-${PRT_TC}-x86_64-rel-opt")
 	set(PRT_URL     "https://github.com/esri/cityengine-sdk/releases/download/${PRT_VERSION}/esri_ce_sdk-${PRT_VERSION}-${PRT_CLS}.zip")
 

examples/prt4cmd/test/test_candler.sh

@@ -2,7 +2,7 @@
 
 T="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 R="$(dirname "${T}")"
-U="https://github.com/Esri/cityengine-sdk/releases/download/3.0.8905/esri_ce_sdk-example_data-v2.zip"
+U="https://github.com/Esri/cityengine-sdk/releases/download/3.1.9666/esri_ce_sdk-example_data-v3.zip"
 D="${R}/data"
 O="${R}/output"
 

examples/stldec/src/CMakeLists.txt

@@ -1,5 +1,8 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.19)
 cmake_policy(SET CMP0015 NEW)
+if(POLICY CMP0135)
+	cmake_policy(SET CMP0135 NEW)
+endif()
 
 
 ### project definition
@@ -43,7 +46,7 @@ if(NOT prt_DIR)
 		set(PRT_TC "gcc93")
 	endif()
 
-	set(PRT_VERSION "3.0.8905")
+	set(PRT_VERSION "3.1.9666")
 	set(PRT_CLS     "${PRT_OS}-${PRT_TC}-x86_64-rel-opt")
 	set(PRT_URL     "https://github.com/esri/cityengine-sdk/releases/download/${PRT_VERSION}/esri_ce_sdk-${PRT_VERSION}-${PRT_CLS}.zip")
 

examples/stlenc/src/CMakeLists.txt

@@ -1,5 +1,8 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.19)
 cmake_policy(SET CMP0015 NEW)
+if(POLICY CMP0135)
+	cmake_policy(SET CMP0135 NEW)
+endif()
 
 
 ### project definition
@@ -31,7 +34,7 @@ if(NOT prt_DIR)
 		set(PRT_TC "gcc93")
 	endif()
 
-	set(PRT_VERSION "3.0.8905")
+	set(PRT_VERSION "3.1.9666")
 	set(PRT_CLS     "${PRT_OS}-${PRT_TC}-x86_64-rel-opt")
 	set(PRT_URL     "https://github.com/esri/cityengine-sdk/releases/download/${PRT_VERSION}/esri_ce_sdk-${PRT_VERSION}-${PRT_CLS}.zip")