Commit Graph

58 Commits

Author SHA1 Message Date
Wojtek Figat
f94543aac8 Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
#	Flax.flaxproj
2025-03-26 19:48:47 +01:00
xxSeys1
82bdc5d869 adjust sensitivity of some sliders in Model Tool 2025-03-24 18:14:54 +01:00
Wojtek Figat
addc6d5216 Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
#	Content/Editor/Gizmo/Material.flax
#	Content/Engine/DefaultTerrainMaterial.flax
#	Source/Editor/Windows/Assets/ModelWindow.cs
#	Source/Editor/Windows/Assets/SkinnedModelWindow.cs
#	Source/Engine/Core/Types/Variant.cpp
2025-01-13 18:07:54 +01:00
Wojtek Figat
7e165d6127 Allow vertex colors on skinned meshes
#3044
2025-01-08 09:39:19 +01:00
Wojtek Figat
ea5cb5d83a Minor fixes and improvements 2025-01-03 01:10:31 +01:00
Gary M
21d1419e74 Added import option to reverse winding order 2024-12-12 22:19:55 -08:00
Wojtek Figat
53d77d3421 Add **Model SDF baking on GPU** via Compute Shader 2024-05-29 14:53:13 +02:00
Wojtek Figat
daf3671233 Fix model tool importing to use temp file only for Assimp 2024-04-16 14:38:12 +02:00
Wojtek Figat
97bd90d4be Change default collision type to ConvexMesh from TriangleMesh 2024-04-05 15:23:09 +02:00
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
Wojtek Figat
d08843900e Add AnimationRootMotionFlags to configure root motion component extraction
Add `RootMotionMode` to support extracting root motion from animated skeleton pose center of mass

#1429 #2152
2024-02-09 15:37:29 +01:00
Wojtek Figat
d1f40d1c47 Fix missing visibleIf attr 2024-02-07 18:53:55 +01:00
Wojtek Figat
b4f5623537 Merge branch 'skip-existing-mats' of https://github.com/Menotdan/FlaxEngine into Menotdan-skip-existing-mats 2024-01-05 10:40:21 +01:00
Menotdan
8bcc526dd6 Add support for multiple VisibleIf attributes, and properly set up the VisibleIf entries for ImportMaterialsAsInstances and InstanceToImportAs. 2024-01-01 01:24:36 -05:00
Menotdan
5cf20b8eee Add an option to skip existing materials when reimporting. 2023-12-31 21:11:39 -05:00
Wojtek Figat
727ff155c2 Merge branch 'default-not-sloppy' of https://github.com/Tryibion/FlaxEngine into Tryibion-default-not-sloppy 2023-12-06 12:03:07 +01:00
Wojtek Figat
63773f2ddf Add **option to import model file as Prefab**
#1909 #1329 #1973
2023-12-06 11:19:42 +01:00
Wojtek Figat
a808bcdbf6 Refactor objects splitting in models importing to be handled by ModelTool not the importer code itself 2023-12-01 13:57:08 +01:00
Chandler Cox
640e01262f Make SloppyOptimization false by default. Lower LODTargetError default. 2023-11-30 20:40:02 -06:00
Wojtek Figat
6e92d3103c Replace ImportedModelData with ModelData for model importing 2023-11-30 11:46:07 +01:00
Wojtek Figat
c5df7ad689 Add various improvements to models importing code 2023-11-30 11:31:58 +01:00
Wojtek Figat
be90f47585 Documentation improvements from https://github.com/FlaxEngine/FlaxDocs/pull/125 2023-11-11 15:37:12 +01:00
Wojtek Figat
0fe46457c6 Merge branch 'center-import' of https://github.com/Tryibion/FlaxEngine into Tryibion-center-import 2023-11-08 15:07:38 +01:00
Wojtek Figat
c5d3954bc8 Add CalculateBoneOffsetMatrices option to fix some animated model skeletons rendering
#1862
2023-11-05 14:11:28 +01:00
Chandler Cox
73694cba6c Add being able to set origin of mesh to the local mesh origin. fix centering several meshes. 2023-10-25 09:57:51 -05:00
Wojtek Figat
90427da42f Add SubAssetFolder to model import option to redirect auto-imported materials and textures location 2023-10-17 09:59:21 +02:00
Wojtek Figat
f46cc32715 Cleanup code #1115 2023-10-04 20:15:23 +02:00
Wojtek Figat
c46303018e Merge branch 'material_import' of https://github.com/Menotdan/FlaxEngine into Menotdan-material_import 2023-10-04 19:59:42 +02:00
Wojtek Figat
a5374920bd Merge branch 'import_mesh_with_collision_type_as_convex' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-import_mesh_with_collision_type_as_convex 2023-10-04 17:39:39 +02:00
Wojtek Figat
25e1c3deaf Merge branch 'restore_message_clearer' of https://github.com/Menotdan/FlaxEngine into Menotdan-restore_message_clearer 2023-10-04 13:28:40 +02:00
Wojtek Figat
9fa709aa79 Fix importing skinned models with meshes that don't have valid skinning to properly link into the node's bone
#1525
2023-10-04 12:42:11 +02:00
Menotdan
10ea0b0665 Make it clearer what "Restore Materials on Reimport" means. 2023-10-02 03:32:11 -04:00
Ruan Lucas
23b6b93726 add collision type to model importer 2023-09-15 19:13:32 -04:00
Menotdan
451900b7ee Merge branch 'FlaxEngine:master' into material_import 2023-09-15 02:17:34 -04:00
Chandler Cox
44598d4741 Small change in showing target error 2023-08-26 17:07:04 -05:00
Chandler Cox
8e1cac7d2f Add to be able to choose sloppy mesh simplification or not in model import settings for LODs. 2023-08-15 21:34:07 -05:00
Menotdan
af3d9d0eb3 Re-implement functionality for importing materials as instances. 2023-08-09 15:28:47 -04:00
Menotdan
9156e7727b Merge commit 'refs/pull/1115/head' of https://github.com/FlaxEngine/FlaxEngine into material_import1.6
Repair merge
2023-08-09 15:28:15 -04:00
Wojtek Figat
979168e82c Refactor various Editor APIs to use auto-generated bindings instead of manual code 2023-06-12 14:34:07 +02:00
Menotdan
9a71e0274f Add required options for material instance importing. 2023-05-20 00:03:40 -04:00
Wojtek Figat
7a2023ead6 Add option for importing scale tracking to animation asset 2023-02-07 09:39:31 +01:00
Wojtek Figat
f127bbebe1 Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags
Fixes #832
Closes #886
2023-01-15 12:44:39 +01:00
Wojciech Figat
a7e428a21c Merge branch 'master' into 1.5
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
2023-01-10 15:37:55 +01:00
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
Wojtek Figat
8918c71312 Update old header usage 2022-12-22 19:31:01 +01:00
Wojtek Figat
a881c90b2e Refactor engine to support double-precision vectors 2022-06-13 00:40:32 +02:00
Wojtek Figat
f82e370392 Refactor Vector types to support 64-bit precision via define switch 2022-05-25 20:04:33 +02:00
Wojciech Figat
8428f28239 Various improvements for SDF rendering 2022-04-29 17:11:39 +02:00
Wojciech Figat
a5af0a1c81 Fix game build 2022-03-25 11:42:09 +01:00
Wojciech Figat
b08d2001fd Add Model SDF generation utilities 2022-03-24 11:32:02 +01:00