Skip to content

Commit 3a0ce6e

Browse files
authored
Merge branch 'main' into tmpMergeRB-10.4-main
2 parents 225c6fa + 1ff35bb commit 3a0ce6e

File tree

156 files changed

+2234
-4898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+2234
-4898
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
containerImage: ghcr.io/gafferhq/build/build:2.0.0
4545
options: .github/workflows/main/options.posix
4646
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
47-
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
47+
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
4848
publish: true
4949

5050
- name: linux-python3-debug
@@ -53,7 +53,7 @@ jobs:
5353
containerImage: ghcr.io/gafferhq/build/build:2.0.0
5454
options: .github/workflows/main/options.posix
5555
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
56-
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
56+
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
5757
publish: false
5858

5959
- name: windows-python3

.github/workflows/main/options.posix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ TBB_INCLUDE_PATH = includes
5959
USD_INCLUDE_PATH = includes
6060
USD_LIB_PREFIX = "usd_"
6161

62-
# Renderers
63-
# =========
64-
65-
APPLESEED_ROOT = deps + "/appleseed"
66-
APPLESEED_INCLUDE_PATH = deps + "/appleseed/include"
67-
APPLESEED_LIB_PATH = deps + "/appleseed/lib"
68-
6962
# Environment
7063
# ===========
7164

.github/workflows/main/options.windows

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,6 @@ USD_LIB_PATH = libs
4747
USD_LIB_PREFIX = "usd_"
4848
DOXYGEN = deps + "\\doxygen\\doxygen.exe"
4949

50-
# Renderers
51-
# =========
52-
53-
APPLESEED_ROOT = deps + "\\appleseed"
54-
APPLESEED_INCLUDE_PATH = deps + "\\appleseed\\include"
55-
APPLESEED_LIB_PATH = deps + "\\appleseed\\lib"
56-
5750
# DCC Integrations
5851
# ================
5952
NUKE_ROOT = ""

Changes

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
1-
10.4.x.x (relative to 10.4.10.0)
1+
10.x.x.x (relative to 10.4.x.x)
22
========
33

4+
Features
5+
--------
6+
7+
- MeshAlgo :
8+
- Added new algorithms for computing mesh normals : `calculateUniformNormals()`, `calculateVertexNormals()` and `calculateFaceVaryingNormals()`.
9+
- Added `correspondingFaceVertices()` method.
10+
11+
Improvements
12+
------------
13+
14+
- MeshAlgo `distributePoints()` :
15+
- Added support for density primitive variable values above 1.
16+
- Added sampling of arbitrary primitive variables via the new `primitiveVariables` parameter.
17+
- Improved accuracy.
18+
- Improved performance.
19+
- MeshAlgo `triangulate()` : Improved performance.
20+
- MeshAlgo `connectedVertices()` : Improved performance.
21+
22+
Fixes
23+
-----
24+
25+
- MeshAlgo `distributePoints()` :
26+
- Fixed duplicate points at triangle edges.
27+
- Fixed handling of points exactly at the density threshold.
28+
- TriangleAlgo :
29+
- `triangleClosestBarycentric()` : Fixed numerical precision bug.
30+
- `triangleContainsPoint()` : Fixed handling of zero-area triangles.
31+
- PolygonVertexIterator : Fixed to use `std::iterator_traits` so that raw pointers are supported.
32+
33+
Breaking Changes
34+
----------------
35+
36+
- IECoreAppleseed : Removed. With Appleseed's removal from Gaffer `1.3.0.0` Cortex no longer provides IECoreAppleseed.
37+
- Python : Removed support for Python 2.
38+
- Primitive : Changed `variableIndexedView()` return type from `boost::optional` to `std::optional`.
39+
- MeshAlgo `distributePoints()` : Bug fixes mean subtle changes to the resulting points.
40+
441
10.4.10.0 (relative to 10.4.9.1)
542
========
643

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
Cortex is a cross-application framework for computation, rendering, and file I/O that provides a set of high-quality C++ libraries and Python modules tailored for software development in the VFX industry. This project focuses on creating a set of practical and reusable modules for technical directors, CG supervisors, and programmers, freeing them to focus on innovation and new features in their software projects.
77

8-
Out of the box, Cortex has full support for the [Arnold](https://www.arnoldrenderer.com/arnold/), [Appleseed](https://appleseedhq.net), and [3Delight](https://www.3delight.com) renderers. It also has built-in integration with Maya, Houdini, and Nuke, with default user interfaces that provide for file I/O and live data manipulation. With its extensible API, Cortex’s DCC integration can be expanded to create custom tools to solve studio pipeline needs.
8+
Out of the box, Cortex has full support for the [Arnold](https://www.arnoldrenderer.com/arnold/) and [3Delight](https://www.3delight.com) renderers. It also has built-in integration with Maya, Houdini, and Nuke, with default user interfaces that provide for file I/O and live data manipulation. With its extensible API, Cortex’s DCC integration can be expanded to create custom tools to solve studio pipeline needs.
99

1010
You can find out more from our [introductory paper on Cortex](https://github.com/ImageEngine/cortex/wiki/pdfs/AnOpenSourceFrameworkForVisualEffectsSoftwareDevelopment.pdf) and the [Cortex presentations at SIGGRAPH 2011](https://vimeo.com/album/5504655).
1111

0 commit comments

Comments
 (0)