Code

Materialx: 1st merge (experimental)#371

Code

Merged

howetuft merged 134 commits intoFreeCAD:masterFreeCAD/FreeCAD-render:masterfrom howetuft:materialxhowetuft/FreeCAD-render:materialxCopy head branch name to clipboardApr 8, 2024

+4,607-442

Commits

Commits on Feb 10, 2024

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for d8b7056
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  d8b7056

  Copy full SHA for d8b7056

• [pre-commit.ci] pre-commit autoupdate

  Show description for de3fa3d
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  de3fa3d

  Copy full SHA for de3fa3d

• Texture: fix add_texture (property naming)

  howetuft

  committed
  6fddcd4

  Copy full SHA for 6fddcd4

• MaterialX: first commit

  Show description for 275a178
  howetuft

  committed
  275a178

  Copy full SHA for 275a178

• Cycles: record coordinate system (as a comment)

  howetuft

  committed
  b12158c

  Copy full SHA for b12158c

• Rendermesh: add tangent computation and enhance Cycles export

  Show description for c521391
  howetuft

  committed
  c521391

  Copy full SHA for c521391

• Cycles: apply normalmap in tangent space

  howetuft

  committed
  89ca674

  Copy full SHA for 89ca674

• Luxcore: normal map - assume DirectX

  howetuft

  committed
  bab7742

  Copy full SHA for bab7742

• Luxcore: textures - set gamma to 1 for normal maps

  howetuft

  committed
  d611c27

  Copy full SHA for d611c27

• MaterialX: various improvements

  howetuft

  committed
  cf4e116

  Copy full SHA for cf4e116

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for 8d0aaee
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  8d0aaee

  Copy full SHA for 8d0aaee

• [pre-commit.ci] pre-commit autoupdate

  Show description for f65ad64
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  f65ad64

  Copy full SHA for f65ad64

• MaterialX: adaptations for materials without nodegraph

  howetuft

  committed
  9870aab

  Copy full SHA for 9870aab

• MaterialX: enhance debug function

  howetuft

  committed
  c78258f

  Copy full SHA for c78258f

• Cycles: update normals & tangents attributes on meshes

  howetuft

  committed
  62f6e06

  Copy full SHA for 62f6e06

Commits on Feb 17, 2024

• Mesher: use fullname when skipping meshing

  howetuft

  committed
  2da2faa

  Copy full SHA for 2da2faa

• Renderables: App::Part - do not filter on countpoints (issue with skip_meshing)

  howetuft

  committed
  1d6ca4f

  Copy full SHA for 1d6ca4f

• Skip meshing: handle missing previous meshing

  howetuft

  committed
  474edda

  Copy full SHA for 474edda

• Multithreaded rendering: submit chunks rather than individual objects

  howetuft

  committed
  9b500ba

  Copy full SHA for 9b500ba

• Release GIL while meshing (version >= 0.22)

  howetuft

  committed
  f8af552

  Copy full SHA for f8af552

• Remove debug message

  howetuft

  committed
  85b2ae6

  Copy full SHA for 85b2ae6

• Rendermesh: Rename private method

  howetuft

  committed
  58e1628

  Copy full SHA for 58e1628

• Revert "Release GIL while meshing (version >= 0.22)"

  Show description for fe0762f
  howetuft

  committed
  fe0762f

  Copy full SHA for fe0762f

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for bae453a
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  bae453a

  Copy full SHA for bae453a

• [pre-commit.ci] pre-commit autoupdate

  Show description for a47847f
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  a47847f

  Copy full SHA for a47847f

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for 1bc3fcb
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  1bc3fcb

  Copy full SHA for 1bc3fcb

• [pre-commit.ci] pre-commit autoupdate

  Show description for 66bd472
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  66bd472

  Copy full SHA for 66bd472

• MaterialX: add displacement shader

  howetuft

  committed
  884bdac

  Copy full SHA for 884bdac

• MaterialX: reimplement TextureBaker

  Show description for 1b205ff
  howetuft

  committed
  1b205ff

  Copy full SHA for 1b205ff

Commits on Feb 18, 2024

• MaterialX: set license to (original) Apache 2.0

  howetuft

  committed
  29a1517

  Copy full SHA for 29a1517

• MaterialX: add setters/getters to RenderTextureBaker

  howetuft

  committed
  132b1a1

  Copy full SHA for 132b1a1

• MaterialX: vim sections in RenderTextureBaker

  howetuft

  committed
  8f0fdcd

  Copy full SHA for 8f0fdcd

• MaterialX: optimize loop in _optimize_baked_textures

  howetuft

  committed
  c558ece

  Copy full SHA for c558ece

• MaterialX: support multi-shader materials

  howetuft

  committed
  247eaab

  Copy full SHA for 247eaab

Commits on Feb 19, 2024

• MaterialX: tweak copyright commentw

  howetuft

  committed
  0aec2e0

  Copy full SHA for 0aec2e0

• MaterialX: update file comment

  howetuft

  committed
  a348fa3

  Copy full SHA for a348fa3

Commits on Feb 24, 2024

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  f3f3da3

  Copy full SHA for f3f3da3

• MaterialX: refactor _generate_new_document_from_shaders main loop

  howetuft

  committed
  a45e99a

  Copy full SHA for a45e99a

• materialx: split _generate_new_document_from_shaders (refactor)

  howetuft

  committed
  6dedd5a

  Copy full SHA for 6dedd5a

• materialx: annotations

  howetuft

  committed
  6cc86d8

  Copy full SHA for 6cc86d8

• MaterialX: small adjustments to materialx.py

  howetuft

  committed
  de3b814

  Copy full SHA for de3b814

• Materialx: pythonicize

  howetuft

  committed
  f374223

  Copy full SHA for f374223

• Materialx: pythonicize

  howetuft

  committed
  c12db3f

  Copy full SHA for c12db3f

• Materialx: pythonicize

  howetuft

  committed
  e236426

  Copy full SHA for e236426

• Materialx: add missing docstring

  howetuft

  committed
  803994e

  Copy full SHA for 803994e

• Materialx: split _generate_new_document_from_shaders (2)

  howetuft

  committed
  8d5e38c

  Copy full SHA for 8d5e38c

• MaterialX: update package.xml (python version & optional dep)

  howetuft

  committed
  5514f10

  Copy full SHA for 5514f10

• MaterialX: remove duplicate attribute definitions in baker

  howetuft

  committed
  3c327f1

  Copy full SHA for 3c327f1

• MaterialX: pythonicize dictionary

  howetuft

  committed
  c0f6a0a

  Copy full SHA for c0f6a0a

• MaterialX: isolate _print method

  howetuft

  committed
  0b3830b

  Copy full SHA for 0b3830b

• MaterialX: refactor setup_unit_system

  howetuft

  committed
  78155a9

  Copy full SHA for 78155a9

• MaterialX: fix setup_unit_system

  howetuft

  committed
  fd28662

  Copy full SHA for fd28662

Commits on Feb 25, 2024

• MaterialX: refactor/split import_materialx

  howetuft

  committed
  dbbd9c3

  Copy full SHA for dbbd9c3

• MaterialX: add GUI

  howetuft

  committed
  83dde58

  Copy full SHA for 83dde58

• MaterialX: add support for plain mtlx files (not zipped)

  howetuft

  committed
  6fa621c

  Copy full SHA for 6fa621c

Commits on Feb 26, 2024

• MaterialX: add (optional) destination document to import_materialx

  howetuft

  committed
  2894cc7

  Copy full SHA for 2894cc7

Commits on Feb 28, 2024

• MaterialX: access to library (operational, but to be enhanced)

  howetuft

  committed
  9b00b0f

  Copy full SHA for 9b00b0f

• MaterialX: transform import_materialx into object

  howetuft

  committed
  3429519

  Copy full SHA for 3429519

Commits on Feb 29, 2024

• MaterialX: report progress and make code interruptible

  howetuft

  committed
  c6696d6

  Copy full SHA for c6696d6

• MaterialX: check whether MaterialX library is installed

  howetuft

  committed
  62a9971

  Copy full SHA for 62a9971

• MaterialX: add one more 'check halt requested'

  howetuft

  committed
  b70dd20

  Copy full SHA for b70dd20

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  4e8ed5e

  Copy full SHA for 4e8ed5e

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for 132e3fe
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  132e3fe

  Copy full SHA for 132e3fe

• [pre-commit.ci] pre-commit autoupdate

  Show description for 5c19747
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  5c19747

  Copy full SHA for 5c19747

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for 5d7947e
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  5d7947e

  Copy full SHA for 5d7947e

• [pre-commit.ci] pre-commit autoupdate

  Show description for d9ca5ee
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  d9ca5ee

  Copy full SHA for d9ca5ee

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for 8dd75ea
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  8dd75ea

  Copy full SHA for 8dd75ea

• [pre-commit.ci] pre-commit autoupdate

  Show description for f643842
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  f643842

  Copy full SHA for f643842

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for ddb37bc
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  ddb37bc

  Copy full SHA for ddb37bc

• [pre-commit.ci] pre-commit autoupdate

  Show description for 34841e5
  

  pre-commit-ci[bot]

  authored and

  howetuft

  committed
  34841e5

  Copy full SHA for 34841e5

• MaterialX: add icons

  howetuft

  committed
  d0b5ba7

  Copy full SHA for d0b5ba7

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  a33f437

  Copy full SHA for a33f437

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  ad0b4cd

  Copy full SHA for ad0b4cd

Commits on Mar 1, 2024

• MaterialX: set menu item for GPUOpen library

  howetuft

  committed
  1c72c4c

  Copy full SHA for 1c72c4c

• MaterialX: bake images in SRGB

  howetuft

  committed
  7873d03

  Copy full SHA for 7873d03

Commits on Mar 5, 2024

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  2524a22

  Copy full SHA for 2524a22

Commits on Mar 6, 2024

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  f088904

  Copy full SHA for f088904

• MaterialX: refine test for SRGB texture

  howetuft

  committed
  d7cb6e3

  Copy full SHA for d7cb6e3

• Rendermesh: convert distances rather than use scale

  howetuft

  committed
  26b163e

  Copy full SHA for 26b163e

• MaterialX: update todo

  howetuft

  committed
  51c4294

  Copy full SHA for 51c4294

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  833c2ef

  Copy full SHA for 833c2ef

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  8d2868d

  Copy full SHA for 8d2868d

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  0168ac3

  Copy full SHA for 0168ac3

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  e01db3a

  Copy full SHA for e01db3a

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  114c3d8

  Copy full SHA for 114c3d8

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  d3475d7

  Copy full SHA for d3475d7

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  bcfa5d2

  Copy full SHA for bcfa5d2

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  5effdb9

  Copy full SHA for 5effdb9

• MaterialX: check whether MaterialX is installed

  howetuft

  committed
  8f998bb

  Copy full SHA for 8f998bb

• MaterialX: make it as a module

  howetuft

  committed
  1fc90b4

  Copy full SHA for 1fc90b4

• MaterialX: specify target doc where to import

  howetuft

  committed
  a6307ad

  Copy full SHA for a6307ad

Commits on Mar 7, 2024

• MaterialX: enhance texture file finding

  howetuft

  committed
  03757dd

  Copy full SHA for 03757dd

• MaterialX: cleaning

  howetuft

  committed
  71daf16

  Copy full SHA for 71daf16

• Luxcore: add 1.5 factor to clearcoatgloss

  howetuft

  committed
  c77c0c6

  Copy full SHA for c77c0c6

Commits on Mar 9, 2024

• MaterialX: add AmbientCG library

  howetuft

  committed
  6698341

  Copy full SHA for 6698341

• MaterialX: remove downloaded file

  howetuft

  committed
  87f3287

  Copy full SHA for 87f3287

• Luxcore: reorder textures and material

  howetuft

  committed
  dde8dda

  Copy full SHA for dde8dda

• MaterialX: displacement / bump swapping

  howetuft

  committed
  8d5eefa

  Copy full SHA for 8d5eefa

Commits on Mar 10, 2024

• MaterialX: icon for AmbientCG

  howetuft

  committed
  79decb1

  Copy full SHA for 79decb1

• Cycles: tweak bump factor

  howetuft

  committed
  38f7b15

  Copy full SHA for 38f7b15

• MaterialX: create dedicated menu for libraries

  howetuft

  committed
  36d21e2

  Copy full SHA for 36d21e2

• MaterialX: handle 'unrecognized format'

  howetuft

  committed
  4a60d7f

  Copy full SHA for 4a60d7f

Commits on Mar 11, 2024

• MaterialX: enhance comments

  howetuft

  committed
  471d6e3

  Copy full SHA for 471d6e3

Commits on Mar 16, 2024

• MaterialX: get actual size from polyhaven.com if applicable

  Show description for 5072406
  howetuft

  committed
  5072406

  Copy full SHA for 5072406

Commits on Mar 17, 2024

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  6da14d6

  Copy full SHA for 6da14d6

• MaterialX: isolate web profile from reloading

  howetuft

  committed
  5f4d49e

  Copy full SHA for 5f4d49e

• MaterialX: convert actual size to meters

  howetuft

  committed
  3703753

  Copy full SHA for 3703753

• MaterialX: use polyhaven size when applicable

  howetuft

  committed
  f38dc78

  Copy full SHA for f38dc78

Commits on Mar 18, 2024

• MaterialX: do not crash Render.materialx import when materialx is not install

  howetuft

  committed
  24fa0da

  Copy full SHA for 24fa0da

• MaterialX: polyhaven - move message to import

  howetuft

  committed
  0cb76ef

  Copy full SHA for 0cb76ef

• MaterialX: provide installer

  howetuft

  committed
  5f866ae

  Copy full SHA for 5f866ae

• MaterialX: switch to PySide (instead of PySide2)

  howetuft

  committed
  4858cf1

  Copy full SHA for 4858cf1

• Replace PySide2 with PySide

  howetuft

  committed
  f66a83a

  Copy full SHA for f66a83a

Commits on Mar 19, 2024

• MaterialX: propose install

  howetuft

  committed
  8787f1b

  Copy full SHA for 8787f1b

• MaterialX: fix installer/uninstaller

  howetuft

  committed
  d5c8f75

  Copy full SHA for d5c8f75

Commits on Mar 20, 2024

• MaterialX: close temp file between using filename

  howetuft

  committed
  9d2d26e

  Copy full SHA for 9d2d26e

• MaterialX: check page when downloading

  howetuft

  committed
  b025ed5

  Copy full SHA for b025ed5

• Merge branch 'FreeCAD:master' into materialx

  howetuft

  authored
  952592f

  Copy full SHA for 952592f

• Move PySide.QtWidgets to PySide.QtGui (https://wiki.freecad.org/PySide)

  howetuft

  committed
  542cf9e

  Copy full SHA for 542cf9e

• MaterialX: hide console messages

  howetuft

  committed
  49aafa0

  Copy full SHA for 49aafa0

Commits on Mar 23, 2024

• MaterialX: add documentation

  howetuft

  committed
  25cff13

  Copy full SHA for 25cff13

• Linting

  howetuft

  committed
  7f755ef

  Copy full SHA for 7f755ef

Commits on Mar 26, 2024

• MaterialX: encapsulate importer in subprocess (to be completed)

  howetuft

  committed
  afc58a7

  Copy full SHA for afc58a7

• MaterialX: resetting progress feature

  howetuft

  committed
  11822c5

  Copy full SHA for 11822c5

• MaterialX: no progress hook cornercase

  howetuft

  committed
  12818ff

  Copy full SHA for 12818ff

• MaterialX: fix import_material target document

  howetuft

  committed
  bab5d0f

  Copy full SHA for bab5d0f

• MaterialX: reset disp2bump

  howetuft

  committed
  3fb0b11

  Copy full SHA for 3fb0b11

• Linting

  howetuft

  committed
  7df75be

  Copy full SHA for 7df75be

• MaterialX: isolate converter

  howetuft

  committed
  7f2cdcb

  Copy full SHA for 7f2cdcb

• MaterialX: reset error handling

  howetuft

  committed
  381c943

  Copy full SHA for 381c943

• MaterialX: linting

  howetuft

  committed
  bf8fbbf

  Copy full SHA for bf8fbbf

Commits on Apr 7, 2024

• MaterialX: adapt behavior to virtual environment

  howetuft

  committed
  4465cc5

  Copy full SHA for 4465cc5

• MaterialX: install in virtual environment - 1st attempt

  howetuft

  committed
  03c0945

  Copy full SHA for 03c0945

Commits on Apr 8, 2024

• MaterialX: control MaterialX feature with parameters

  howetuft

  committed
  dd4738e

  Copy full SHA for dd4738e