GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,473 Commits 16 Branches 0 Tags
54202eeb8ade490b167c19ec66faadcf86773e9e
Commit Graph

132 Commits

Author SHA1 Message Date
Wojtek Figat
eab7794e3b Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	global.json
 2026-03-26 23:44:33 +01:00
Wojtek Figat
5e6723aa22 Fix missing init and serialization #2977 2026-03-25 17:16:01 +01:00
Wojtek Figat
c7449c8f95 Merge branch 'OnlyCreateMaterialSlots' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-OnlyCreateMaterialSlots 
# Conflicts:
#	Source/Engine/Tools/ModelTool/ModelTool.h
 2026-03-25 17:15:47 +01:00
Wojtek Figat
0fe297c390 Minor fixes to #3669 
Don't change imported model type, only Prefab can do it conditionally.
Add type of `PrefabObject` to extend it in future with Cameras, Lights, etc.
 2026-03-25 16:57:38 +01:00
Wojtek Figat
b10303cd8d Merge branch 'prefab_skinned' of https://github.com/alsed/FlaxEngine into alsed-prefab_skinned 2026-03-25 16:22:05 +01:00
Wojtek Figat
f045b5b6b6 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Editor/Camera/M_Camera.flax
#	Content/Editor/CubeTexturePreviewMaterial.flax
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Content/Editor/DebugMaterials/SingleColor/Decal.flax
#	Content/Editor/DebugMaterials/SingleColor/Particle.flax
#	Content/Editor/DebugMaterials/SingleColor/Surface.flax
#	Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax
#	Content/Editor/DebugMaterials/SingleColor/Terrain.flax
#	Content/Editor/DefaultFontMaterial.flax
#	Content/Editor/Gizmo/FoliageBrushMaterial.flax
#	Content/Editor/Gizmo/Material.flax
#	Content/Editor/Gizmo/MaterialWire.flax
#	Content/Editor/Gizmo/SelectionOutlineMaterial.flax
#	Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax
#	Content/Editor/Highlight Material.flax
#	Content/Editor/Icons/IconsMaterial.flax
#	Content/Editor/IesProfilePreviewMaterial.flax
#	Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl
#	Content/Editor/Particles/Particle Material Color.flax
#	Content/Editor/Particles/Smoke Material.flax
#	Content/Editor/SpriteMaterial.flax
#	Content/Editor/Terrain/Circle Brush Material.flax
#	Content/Editor/Terrain/Highlight Terrain Material.flax
#	Content/Editor/TexturePreviewMaterial.flax
#	Content/Editor/Wires Debug Material.flax
#	Content/Engine/DefaultDeformableMaterial.flax
#	Content/Engine/DefaultMaterial.flax
#	Content/Engine/DefaultRadialMenu.flax
#	Content/Engine/DefaultTerrainMaterial.flax
#	Content/Engine/SingleColorMaterial.flax
#	Content/Engine/SkyboxMaterial.flax
#	Flax.flaxproj
#	Source/Engine/Graphics/Materials/MaterialShader.h
#	Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp
#	Source/Engine/Renderer/RenderList.h
#	Source/Shaders/Reflections.shader
#	Source/Shaders/ReflectionsCommon.hlsl
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
 2026-02-11 00:20:38 +01:00
Wojtek Figat
3a0af54f48 Add Collision Meshes Postfix to filter collision meshes inside imported model via ending 
#3792
 2026-02-03 09:23:19 +01:00
Wojtek Figat
e67b705397 Deprecate GPUTimerQuery in favor of new queries API 2026-01-16 13:39:28 +01:00
Wojtek Figat
b834dddb11 **Refactor sRGB import option on textures** to actually handle image contents with gamma 2026-01-12 15:50:24 +01:00
Wojtek Figat
4008e19ca9 Fix various build issuesin uncommon configurations 2025-11-14 00:52:14 -08:00
Wojtek Figat
91ee9f5e05 Refactor Mesh SDF generation on GPU to use raytracing for more precise results 2025-11-13 22:05:23 +01:00
Wojtek Figat
85b134b7be Add improved Global SDF quality and precision of rasterization 2025-11-04 13:27:21 +01:00
Wojtek Figat
87e2c4c4d5 Merge remote-tracking branch 'origin/master' into 1.11 
# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Editor/Windows/OutputLogWindow.cs
#	Source/Engine/Level/Actor.cpp
 2025-09-24 18:18:27 +02:00
Wojtek Figat
d8f7199c11 Fix importing emissive, roughness, metalness and wireframe properties of materials with Assimp 
#3418
 2025-09-23 15:42:49 +02:00
Wojtek Figat
902744a0ce Fix model import scale on nodes that could be applied multiple times on the same mesh 
#3562
 2025-09-21 15:08:35 +02:00
alsed
05f08db66e Fixed a crash when model with no Bones was imported as Skinned Model 2025-09-08 01:28:49 -03:00
alsed
52ee8b3953 better comment for animated prefab and remove unused code in remap blendshapes 2025-09-07 20:40:28 -03:00
alsed
a8768f918e Add more conditions for skeleton import and add blendshapes for prefab recognition 2025-09-07 13:45:21 -03:00
alsed
9a363e2882 Implement prefab detection of skinned models 2025-08-30 08:51:21 -04:00
Wojtek Figat
bffb175a9b Code fixes 2025-06-07 01:25:22 +02:00
Wojtek Figat
6fece4ca38 Fix automatic collision importing from mode to remove unused material slots 
#3475
 2025-06-03 12:48:31 +02:00
Wojtek Figat
077f7a3cd1 Add PositionFormat and TexCoordFormat to model import option for mesh data encoding 2025-06-03 11:18:03 +02:00
Wojtek Figat
9c3fd052cd Remove copyright year from source files and update to 2025 2025-04-07 19:22:21 +02:00
Wojtek Figat
5d3da8a8d0 Merge remote-tracking branch 'origin/master' into 1.10 
# Conflicts:
#	Source/Editor/SceneGraph/Actors/StaticModelNode.cs
#	Source/Engine/Graphics/Models/Mesh.cs
#	Source/Engine/Graphics/Models/ModelData.h
 2025-03-13 11:23:01 +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
a1c46d2e6e Add support for up to 4 texture channels when importing meshes 
#2667
 2025-01-11 22:40:20 +01:00
Wojtek Figat
ea5cb5d83a Minor fixes and improvements 2025-01-03 01:10:31 +01:00
Chandler Cox
757b8ff855 Fix local origin option with multi-mesh import. 2024-12-31 00:50:42 -06:00
Wojtek Figat
ab99a25cee Update mesh config defines to match a single format 2024-12-29 23:03:09 +01:00
Gary M
21d1419e74 Added import option to reverse winding order 2024-12-12 22:19:55 -08:00
Wojtek Figat
f62c77c35c Fix game deployment if output name contains invalid path characters 
#3004
 2024-10-21 12:37:55 +02:00
xxSeys1
d2dba124df add model import option to only create material slots 
but not import actual materials
 2024-10-09 13:12:48 +02:00
Wojtek Figat
207c6a0cb5 Refactor platform apis comments and cleanup a bit 2024-09-24 18:29:30 +02:00
Wojtek Figat
9daddccbed Merge remote-tracking branch 'origin/master' into 1.9 
# Conflicts:
#	Source/Editor/Modules/ContentDatabaseModule.cs
#	Source/Editor/Surface/SurfaceUtils.cs
#	Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
#	Source/Engine/Foliage/Foliage.cpp
#	Source/Engine/Graphics/Models/MeshBase.h
#	Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp
 2024-09-12 13:38:20 +02:00
Wojtek Figat
e925af534e Add picking the longest animation from the imported file instead of the first one as default 
#2490
 2024-08-29 09:53:22 +02:00
Wojtek Figat
7224494ce6 Add improved material instance setup on model import with base material 2024-08-09 18:44:47 +02:00
Wojtek Figat
e44e44d317 Merge remote-tracking branch 'origin/master' into 1.9 2024-08-05 11:08:51 +02:00
Wojtek Figat
7fbf75c623 Add skinned model import data checks to run in all build configs 2024-08-04 20:20:51 +02:00
Wojtek Figat
1843606074 Minor tweaks 2024-07-27 12:28:30 +02:00
Wojtek Figat
1e86eff2d3 Improve GPU constant buffers structures definitions to properly align on new Clang 2024-06-02 09:52:10 +02:00
Wojtek Figat
4dd331d546 Add half-texel margin to SDF around the mesh 2024-05-29 18:45:32 +02:00
Wojtek Figat
f1debd6cb5 Add names to SDF gpu resources 2024-05-29 17:52:48 +02:00
Wojtek Figat
a8220147ce Improve SDF mip generation to use min-filter 2024-05-29 15:00:03 +02:00
Wojtek Figat
53d77d3421 Add **Model SDF baking on GPU** via Compute Shader 2024-05-29 14:53:13 +02:00
Wojtek Figat
2c80f4402d Add improved Model SDF generation with sampling offset and min distance accumulation 2024-05-24 14:52:01 +02:00
Wojtek Figat
f326fa611f Minor sdf imporvements 2024-05-24 12:41:39 +02:00
Wojtek Figat
6aacea99ab Fix blend shapes transformation applying 
#2459
 2024-04-20 16:16:01 +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
00492a33a3 Fix crash when reimporting animation with translation set 
#2445
 2024-04-15 13:03:11 +02:00
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00