Compare commits
375 Commits
sdl_platfo
...
d5f64dcbaa
| Author | SHA1 | Date | |
|---|---|---|---|
| d5f64dcbaa | |||
| ef83dd5377 | |||
| bc241afc09 | |||
| 1357d882cd | |||
| fd0617f3ae | |||
| 61cadd0fdf | |||
| 9552103c58 | |||
| 51132b1bd4 | |||
| 02f446ccfd | |||
| 26012d0b74 | |||
| ef8f6b8d47 | |||
| 43968c1a5e | |||
| 3b8c7f0d8d | |||
| a2414f596a | |||
| e6f90898cb | |||
| 018282bc33 | |||
| 7dfd7de0b7 | |||
| 04e6943b2d | |||
| 6a26441567 | |||
| 0f1d4c9f59 | |||
| 16f06b5848 | |||
| 2a2652302f | |||
| da3b60b606 | |||
| ebca32e6d1 | |||
| 74c8c6c9c7 | |||
| 4f8a73b830 | |||
| ff4122a96c | |||
| 33326d1c57 | |||
| 6efb46fbbc | |||
| e681dcfc2d | |||
| 8ba4725226 | |||
| c1f76abc22 | |||
| d355f9eff5 | |||
| a8f93beeb8 | |||
| d6cb587d1d | |||
| 1702ab0e31 | |||
| 43a83a9ec9 | |||
| f8f846c2bb | |||
| de1a93f3ff | |||
| 765319ee25 | |||
| 3730176783 | |||
| f96a5623e4 | |||
| f57759b250 | |||
| 50531cd6f0 | |||
| bdaa98c8ca | |||
| ed89597f5c | |||
| 438f3f034a | |||
| 6409d6f48e | |||
| 67769d3950 | |||
| e236c9a1a4 | |||
| 3cbc0522b4 | |||
| 3646c5a06a | |||
| 14a90d32c2 | |||
| 709a7b0495 | |||
| 89c39b1fb7 | |||
| 364927c363 | |||
| 294b36a275 | |||
| fdba9aa096 | |||
| ed83eab112 | |||
| fd163d2146 | |||
| e9dfd1a54d | |||
| e3b242f2ba | |||
| ebe09403f5 | |||
| b56edeb956 | |||
| 006d261d6c | |||
| db8de18d58 | |||
| 1c3b81093c | |||
| e5290c8dee | |||
| 2b169b6aa7 | |||
|
|
185e6f663c | ||
| 0de4528168 | |||
| 8d9bb545cf | |||
| 988a547f72 | |||
| 4a181f6839 | |||
| 4428083c2f | |||
| 7288980caa | |||
| 8dbd227122 | |||
| b88fa91d82 | |||
| 86bc79e5db | |||
| ae77a6e579 | |||
| 9bfa652567 | |||
| 97557688a6 | |||
| c959f3dee6 | |||
| 795afabfb4 | |||
| dd88abe46d | |||
| de0cb8d08e | |||
| 87f2e168f9 | |||
| 3babc62c5a | |||
| 7c5917b725 | |||
| 8fcc3ef607 | |||
| 6310d41ca1 | |||
| 6cde5e9376 | |||
| bb47c638f1 | |||
| 1de615c517 | |||
| b88fc89951 | |||
| 2e32bb8c4b | |||
| 45ae959aa3 | |||
| 8a65384f2a | |||
|
|
f0bcc70563 | ||
|
|
992b08025f | ||
|
|
ac3c4a4b30 | ||
|
|
d77024bbf1 | ||
|
|
4f3fbe89f2 | ||
|
|
9ae1867c9e | ||
|
|
caf0251a9c | ||
|
|
216868085b | ||
|
|
18a5c68b3e | ||
|
|
f9e9f26e97 | ||
|
|
a2ff6e5c24 | ||
|
|
0a3f07e6e7 | ||
|
|
3c1aca6d46 | ||
| 02c333c720 | |||
|
|
d30ff65800 | ||
|
|
3d454ed321 | ||
|
|
7e72d7b3cf | ||
|
|
ef188d06c4 | ||
|
|
414b229b27 | ||
|
|
d3c49be80f | ||
|
|
980473cce6 | ||
|
|
6ef2012359 | ||
|
|
e267db7fac | ||
|
|
9dba7caa88 | ||
|
|
c9e625a1a0 | ||
|
|
45f202fdf7 | ||
|
|
c30e31bd65 | ||
|
|
61a11f4a29 | ||
|
|
c786a84dc6 | ||
|
|
1680ccfec3 | ||
|
|
30c78350eb | ||
|
|
7b4da6dd2b | ||
|
|
b25881d55e | ||
|
|
cfc90d1ddf | ||
|
|
a3be6e2add | ||
|
|
d351c96a40 | ||
|
|
b3ab1b7a4a | ||
|
|
b719d6dd04 | ||
|
|
9d059f6c94 | ||
|
|
b8a0150310 | ||
|
|
b891fb7b03 | ||
|
|
bdd4ab9bfd | ||
|
|
f70ec896b8 | ||
|
|
85ecbaab6d | ||
|
|
0381bda068 | ||
|
|
c4d8345b7c | ||
| 6beb9febb1 | |||
| 711a75ce3b | |||
| be72a9f4a2 | |||
| 8c83de8521 | |||
| 00b9d603ae | |||
|
|
5d3d9d7e82 | ||
|
|
91897f290a | ||
|
|
4255ee70fc | ||
|
|
2d20c2d542 | ||
|
|
1bb710e385 | ||
|
|
6583985017 | ||
|
|
e7718e232f | ||
|
|
045ba897c7 | ||
|
|
72a4e577c8 | ||
|
|
bf9f7ee051 | ||
|
|
1370225bae | ||
|
|
aea6f43519 | ||
|
|
59aed828f6 | ||
|
|
74d7dd58c2 | ||
|
|
f2f2056509 | ||
| 5f92932c40 | |||
| ed8eb072c5 | |||
| 5bd4a40ee5 | |||
| 8322e762df | |||
| e6d7024a61 | |||
| 0eb7badf91 | |||
| 2acca350fe | |||
| ac305b369d | |||
|
|
9e23c324bf | ||
|
|
aabbb04f18 | ||
|
|
a9a9057304 | ||
|
|
eb86002fbd | ||
|
|
c75b33eb7d | ||
|
|
06f4808dcc | ||
|
|
644c5b843b | ||
|
|
1ae098331d | ||
|
|
043ae687e2 | ||
|
|
047a637029 | ||
|
|
e66365fd88 | ||
|
|
cd803e42ad | ||
|
|
2777436e83 | ||
|
|
2742ec8256 | ||
|
|
3de6ac2658 | ||
|
|
58813d09c3 | ||
|
|
242d400284 | ||
|
|
9beca96230 | ||
|
|
db20dae062 | ||
|
|
51df5af253 | ||
|
|
8a9e22c987 | ||
|
|
2b97fe5ce0 | ||
|
|
bea6e6330b | ||
|
|
0ed298b5e5 | ||
|
|
f432e54809 | ||
|
|
27d18e8d16 | ||
|
|
684a8fbb8a | ||
|
|
22e7a24327 | ||
|
|
df1313af33 | ||
|
|
46f842a555 | ||
|
|
5ffe6a39ab | ||
|
|
2452face38 | ||
|
|
40a641b731 | ||
|
|
938d23ce0d | ||
|
|
15da2d59e5 | ||
|
|
55effc35db | ||
|
|
6fc5e1f423 | ||
|
|
8b5c35ac6d | ||
|
|
4a10905464 | ||
|
|
344fb908ed | ||
|
|
73c0dcf76b | ||
|
|
09a3eaef83 | ||
|
|
501bb9fa98 | ||
|
|
32e87c7d4e | ||
|
|
17bf77c352 | ||
|
|
aaa4e73e0c | ||
|
|
c9ba28ce55 | ||
|
|
2ac8144ac2 | ||
|
|
1229a6f398 | ||
|
|
ec93b2ff06 | ||
|
|
c074b15671 | ||
| 5fa54fd0d0 | |||
| 99682ea9b2 | |||
| 063f3c69ad | |||
| 9c5c98e8f3 | |||
|
|
0ea37879e8 | ||
|
|
9c3fd052cd | ||
|
|
60c5fbeba3 | ||
|
|
aaf87e3960 | ||
|
|
628bffd63e | ||
|
|
210c8e8fe4 | ||
|
|
cb6a4cc325 | ||
|
|
9c0c809e7e | ||
|
|
5873c48ed6 | ||
|
|
0cfab003ef | ||
|
|
0c6f1ff9dc | ||
|
|
a29b556de6 | ||
|
|
d0ad0859ea | ||
|
|
996188864c | ||
|
|
60b4660a2c | ||
|
|
fcddd4eca7 | ||
|
|
854d0cc23c | ||
|
|
d00a2ea63f | ||
|
|
311a7b8c02 | ||
|
|
3e7ec2b28d | ||
|
|
1c9ff2ec03 | ||
|
|
968044a6c7 | ||
|
|
a8eca76cd1 | ||
|
|
5202d11af4 | ||
|
|
3b518cdf2c | ||
|
|
af3054e5e0 | ||
|
|
e5d0158c92 | ||
|
|
368ef9185b | ||
|
|
bf849c860a | ||
|
|
4268d3d341 | ||
|
|
dd50972fb1 | ||
|
|
93a3083803 | ||
|
|
b5e3d02539 | ||
|
|
43abd1fe37 | ||
|
|
6eb24d59b4 | ||
|
|
d7204dbf3b | ||
|
|
7abc7258ab | ||
|
|
4ddf8d0f48 | ||
|
|
ed3ec55561 | ||
|
|
c00876fa94 | ||
|
|
f947aa3ae2 | ||
|
|
e0251afe79 | ||
|
|
f53c3d7ad5 | ||
|
|
0046cbe0ef | ||
|
|
4c133fb6ff | ||
|
|
3acb80f320 | ||
| bada6b8886 | |||
|
|
ac60dc8068 | ||
|
|
f025d96111 | ||
|
|
5bee99cb93 | ||
|
|
ab348d5f34 | ||
|
|
54f73fe35a | ||
|
|
5017bdd470 | ||
|
|
62273db725 | ||
|
|
e468a77a22 | ||
|
|
cc32af3919 | ||
|
|
0041a17b7d | ||
|
|
38b00f458c | ||
|
|
1c64845169 | ||
|
|
98834131f1 | ||
|
|
40f2067732 | ||
|
|
1e9f9c8e82 | ||
|
|
fa1469514b | ||
|
|
f94543aac8 | ||
|
|
bf2974b6cc | ||
|
|
faa3f62813 | ||
|
|
6a4078c589 | ||
|
|
a0497a8f60 | ||
|
|
8f7752bec7 | ||
|
|
7dc18eeda9 | ||
|
|
a73da8a31c | ||
|
|
ee6ad02a95 | ||
|
|
04d105ed85 | ||
|
|
0e822fc1f7 | ||
|
|
a78ec8b8cd | ||
|
|
83daca569b | ||
|
|
6ea3b0012f | ||
|
|
e67b9a2e05 | ||
|
|
438ca91dc3 | ||
|
|
45ec633fec | ||
|
|
df6cf13b98 | ||
|
|
19da49a0e0 | ||
|
|
9f1429259a | ||
|
|
38c3d88a8a | ||
|
|
7e145c56fd | ||
|
|
9cf7046a5b | ||
|
|
4e14035281 | ||
|
|
bd74d9202e | ||
|
|
0938dd3f5d | ||
|
|
bde4aec113 | ||
|
|
82bdc5d869 | ||
|
|
1b3ad99554 | ||
|
|
e9e96b21d3 | ||
|
|
a403e21cbc | ||
|
|
2c8f2b6e92 | ||
|
|
04fa19fce7 | ||
|
|
92a212317d | ||
|
|
9459eff58c | ||
|
|
8c857e6fa4 | ||
|
|
d123dd3eb4 | ||
|
|
db645c1aae | ||
|
|
abe5b14f72 | ||
|
|
68967de1f5 | ||
|
|
e25efa8c6f | ||
|
|
7f081abf92 | ||
|
|
80df074b5f | ||
|
|
7ee2e66881 | ||
|
|
7144e9352d | ||
|
|
694fc262fa | ||
|
|
6c464569f2 | ||
|
|
c12b99b3ce | ||
|
|
0586c94428 | ||
|
|
59112a68e6 | ||
|
|
b5158e0f5a | ||
|
|
b338244c51 | ||
|
|
4b1f8efba0 | ||
|
|
8f1c22fa48 | ||
|
|
e11b381c13 | ||
|
|
62354e81e2 | ||
|
|
17e30ff904 | ||
|
|
81f24ca914 | ||
|
|
54050685d7 | ||
|
|
cd4ace3f49 | ||
|
|
a4082934b8 | ||
|
|
fa68a5f572 | ||
|
|
23c251ea80 | ||
|
|
05e3149ef4 | ||
|
|
4a769265b6 | ||
|
|
56a8bb777b | ||
|
|
36931c9047 | ||
|
|
3788021898 | ||
|
|
c26c217bf7 | ||
|
|
af454b987b | ||
|
|
87e423ed48 | ||
| ce132f2404 | |||
|
|
56b2c96b3b | ||
|
|
5c06d413b0 | ||
| 1c17b77d1e | |||
| e24bb71e91 | |||
| 3382aabefe | |||
| 4ddc765ee4 | |||
| 5fd64ead62 | |||
| 30257929e5 | |||
| 980a112c57 | |||
| 98bbcbd442 | |||
| 9f8faf4f17 | |||
| 691b9458ec | |||
| b095acd4a5 |
4
.github/workflows/build_linux.yml
vendored
4
.github/workflows/build_linux.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev libwayland-dev
|
||||
- name: Setup Vulkan
|
||||
uses: ./.github/actions/vulkan
|
||||
- name: Setup .NET
|
||||
|
||||
12
.github/workflows/cd.yml
vendored
12
.github/workflows/cd.yml
vendored
@@ -34,7 +34,7 @@ jobs:
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
.\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output
|
||||
.\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -67,7 +67,7 @@ jobs:
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
.\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output
|
||||
.\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -100,7 +100,7 @@ jobs:
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output
|
||||
./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=8
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -131,7 +131,7 @@ jobs:
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output
|
||||
./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=8
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -161,7 +161,7 @@ jobs:
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackageEditor.command -arch=ARM64 -platform=Mac -deployOutput=Output
|
||||
./PackageEditor.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=8
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -189,7 +189,7 @@ jobs:
|
||||
dotnet workload --info
|
||||
- name: Build
|
||||
run: |
|
||||
./PackagePlatforms.command -arch=ARM64 -platform=Mac -deployOutput=Output
|
||||
./PackagePlatforms.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=8
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
|
||||
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -28,7 +28,7 @@ jobs:
|
||||
git lfs pull
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
|
||||
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
|
||||
- name: Build
|
||||
run: |
|
||||
./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=8
|
||||
|
||||
@@ -337,6 +337,7 @@ VertexOutput VS_SplineModel(ModelInput input)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Geometry.PrevWorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Deferred Shading: Defines
|
||||
@1// Deferred Shading: Includes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Distortion: Defines
|
||||
@1// Distortion: Includes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Forward Shading: Defines
|
||||
#define MAX_LOCAL_LIGHTS 4
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Global Illumination: Defines
|
||||
#define USE_GI 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Lightmap: Defines
|
||||
#define CAN_USE_LIGHTMAP 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Motion Vectors: Defines
|
||||
@1// Motion Vectors: Includes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// SDF Reflections: Defines
|
||||
#define USE_GLOBAL_SURFACE_ATLAS 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
@0// Tessellation: Defines
|
||||
#define TessalationProjectOntoPlane(planeNormal, planePosition, pointToProject) pointToProject - dot(pointToProject - planePosition, planeNormal) * planeNormal
|
||||
|
||||
@@ -377,6 +377,7 @@ VertexOutput VS(ModelInput input)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Geometry.PrevWorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
@@ -547,6 +548,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Geometry.PrevWorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -438,6 +438,7 @@ VertexOutput VS(TerrainVertexInput input)
|
||||
// Apply world position offset per-vertex
|
||||
#if USE_POSITION_OFFSET
|
||||
output.Geometry.WorldPosition += material.PositionOffset;
|
||||
output.Geometry.PrevWorldPosition += material.PositionOffset;
|
||||
output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
|
||||
#endif
|
||||
|
||||
|
||||
BIN
Content/Shaders/AtmospherePreCompute.flax
(Stored with Git LFS)
BIN
Content/Shaders/AtmospherePreCompute.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/BakeLightmap.flax
(Stored with Git LFS)
BIN
Content/Shaders/BakeLightmap.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/BitonicSort.flax
(Stored with Git LFS)
BIN
Content/Shaders/BitonicSort.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/CAS.flax
(Stored with Git LFS)
BIN
Content/Shaders/CAS.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/ColorGrading.flax
(Stored with Git LFS)
BIN
Content/Shaders/ColorGrading.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/DebugDraw.flax
(Stored with Git LFS)
BIN
Content/Shaders/DebugDraw.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/DepthOfField.flax
(Stored with Git LFS)
BIN
Content/Shaders/DepthOfField.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Editor/Grid.flax
(Stored with Git LFS)
BIN
Content/Shaders/Editor/Grid.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Editor/LightmapUVsDensity.flax
(Stored with Git LFS)
BIN
Content/Shaders/Editor/LightmapUVsDensity.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Editor/MaterialComplexity.flax
(Stored with Git LFS)
BIN
Content/Shaders/Editor/MaterialComplexity.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Editor/QuadOverdraw.flax
(Stored with Git LFS)
BIN
Content/Shaders/Editor/QuadOverdraw.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Editor/VertexColors.flax
(Stored with Git LFS)
BIN
Content/Shaders/Editor/VertexColors.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/EyeAdaptation.flax
(Stored with Git LFS)
BIN
Content/Shaders/EyeAdaptation.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/FXAA.flax
(Stored with Git LFS)
BIN
Content/Shaders/FXAA.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Fog.flax
(Stored with Git LFS)
BIN
Content/Shaders/Fog.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Forward.flax
(Stored with Git LFS)
BIN
Content/Shaders/Forward.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/GBuffer.flax
(Stored with Git LFS)
BIN
Content/Shaders/GBuffer.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/GI/DDGI.flax
(Stored with Git LFS)
BIN
Content/Shaders/GI/DDGI.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/GI/GlobalSurfaceAtlas.flax
(Stored with Git LFS)
BIN
Content/Shaders/GI/GlobalSurfaceAtlas.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/GPUParticlesSorting.flax
(Stored with Git LFS)
BIN
Content/Shaders/GPUParticlesSorting.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/GUI.flax
(Stored with Git LFS)
BIN
Content/Shaders/GUI.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/GlobalSignDistanceField.flax
(Stored with Git LFS)
BIN
Content/Shaders/GlobalSignDistanceField.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Histogram.flax
(Stored with Git LFS)
BIN
Content/Shaders/Histogram.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Lights.flax
(Stored with Git LFS)
BIN
Content/Shaders/Lights.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/MotionBlur.flax
(Stored with Git LFS)
BIN
Content/Shaders/MotionBlur.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/MultiScaler.flax
(Stored with Git LFS)
BIN
Content/Shaders/MultiScaler.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/PostProcessing.flax
(Stored with Git LFS)
BIN
Content/Shaders/PostProcessing.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/ProbesFilter.flax
(Stored with Git LFS)
BIN
Content/Shaders/ProbesFilter.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Quad.flax
(Stored with Git LFS)
BIN
Content/Shaders/Quad.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Reflections.flax
(Stored with Git LFS)
BIN
Content/Shaders/Reflections.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/SDF.flax
(Stored with Git LFS)
BIN
Content/Shaders/SDF.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/SMAA.flax
(Stored with Git LFS)
BIN
Content/Shaders/SMAA.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/SSAO.flax
(Stored with Git LFS)
BIN
Content/Shaders/SSAO.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/SSR.flax
(Stored with Git LFS)
BIN
Content/Shaders/SSR.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Shadows.flax
(Stored with Git LFS)
BIN
Content/Shaders/Shadows.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/Sky.flax
(Stored with Git LFS)
BIN
Content/Shaders/Sky.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/TAA.flax
(Stored with Git LFS)
BIN
Content/Shaders/TAA.flax
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Shaders/VolumetricFog.flax
(Stored with Git LFS)
BIN
Content/Shaders/VolumetricFog.flax
(Stored with Git LFS)
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
|
||||
# Copyright (c) Wojciech Figat. All rights reserved
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
|
||||
# Copyright (c) Wojciech Figat. All rights reserved
|
||||
|
||||
# Fix mono bin to be in a path
|
||||
#export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
if not exist "Development\Scripts\Windows\GetMSBuildPath.bat" goto Error_InvalidLocation
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set MSBUILD_PATH=
|
||||
|
||||
|
||||
@@ -4,15 +4,16 @@
|
||||
"Major": 1,
|
||||
"Minor": 10,
|
||||
"Revision": 0,
|
||||
"Build": 6702
|
||||
"Build": 6705
|
||||
},
|
||||
"Company": "Flax",
|
||||
"Copyright": "Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.",
|
||||
"Copyright": "Copyright (c) 2012-2025 Wojciech Figat. All rights reserved.",
|
||||
"GameTarget": "FlaxGame",
|
||||
"EditorTarget": "FlaxEditor",
|
||||
"Configuration": {
|
||||
"UseCSharp": true,
|
||||
"UseLargeWorlds": false,
|
||||
"UseDotNet": true
|
||||
"UseDotNet": true,
|
||||
"UseSDL": true
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
@echo off
|
||||
:: Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
:: Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -12,6 +12,6 @@ cd "`dirname "$0"`"
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --genproject "$@"
|
||||
|
||||
# Build bindings for all editor configurations
|
||||
echo Building C# bindings...
|
||||
#echo Building C# bindings...
|
||||
# TODO: Detect the correct architecture here
|
||||
Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=ARM64 -platform=Mac --buildTargets=FlaxEditor
|
||||
#Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=ARM64 -platform=Mac --buildTargets=FlaxEditor
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
echo Performing the full package...
|
||||
|
||||
rem Run the build tool.
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
if errorlevel 1 goto BuildToolFailed
|
||||
|
||||
popd
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
echo Building and packaging Flax Editor...
|
||||
|
||||
rem Run the build tool.
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
if errorlevel 1 goto BuildToolFailed
|
||||
|
||||
popd
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging Flax Editor...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployEditor --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployEditor --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging Flax Editor...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployEditor --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployEditor --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd
|
||||
echo Building and packaging platforms data...
|
||||
|
||||
rem Run the build tool.
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
|
||||
if errorlevel 1 goto BuildToolFailed
|
||||
|
||||
popd
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging platforms data...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployPlatforms --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployPlatforms --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
# Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
set -e
|
||||
|
||||
@@ -9,4 +9,4 @@ echo Building and packaging platforms data...
|
||||
cd "`dirname "$0"`"
|
||||
|
||||
# Run Flax.Build (also pass the arguments)
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployPlatforms --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployPlatforms --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@echo off
|
||||
|
||||
rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
rem Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
setlocal
|
||||
pushd %~dp0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
#include "EditorAnalytics.h"
|
||||
#include "Editor/Editor.h"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using FlaxEditor.Scripting;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
namespace FlaxEditor.Content.Create
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
@@ -18,32 +18,32 @@ namespace FlaxEditor.Content.Create
|
||||
public enum Templates
|
||||
{
|
||||
/// <summary>
|
||||
/// The empty asset.
|
||||
/// An empty emitter.
|
||||
/// </summary>
|
||||
Empty,
|
||||
|
||||
/// <summary>
|
||||
/// The simple particle system that uses constant emission rate.
|
||||
/// An emitter that emits particles at a constant emission rate.
|
||||
/// </summary>
|
||||
ConstantBurst,
|
||||
|
||||
/// <summary>
|
||||
/// The simple periodic burst particle system.
|
||||
/// An emitter that produces simple, periodic bursts of particles.
|
||||
/// </summary>
|
||||
PeriodicBurst,
|
||||
|
||||
/// <summary>
|
||||
/// The layers and tags settings.
|
||||
/// An emitter that uses a blended spritesheet to produce a smooth, thick cloud of smoke.
|
||||
/// </summary>
|
||||
Smoke,
|
||||
|
||||
/// <summary>
|
||||
/// The GPU sparks with depth-buffer collisions.
|
||||
/// A GPU emitter that produces sparks that can collide, thanks to depth-buffer based collisions.
|
||||
/// </summary>
|
||||
Sparks,
|
||||
|
||||
/// <summary>
|
||||
/// The ribbon spiral particles.
|
||||
/// An emitter that produces a spiral shaped ribbon.
|
||||
/// </summary>
|
||||
RibbonSpiral,
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using FlaxEditor.Scripting;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using FlaxEngine;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEditor.GUI;
|
||||
using FlaxEditor.GUI.ContextMenu;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEngine;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
namespace FlaxEditor.Content.Import
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using FlaxEditor.CustomEditors.Editors;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.IO;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using FlaxEditor.CustomEditors.Editors;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEngine;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using FlaxEngine;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEngine;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -282,7 +282,7 @@ namespace FlaxEditor.Content
|
||||
|
||||
if (data is DragDataFiles)
|
||||
return DragDropEffect.Copy;
|
||||
return _dragOverItems.Effect;
|
||||
return _dragOverItems?.Effect ?? DragDropEffect.None;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEngine;
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace FlaxEditor.Content
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override string TypeDescription => Path.EndsWith(".h") ? "C++ Header File" : "C++ Source Code";
|
||||
public override string TypeDescription => Path.EndsWith(".h") || Path.EndsWith(".hpp") ? "C++ Header File" : "C++ Source Code";
|
||||
|
||||
/// <inheritdoc />
|
||||
public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.CPPScript128;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using FlaxEngine;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using FlaxEngine;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Text;
|
||||
using FlaxEngine;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System;
|
||||
using FlaxEngine;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user