-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix possible change of scale sign when decomposing matrix (#7138)
Co-authored-by: Mathias Agopian <[email protected]>
- Loading branch information
1 parent
1ff0a2d
commit d9c2893
Showing
10 changed files
with
415 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright (C) 2023 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #ifndef GLTFIO_TRSTRANSFORMMANAGER_H | ||
| #define GLTFIO_TRSTRANSFORMMANAGER_H | ||
|
|
||
| #include <filament/FilamentAPI.h> | ||
|
|
||
| #include <utils/compiler.h> | ||
| #include <utils/EntityInstance.h> | ||
| #include <math/quat.h> | ||
| #include <math/vec3.h> | ||
| #include <math/mat4.h> | ||
|
|
||
| using namespace filament::math; | ||
|
|
||
| namespace utils { | ||
| class Entity; | ||
| } // namespace utils | ||
|
|
||
| namespace filament::gltfio { | ||
|
|
||
| class FTrsTransformManager; | ||
|
|
||
| /** | ||
| * TrsTransformManager is used to add entities with glTF-specific trs information. | ||
| * | ||
| * Trs information here just used for Animation, DON'T use for transform. | ||
| */ | ||
| class UTILS_PUBLIC TrsTransformManager { | ||
| public: | ||
| using Instance = utils::EntityInstance<TrsTransformManager>; | ||
| using Entity = utils::Entity; | ||
|
|
||
| /** | ||
| * Returns whether a particular Entity is associated with a component of this TrsTransformManager | ||
| * @param e An Entity. | ||
| * @return true if this Entity has a component associated with this manager. | ||
| */ | ||
| bool hasComponent(Entity e) const noexcept; | ||
|
|
||
| /** | ||
| * Gets an Instance representing the trs transform component associated with the given Entity. | ||
| * @param e An Entity. | ||
| * @return An Instance object, which represents the trs transform component associated with the Entity e. | ||
| * @note Use Instance::isValid() to make sure the component exists. | ||
| * @see hasComponent() | ||
| */ | ||
| Instance getInstance(Entity e) const noexcept; | ||
|
|
||
| /** | ||
| * Creates a trs transform component and associates it with the given entity. | ||
| * @param entity An Entity to associate a trs transform component with. | ||
| * @param translation The translation to initialize the trs transform component with. | ||
| * @param rotation The rotation to initialize the trs transform component with. | ||
| * @param scale The scale to initialize the trs transform component with. | ||
| * | ||
| * If this component already exists on the given entity, it is first destroyed as if | ||
| * destroy(Entity e) was called. | ||
| * | ||
| * @see destroy() | ||
| */ | ||
| void create(Entity entity); | ||
| void create(Entity entity, const float3& translation, const quatf& rotation, | ||
| const float3& scale); //!< \overload | ||
|
|
||
| /** | ||
| * Destroys this component from the given entity. | ||
| * @param e An entity. | ||
| * | ||
| * @see create() | ||
| */ | ||
| void destroy(Entity e) noexcept; | ||
|
|
||
| void setTranslation(Instance ci, const float3& translation) noexcept; | ||
| const float3& getTranslation(Instance ci) const noexcept; | ||
|
|
||
| void setRotation(Instance ci, const quatf& rotation) noexcept; | ||
| const quatf& getRotation(Instance ci) const noexcept; | ||
|
|
||
| void setScale(Instance ci, const float3& scale) noexcept; | ||
| const float3& getScale(Instance ci) const noexcept; | ||
|
|
||
| void setTrs(Instance ci, const float3& translation, const quatf& rotation, | ||
| const float3& scale) noexcept; | ||
| const mat4f getTransform(Instance ci) const noexcept; | ||
|
|
||
| protected: | ||
| TrsTransformManager() noexcept = default; | ||
| ~TrsTransformManager() = default; | ||
|
|
||
| public: | ||
| TrsTransformManager(TrsTransformManager const&) = delete; | ||
| TrsTransformManager(TrsTransformManager&&) = delete; | ||
| TrsTransformManager& operator=(TrsTransformManager const&) = delete; | ||
| TrsTransformManager& operator=(TrsTransformManager&&) = delete; | ||
| }; | ||
|
|
||
| } // namespace filament::gltfio | ||
|
|
||
| #endif // GLTFIO_TRSTRANSFORMMANAGER_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.