Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3DMLoader: Clean up #25423

Merged
merged 8 commits into from
Mar 18, 2023
Merged

3DMLoader: Clean up #25423

merged 8 commits into from
Mar 18, 2023

Conversation

LeviPesin
Copy link
Contributor

Related issue: -

Description

Clean up.

@Mugen87
Copy link
Collaborator

Mugen87 commented Feb 3, 2023

/ping @fraguada

@fraguada
Copy link
Contributor

fraguada commented Mar 8, 2023

Apologies that I missed this ping. I will be able to review these changes next week.

@mrdoob mrdoob added this to the r151 milestone Mar 15, 2023
@Mugen87
Copy link
Collaborator

Mugen87 commented Mar 18, 2023

Merging for now since the changes look save.

@Mugen87 Mugen87 merged commit f5989f7 into mrdoob:dev Mar 18, 2023
@LeviPesin LeviPesin deleted the patch-3 branch March 19, 2023 02:58
sunag pushed a commit to sunag/three.js that referenced this pull request Mar 20, 2023
* 3DMLoader: Clean up

* Update 3DMLoader.js

* Update 3DMLoader.js

* Revert materials comparison change

* Fix `elements`

* Update 3DMLoader.js

* Update 3DMLoader.js

* Update 3DMLoader.js

---------

Co-authored-by: Michael Herzog <michael.herzog@human-interactive.org>
sunag added a commit that referenced this pull request Mar 20, 2023
* CodeNode: Added language and serialize.

* TSL: Renamed inversesqrt -> inverseSqrt, faceforward -> faceForward,

* TSL: Added saturate

* TSL: Different params order if method chaining is used.

* Nodes: Change mix order and added FogNode.mixAssign()

* Node: Ignore private properties on serialization.

* Nodes: Added string, arrayBuffer

* Node: Added .getSerializeChildren()

* Added ScriptableNode

* Added scriptable example and serialization test.

* update style

* cleanup

* cleanup

* Code Based Node moved to /code/

* ScriptableNode: Fix async refresh, added .setLocal(), .getLocal()

* added async scriptable and serialization test

* optional output

* added output example

* ScriptableNode: Move editor property to function call if needed.

* ScriptableValueNode: Added support to more CPU nodes.

* ShaderNode: Reduces the use of unnecessary conversions.

* webgpu_materials: Added CPU parameter as node.

* ScriptableNode: Move THREE, TSL to global environment vars.

* webgpu_materials: set globals

* cleanup

* cleanup

* Revert "cleanup"

This reverts commit 0cf0695.

* Revert "fix conflicting"

This reverts commit baaa14b, reversing
changes made to 0923c2e.

* PointerLockControls: Refactor class structure. (#25665)

* Bump eslint from 8.35.0 to 8.36.0 (#25666)

Bumps [eslint](https://github.com/eslint/eslint) from 8.35.0 to 8.36.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.35.0...v8.36.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update webgl_loader_md2.html (#25670)

Double index increment preventing all animations to be set in UI.

* Fix the Chinese translation of MeshToonMaterial (#25672)

In the original version, the Chinese translation of MeshToonMaterial documents did not work properly. This update aims to fix this error

* Bump puppeteer-core from 19.7.4 to 19.7.5 (#25671)

Bumps [puppeteer-core](https://github.com/puppeteer/puppeteer) from 19.7.4 to 19.7.5.
- [Release notes](https://github.com/puppeteer/puppeteer/releases)
- [Changelog](https://github.com/puppeteer/puppeteer/blob/main/release-please-config.json)
- [Commits](puppeteer/puppeteer@puppeteer-core-v19.7.4...puppeteer-core-v19.7.5)

---
updated-dependencies:
- dependency-name: puppeteer-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Create renovate.json (#25636)

* Create renovate.json

* Update renovate.json

---------

Co-authored-by: mrdoob <info@mrdoob.com>

* Delete dependabot.yml

* Src: export AnimationAction (#25676)

* Fix a document translation omission (#25677)

* Create a translation document of DataArrayTexture

Create a Chinese translation document of DataArrayTexture

* Update DataArrayTexture.html

---------

Co-authored-by: Michael Herzog <michael.herzog@human-interactive.org>

* Delete DataTexture2DArray.html

* CSS2DRenderer: Introduce CSS2DObject.center (#25673)

* CSS2DRenderer: Introduce CSS2DObject.center

* Update css2d_label screenshot

* fix gui

* Vector2: Add `angleTo()`. (#25678)

* GLTFLoader: Prevents set data uri in texture.name. (#25682)

* GLTFLoader: Prevents set data uri in texture.name.

* cleanup

* fix maybe optional value

* cleanup

* Object3D: Honor `up` in `toJSON()` and `ObjectLoader`. (#25687)

* WebGLRenderer: Add `onShaderError()`. (#25679)

* Updated builds.

* 3DMLoader: Clean up (#25423)

* 3DMLoader: Clean up

* Update 3DMLoader.js

* Update 3DMLoader.js

* Revert materials comparison change

* Fix `elements`

* Update 3DMLoader.js

* Update 3DMLoader.js

* Update 3DMLoader.js

---------

Co-authored-by: Michael Herzog <michael.herzog@human-interactive.org>

* Examples: Fix webgl_geometry_spline_editor.html (#25690)

Call render() after detach so that the tooltip disappears when clicking away from the selected helper point, as one would expect.

* TSL: Different params order if method chaining is used. (#25683)

* CodeNode: Added language and serialize.

* TSL: Renamed inversesqrt -> inverseSqrt, faceforward -> faceForward,

* TSL: Added saturate

* TSL: Different params order if method chaining is used.

* Nodes: Change mix order and added FogNode.mixAssign()

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Michael Herzog <michael.herzog@human-interactive.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: llzen44 <73878466+llzen44@users.noreply.github.com>
Co-authored-by: 幽离 <90978564+newstart0514@users.noreply.github.com>
Co-authored-by: Don McCurdy <dm@donmccurdy.com>
Co-authored-by: mrdoob <info@mrdoob.com>
Co-authored-by: 林炳权 <695601626@qq.com>
Co-authored-by: WestLangley <WestLangley@users.noreply.github.com>
Co-authored-by: Levi Pesin <35454228+LeviPesin@users.noreply.github.com>
Co-authored-by: puqeko <puqeko@gmail.com>
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants