1
1

Compare commits

..

2377 Commits

Author SHA1 Message Date
57b2948937 WIP changes 2020-08-03 19:05:46 +02:00
9481e660a5 Fixed crash when creating a new particle system with any colliders 2020-06-25 15:55:44 +02:00
e10c28b25f update comment 2020-06-25 14:30:58 +02:00
de0983f3c4 Use the triangle normal if the hit point lies inside the triangle 2020-06-25 13:24:53 +02:00
34734aeda3 Deduplicated the "nudge particle out of face" code 2020-06-24 19:07:32 +02:00
2ccdf41da6 Clamp bayu weights to prevent extrapolated velocity values 2020-06-24 18:40:42 +02:00
105d94aa2b Minor clean up 2020-06-24 09:58:44 +02:00
f9ba4d27d8 Added a variable to keep track of delta time collision for colliders 2020-06-22 18:27:52 +02:00
ed69983ec2 Added friction and fixed some issue that were discovered when doing so. 2020-06-22 13:30:22 +02:00
6f78ad7495 Deflection fixes and cleanup 2020-06-18 22:49:46 +02:00
94871abc17 Update velocity calculation to be better and move the normal constraint check 2020-06-18 20:17:02 +02:00
382b15d445 Make colliders be able to push particles even if dampeing is 1 2020-06-10 03:40:12 +02:00
42c974ee02 Fixed "popping" and some tunneling issues with moving colliders 2020-06-04 19:15:09 +02:00
fb91940884 Calculate normals from collision triangles using the closest point 2020-06-02 16:42:08 +02:00
c4917c8521 Fix particles colliding twice because they didn't have time to move 2020-05-06 17:19:49 +02:00
123aad6a2c Hooked up perlimenary dampening and multiple collision per time step 2020-05-06 12:34:37 +02:00
8ddef923bc More experiments 2020-04-30 04:24:07 +02:00
2893c8c218 More tweaking to the collision reponse. 2020-04-29 17:16:58 +02:00
c3ce36fdc4 Simplified the moving triangle collision check algo 2020-04-03 15:16:18 +02:00
2d1a2ac21d Work on trying to get the collision responses of moving object correct
Still broken now though...
2020-04-03 12:59:26 +02:00
81d5a62f73 Fixed radius collision calculation and fixed the collision detection logic 2020-04-01 17:49:32 +02:00
c089d7b4d1 Changed some data types based on feedback 2020-04-01 13:16:15 +02:00
b0241b18c9 Solved a threading issue and made moving object collisions be detected 2020-04-01 12:01:25 +02:00
642c113c7e Hooked up (non working) moving object collision detection 2020-03-20 15:04:48 +01:00
15d91693e2 Inital work on getting particle collisions with the collision modifier 2020-03-13 12:10:32 +01:00
5f96f79343 store some more information for collision objects 2020-03-10 11:25:16 +01:00
4e6dc02f63 simplify interface for a new solver 2020-03-10 10:37:17 +01:00
10c73f79fa simple collision object node 2020-03-09 16:05:24 +01:00
78d8e9f962 fix after merge 2020-03-09 15:30:52 +01:00
4f8b24e0c5 Merge branch 'master' into functions 2020-03-09 15:27:27 +01:00
8471b2f22e Merge branch 'master' into functions 2020-03-05 11:41:38 +01:00
743443ac14 fix after merge 2020-03-02 15:44:31 +01:00
7686f1a8fe Merge branch 'master' into functions 2020-03-02 15:36:29 +01:00
b350b85aba Merge branch 'master' into functions 2020-03-02 10:59:03 +01:00
87d20d7c92 remove leftovers from initial simulation node tree 2020-02-28 13:42:46 +01:00
ee292426a7 Merge branch 'master' into functions 2020-02-28 13:31:11 +01:00
4ed7334ef6 Merge branch 'master' into functions 2020-02-28 09:01:15 +01:00
b92b1a4fe5 Use new LinearAllocatedVector in various places 2020-02-23 17:37:15 +01:00
096856a700 new LinearAllocatedVector<T>
This is a vector that does not own the memory its elements are stored in.
Instead, a linear allocator is passed to every call to `append`, that will
be used if the vector has to grow. Since a linear allocator does not support
deallocation, no memory is dealloced until the linear allocator is destructed.

This structure can be used when many small vectors of initially unknown
size are required.
2020-02-23 17:35:47 +01:00
beed795e5a Merge branch 'master' into functions 2020-02-23 15:25:05 +01:00
fcfe9784cb Merge branch 'master' into functions 2020-02-20 09:27:28 +01:00
3b1c34267b improve copying StringRef to new buffer 2020-02-19 11:49:03 +01:00
3fe710aeaf Merge branch 'master' into functions 2020-02-19 10:17:36 +01:00
6399bfcee3 add missing include 2020-02-17 15:32:19 +01:00
7f35aa99c7 Merge branch 'master' into functions 2020-02-17 15:07:46 +01:00
1945a23259 Merge branch 'master' into functions 2020-02-17 10:47:28 +01:00
fad8e475c7 remove UNUSED_FUNCTION_NDEBUG macro again 2020-02-16 12:45:25 +01:00
b80585ba30 remove unused code 2020-02-16 12:41:01 +01:00
ecc78d29d6 bring back more correct duplicate removal 2020-02-16 12:39:16 +01:00
4d74116218 initial MultiFunctionID 2020-02-15 17:55:18 +01:00
bd42f7c275 remove operation hash of functions, a more reliable system is necessary 2020-02-15 17:52:52 +01:00
e543c9ad32 add global sin and cos functions 2020-02-14 11:40:02 +01:00
bdd69570e2 make naming more consistent 2020-02-14 11:31:23 +01:00
3e533af702 make some functions more reusable 2020-02-14 11:29:49 +01:00
8363204347 use faster CPPType access 2020-02-14 11:03:32 +01:00
0e0f6a9216 provide faster access to builtin CPPTypes 2020-02-14 10:59:37 +01:00
2b83d33032 Merge branch 'master' into functions 2020-02-14 10:01:16 +01:00
4526aa70e5 remove unused timers 2020-02-13 19:01:28 +01:00
1df94f6257 remove obselete BLI_math_cxx.h file 2020-02-13 18:58:34 +01:00
9564cd045a remove lazy init code 2020-02-13 18:44:50 +01:00
de23a2c35b remove lazy init usage 2020-02-13 18:39:38 +01:00
fd46b5e9fe remove lazy init usage 2020-02-13 18:33:56 +01:00
10927b6747 fix allocator usage for StringMap 2020-02-13 18:33:42 +01:00
ba1fcdf41a give test node a poll function 2020-02-13 18:33:29 +01:00
9906e5313b remove usage of lazy init macro 2020-02-13 18:21:15 +01:00
2e1d18600f remove unused code 2020-02-13 18:16:31 +01:00
e4343f6aa2 add license headers 2020-02-13 18:08:38 +01:00
953b8d6066 cleanup 2020-02-13 17:59:32 +01:00
f943f4f99c move rgba_b and rgba_f to separate file 2020-02-13 17:59:05 +01:00
350bc04f56 move float3 -> float2 conversion to different file 2020-02-13 17:55:15 +01:00
9933b5bc27 move float4x4 into separate file 2020-02-13 17:53:03 +01:00
2e950e3b89 move float2 to separate file 2020-02-13 17:47:04 +01:00
bb4b0cc954 move float3 to separate file 2020-02-13 17:45:26 +01:00
1c81255cdb try socket decl in c++ 2020-02-13 15:07:02 +01:00
90b41c7c2f create socket in new node 2020-02-13 12:52:29 +01:00
2630b4c231 new node type for testing 2020-02-13 12:43:01 +01:00
630da3b5e3 Initial builtin simulation node tree type 2020-02-13 12:04:41 +01:00
a88db0aa7d fix warning 2020-02-13 11:53:15 +01:00
f72b3f33a0 define UNUSED_FUNCTION_NDEBUG macro 2020-02-13 11:53:05 +01:00
2c077e741d test commit with different email 2020-02-13 11:12:18 +01:00
94c410a5af Merge branch 'master' into functions 2020-02-13 11:07:28 +01:00
a2a8932981 cleanup 2020-02-12 20:32:48 +01:00
e4a3186aad fix after merge 2020-02-12 19:02:03 +01:00
dc89a3ec7c Merge branch 'master' into functions 2020-02-12 19:00:59 +01:00
b4bf6b9cc9 remove pad_up function 2020-02-10 16:23:14 +01:00
2d36836616 cleanup dot export 2020-02-10 14:46:44 +01:00
0b9888d038 fix after merge 2020-02-10 14:40:04 +01:00
43e2ca8fd1 Merge branch 'master' into functions 2020-02-10 14:23:37 +01:00
8cda8bef1e Merge branch 'master' into functions 2020-02-10 14:14:16 +01:00
ff21d33bfe Don't allow getting mutable reference to vector set 2020-02-10 13:32:02 +01:00
bae72c4b8e remove unused classes 2020-02-10 13:27:30 +01:00
23b52a1958 remove unused class 2020-02-10 13:24:46 +01:00
6218f315bb remove unused class 2020-02-10 12:58:20 +01:00
3f65050354 remove unused classes 2020-02-10 12:53:44 +01:00
f363ff348c remove temporary allocator 2020-02-10 12:42:24 +01:00
003dc7ffc9 fix after merge 2020-02-10 12:26:14 +01:00
605928c15b Merge branch 'master' into functions 2020-02-10 12:01:07 +01:00
9880bebd1a improve linear allocator 2020-02-10 11:47:17 +01:00
9677fbe029 rename MonotonicAllocator to LinearAllocator 2020-02-10 10:51:18 +01:00
6989f9be3d add StringRef.substr method 2020-02-10 09:53:33 +01:00
ce14c2c7bd store default value per CPPType 2020-02-06 16:44:32 +01:00
09149b4f0d Zero initialize before default construction to make it more deterministic 2020-02-06 15:42:08 +01:00
cb46cc6705 Merge branch 'master' into functions 2020-02-05 17:34:24 +01:00
8fa26bf7e1 disable duplicate removal 2020-02-05 10:26:33 +01:00
cf59daf62f fix killing particles 2020-02-04 16:48:46 +01:00
601ed4061a cleanup 2020-02-02 14:17:49 +01:00
6905633e57 fix generating operation hash
this needs some more work
2020-02-02 14:17:39 +01:00
79b3de9a63 assert data types when inserting links 2020-02-02 14:16:58 +01:00
975decb5e3 new Vector Length node 2020-02-02 14:16:21 +01:00
58ec7b44fe fix memory leak 2020-02-02 12:39:13 +01:00
57a063f599 new normalize vector node 2020-02-02 12:37:59 +01:00
d944146ebe fix stack use out of scope error 2020-02-02 12:26:37 +01:00
2e5ab9640e vectorize Map Range node 2020-02-02 12:26:11 +01:00
7c06e2e8d2 new ceil and floor float nodes 2020-02-02 11:43:33 +01:00
a20c781343 Merge branch 'master' into functions 2020-02-02 10:40:56 +01:00
599e8f7bb1 cleanup same size asserts 2020-02-01 11:58:50 +01:00
26f4fa9de7 utility to add input/output dummy nodes 2020-02-01 11:37:36 +01:00
e52941fe5b utility for printing arrays 2020-02-01 11:34:57 +01:00
337b918b92 missing value forwarding 2020-01-29 21:21:10 +01:00
323c20bbb7 remove unused data structure 2020-01-29 21:18:41 +01:00
a11b21f1eb Merge branch 'master' into functions 2020-01-29 21:14:40 +01:00
2430d76b1e Write to output buffer directly instead of doing a copy in the end 2020-01-29 21:05:07 +01:00
9e490d7cf5 make naming more specific 2020-01-29 19:07:23 +01:00
2929bc8d7e cleanup 2020-01-29 18:56:49 +01:00
a5470fe0ca cleanup 2020-01-29 18:47:51 +01:00
06ddde0daa new way to construct custom functions at compile time 2020-01-29 18:43:52 +01:00
477d15998c add utility function 2020-01-27 23:04:02 +01:00
e8ea904cee fix compile error 2020-01-27 23:03:54 +01:00
d17a352f23 Merge branch 'master' into functions 2020-01-27 22:13:42 +01:00
787f6c8a7e enable node tree optimizations 2020-01-27 22:05:55 +01:00
f6334efbd8 cleanup naming 2020-01-27 22:05:44 +01:00
3a27fb824e fix typo 2020-01-27 21:57:50 +01:00
a39dc76dec pass buffer cache to functions via context 2020-01-27 21:30:59 +01:00
3f29c1dd39 remove array allocator 2020-01-27 21:08:12 +01:00
b4a5df88fa try using BufferCache instead of ArrayAllocator 2020-01-27 21:07:03 +01:00
9c0cd8d7a3 cleanup 2020-01-27 16:36:26 +01:00
62bc3b2716 cleanup 2020-01-27 16:23:23 +01:00
fb953e0d8d restructure file 2020-01-27 16:04:48 +01:00
92b5b1fb69 cleanup naming 2020-01-27 15:59:41 +01:00
638a48885a cleanup 2020-01-27 15:41:10 +01:00
45619f2f2f cleanup 2020-01-27 15:40:24 +01:00
1824b8fb52 make single element execution work again 2020-01-26 21:56:41 +01:00
cbadf3e29a cleanup warning 2020-01-26 21:55:32 +01:00
e7a9d2ce96 cleanup 2020-01-26 21:00:34 +01:00
a5b08c1d95 minor improvement 2020-01-26 20:56:05 +01:00
0116cc1f4d fix 2020-01-26 20:54:09 +01:00
4141c905f3 cleanup 2020-01-26 20:50:02 +01:00
4202a208c2 compute dependency depths in network implementation 2020-01-26 20:39:41 +01:00
8c45804a1c initial deepest depth first heuristic 2020-01-26 17:26:45 +01:00
97b6d31f41 use new network evaluation storage 2020-01-26 13:16:43 +01:00
24724b70f0 new network evaluation storage (unused so far) 2020-01-26 12:32:11 +01:00
8667a87134 Revert "try storing values per input differently"
This reverts commit fee675ffe0.
2020-01-26 11:06:54 +01:00
fee675ffe0 try storing values per input differently 2020-01-23 16:02:24 +01:00
ce3ec2f172 remove print 2020-01-23 16:01:55 +01:00
3ad9ccaba7 initial array allocator 2020-01-23 15:15:29 +01:00
dae7527f4f Merge branch 'master' into functions 2020-01-23 14:31:59 +01:00
9f63f863f1 Merge branch 'master' into functions 2020-01-23 12:34:12 +01:00
83d5b3be12 disable optimizations 2020-01-19 12:44:21 +01:00
2e28fc0dd6 cleanup 2020-01-19 12:31:07 +01:00
c5868657aa support for deduplicating many more functions 2020-01-19 12:24:12 +01:00
04bfe684c9 rename 2020-01-19 12:06:24 +01:00
e1a5d15d95 set more operation hashes 2020-01-19 12:05:54 +01:00
00b1399593 deduplicate Particle Attribute node 2020-01-19 11:47:56 +01:00
85c43fbd2e store a random hash per type 2020-01-19 11:47:43 +01:00
65237b2346 support deduplicating vectorized nodes 2020-01-19 11:39:00 +01:00
35af9ecd3d support deduplicating all math nodes 2020-01-19 11:35:22 +01:00
32b02c13d8 operation hash for converters 2020-01-19 11:10:34 +01:00
bf74ef2e40 should not iterate over array that is being changed 2020-01-19 11:10:18 +01:00
b40bdad104 utility to generate constant random numbers per line 2020-01-19 10:57:14 +01:00
ea5fa56ca9 disable optimizations for now 2020-01-18 20:15:20 +01:00
0db9e85a7a replace Vector.index with Vector.index_try 2020-01-18 20:10:53 +01:00
5697fd53f2 implement initial Remove Duplicates optimization 2020-01-18 20:03:10 +01:00
4afdb40b4e set operation hash for some functions 2020-01-18 20:00:14 +01:00
296fd08875 support for storing operation hash per function 2020-01-18 19:59:40 +01:00
03f51bf4e1 add utilities to MFNetworkBuilder 2020-01-18 19:59:01 +01:00
a73b17564c fix Vector.remove_first_occurrence_and_reorder 2020-01-18 19:58:37 +01:00
2b0041e4dd new Optional.set_new methods 2020-01-18 19:58:28 +01:00
7dad14ae79 simplify constant folding 2020-01-18 18:20:16 +01:00
40bac586dc improve naming 2020-01-18 17:54:54 +01:00
f439518781 Merge branch 'functions' into network-builder-refactor 2020-01-18 17:24:13 +01:00
ed89a010cb Merge branch 'master' into functions 2020-01-18 17:23:52 +01:00
0982fdccd9 fix alignment in BLI::Optional 2020-01-16 21:59:00 +01:00
d8ca0ea86d cleanup dead node elimination 2020-01-11 17:15:52 +01:00
f6c377aa5b remove unused nodes optimization 2020-01-11 16:35:35 +01:00
4684b69405 give nodes and sockets an id again 2020-01-11 16:09:06 +01:00
d46ac7934a add utility to debug allocated amount in monotonic allocator 2020-01-11 15:56:37 +01:00
238059ac2a store network more compactly 2020-01-11 15:51:06 +01:00
41df03637e store data in network builder more compactly 2020-01-11 15:34:52 +01:00
090ae9aefe avoid unnecessary type casting 2020-01-11 14:09:09 +01:00
6aa7a269ae remove nodes after constant folding 2020-01-11 13:21:18 +01:00
8ddf71d880 initial network builder refactor to enable support for removing nodes 2020-01-11 12:59:37 +01:00
2d7fee45d6 add method to access all nodes 2020-01-11 10:40:26 +01:00
d54eebbfa7 support constant folding for vectors 2020-01-09 17:41:10 +01:00
f1fc372df1 move constant functions to separate file 2020-01-09 17:20:33 +01:00
c8afdc93f9 Merge branch 'master' into functions 2020-01-09 17:09:36 +01:00
c2c6d152ad Merge branch 'master' into functions 2020-01-05 16:37:20 +01:00
66fdcd5f33 minor fixes 2020-01-04 16:38:09 +01:00
e3ee421314 better to string conversion for generic types 2020-01-04 16:21:03 +01:00
83308760a2 initial constant folding of multi function network 2020-01-04 16:07:59 +01:00
f526c8d303 rename Stack.empty to Stack.is_empty 2020-01-04 14:42:39 +01:00
d95b52f1c9 cleanup link insertion 2020-01-04 14:25:53 +01:00
6b9e7dc585 simplify conversion insertion 2020-01-04 13:59:39 +01:00
bc48280fed refactor: extract methods 2020-01-04 13:42:39 +01:00
7a931deab2 simplify names 2020-01-04 13:37:27 +01:00
b7f6be1b8b simplify names 2020-01-04 13:27:56 +01:00
9c20241272 simplify names 2020-01-04 13:26:17 +01:00
b2fb025153 rename FunctionNodeTree to FunctionTree 2020-01-04 13:24:29 +01:00
5e49e3df6e move code into sub namespace 2020-01-04 13:23:35 +01:00
5bbc1b2e16 refactor: initial removal of FunctionTreeMFNetworkBuilder 2020-01-04 13:17:33 +01:00
ea9282cbd6 extract class for managing the socket mapping 2020-01-03 15:02:41 +01:00
2c68bb3e51 cleanup naming 2020-01-03 14:43:00 +01:00
c505fc4d23 cleanup naming 2020-01-03 14:41:18 +01:00
4063e6c058 extract actual build step from builder 2020-01-03 14:30:47 +01:00
be23e6e2f2 extract members from builder 2020-01-03 14:21:17 +01:00
b7a8ef4b9f replace IdMultiMap with more generic IndexToRefMultiMap 2020-01-03 14:16:58 +01:00
1934749029 cleanup 2020-01-03 13:44:54 +01:00
35aaf2fe51 use IndexToRefMap instead of IndexMap 2020-01-03 13:40:31 +01:00
9c2e7a4e1c only map dummy sockets when function network has been created 2020-01-03 13:17:37 +01:00
e083ab2d02 remove unused method 2020-01-03 12:51:12 +01:00
2b00e17124 extract IdMultiMap data structure 2020-01-03 12:44:41 +01:00
089ee94b88 add missing hash function 2020-01-03 12:06:22 +01:00
ab3498b057 Merge branch 'master' into functions 2020-01-03 11:39:41 +01:00
7d4fb6880e use BLI::parallel_for when creating tetrahedons 2020-01-02 17:14:30 +01:00
d238e6410f improve copying of generic data 2020-01-02 17:09:02 +01:00
187844f712 use StringMultiMap in more places 2020-01-02 16:37:17 +01:00
6732a03531 introduce StringMultiMap 2020-01-02 16:28:55 +01:00
8753f92cb2 utility to iterate over string map in parallel 2020-01-02 16:05:41 +01:00
0ebb98ab3d cleanup 2020-01-02 15:49:41 +01:00
30b50638a0 rename index_iterator to index_range 2020-01-02 15:22:20 +01:00
25fc970f44 move tbb wrappers to blenlib 2020-01-02 15:20:44 +01:00
1e2401a5ff more parallelization 2020-01-02 15:12:26 +01:00
2025065931 simulate particles in parallel 2020-01-02 14:58:39 +01:00
169bdd890f extract method 2020-01-02 14:43:46 +01:00
ecfed4d70f cleanup parallel for/invoke 2020-01-02 14:39:52 +01:00
8a8223c193 cleanup parallel for 2020-01-02 14:36:07 +01:00
1273af1bdd simulate particle systems in parallel 2020-01-02 14:31:38 +01:00
3e325b42bb run emitters in parallel 2020-01-02 14:23:12 +01:00
f12b544515 new multi map implementation that can deal with non trivial types 2020-01-02 14:06:21 +01:00
fb512bfa3d initial working version with ParticleSet 2020-01-02 13:18:12 +01:00
0099355bc6 continue with ParticleSet 2019-12-31 16:48:01 +01:00
799fb759a7 improve particle set 2019-12-31 15:35:08 +01:00
0cda96f1be initial particle set 2019-12-31 14:59:58 +01:00
c2d3708224 introduce MutableAttributesRef 2019-12-31 14:59:48 +01:00
36221652a4 rename various types and variables 2019-12-31 14:17:44 +01:00
7ed83e0bee Move inlined node tree to functions folder 2019-12-31 13:53:48 +01:00
06e7d91f55 Merge branch 'master' into functions 2019-12-31 13:40:45 +01:00
4e0c2a8abd Merge branch 'master' into functions 2019-12-30 13:35:53 +01:00
04c0c92f87 use less generic tbb include 2019-12-28 13:28:06 +01:00
ad58b620b2 make surface hooks work in function deform/points modifiers 2019-12-28 12:23:17 +01:00
d7f18db74a fix evaluation of single input math function with constant input 2019-12-28 12:13:09 +01:00
1eca32bb84 improve usage of TBB 2019-12-28 11:29:34 +01:00
4601ea8f82 Merge branch 'master' into functions 2019-12-28 11:13:44 +01:00
bf4f376060 simplify some names 2019-12-22 15:04:13 +01:00
ee8dfc0062 replace time span with float interval 2019-12-22 14:21:25 +01:00
335b5bc540 cleanup influences collector 2019-12-22 13:53:24 +01:00
7250dfeb2e cleanup 2019-12-22 13:44:27 +01:00
feb938dfb8 remove task c++ wrapper in favor of tbb 2019-12-22 13:42:46 +01:00
4b8cd2cebd use tbb for parallel code 2019-12-22 13:22:55 +01:00
64b707eb67 use IndexMask in more places 2019-12-22 12:48:55 +01:00
f85c4ca3ae cleanup 2019-12-22 12:40:44 +01:00
a80ffa4bc5 cleanup usage of IndexMask 2019-12-22 12:37:42 +01:00
866894454f use IndexMask in more places 2019-12-22 12:32:43 +01:00
717beed8d7 cleanup naming 2019-12-22 12:26:34 +01:00
03dbcd82a4 cleanup naming 2019-12-22 11:10:54 +01:00
9c68e2ecc9 speedup multi function evaluation 2019-12-22 10:58:28 +01:00
b4b25eac9a access event filter duration in node tree 2019-12-20 17:43:13 +01:00
bed1a7cdb7 change some pointers to references 2019-12-20 17:09:23 +01:00
6600c532c4 change particle function evaluation api 2019-12-20 17:01:14 +01:00
81573c53b6 replace compare node 2019-12-20 16:43:04 +01:00
d00557bd19 use IndexMask in more places 2019-12-20 16:37:50 +01:00
dca21ef42f start improving custom events 2019-12-20 16:19:38 +01:00
70ada64a98 use index mask in event interface 2019-12-20 15:44:47 +01:00
d40031df15 remove event storage concept 2019-12-20 15:39:17 +01:00
adfd43db6b new Node Instance Identifier node 2019-12-20 15:22:21 +01:00
aabe38f06c change names displayed in search 2019-12-20 15:03:10 +01:00
a183cc3c4e handle not-found linked groups better 2019-12-20 14:59:33 +01:00
3b65445f4e Merge branch 'master' into functions 2019-12-20 14:21:54 +01:00
a549241728 bring back functionality of old actions 2019-12-19 15:52:10 +01:00
b3c93cfe90 initial ParticleAction class 2019-12-19 14:59:43 +01:00
35ee68ab69 fix when there is no nodelib 2019-12-19 14:58:11 +01:00
6caf9be863 remove variation input of age reached node 2019-12-19 14:35:40 +01:00
1b6e9574a6 leave group when active node is not selected 2019-12-19 14:14:26 +01:00
e8990fd220 cache node group names in .blend file 2019-12-19 13:21:06 +01:00
a1f79adde9 improve debug dot output 2019-12-19 13:17:38 +01:00
6cc8f3cd71 remove builtin group nodes 2019-12-19 13:11:33 +01:00
3c519d4917 new Join Text List node 2019-12-19 12:58:07 +01:00
9d885235eb better float3 printing 2019-12-19 12:38:37 +01:00
e97a45ef8c replace Kill Particle node with group 2019-12-19 12:24:51 +01:00
74eeb7a759 improve debug dot output 2019-12-19 12:12:24 +01:00
ed64bcfb71 remove Particle Info node 2019-12-19 11:53:30 +01:00
c78896e675 cleanup 2019-12-19 11:47:43 +01:00
aae54f903c fix path filter 2019-12-19 11:46:33 +01:00
98376bc8ee automatically load node groups from nodelib 2019-12-19 11:41:21 +01:00
150d76aa7b handle unknown node better 2019-12-19 11:24:38 +01:00
3d4f0fe7fe remove mockup nodes 2019-12-19 11:17:23 +01:00
e733615650 remove actions that can be build as node groups 2019-12-19 10:52:12 +01:00
54fe936849 remove unused action 2019-12-19 10:37:21 +01:00
136ac83c82 change IndexMask constructor 2019-12-19 10:37:13 +01:00
7b0ddb2420 replace MFMask with IndexMask 2019-12-19 10:11:31 +01:00
717283c038 Merge branch 'master' into functions 2019-12-19 09:49:43 +01:00
15c15d95e9 fix missing include 2019-12-18 15:21:26 +01:00
f72a4ab0af Remove Explode Particle node 2019-12-18 15:03:15 +01:00
a7ce3fc324 use Tab to open/close groups 2019-12-18 14:59:27 +01:00
7329734ec2 fix file load error 2019-12-18 14:59:09 +01:00
545e1b60f1 implement start-stop mode in Float Range node 2019-12-18 13:53:16 +01:00
5c90bec61e simplify socket identifiers 2019-12-18 13:38:51 +01:00
ec6fc1aaec support for inserting group nodes from search 2019-12-18 13:34:26 +01:00
17d18351c6 extract method to find callable trees 2019-12-18 13:17:49 +01:00
1c7e0b1755 improve node layout of group nodes 2019-12-18 13:11:48 +01:00
9fa91b8719 support for sampling random vectors in a sphere 2019-12-18 13:04:45 +01:00
c6cf1082cb new Multiply Vector with Float node 2019-12-18 12:53:02 +01:00
68b8979137 new Vector from Value node 2019-12-18 12:39:02 +01:00
4c5332cae7 new Random Vectors node 2019-12-18 12:31:19 +01:00
ceb5471884 improve Random Vector node 2019-12-18 12:11:02 +01:00
375ac4f37a new Random Vector node 2019-12-18 11:42:42 +01:00
06adff95b4 cleanup Spawn Particles node 2019-12-18 11:18:55 +01:00
6bb09a50fb support for computing vectors per particle 2019-12-18 11:06:55 +01:00
298b0cd863 Remove Action Context concept for now 2019-12-18 10:04:53 +01:00
e810f4dd7b Merge branch 'master' into functions 2019-12-18 09:54:06 +01:00
2d1cd3076f fix missing update 2019-12-17 15:05:39 +01:00
ced689a43a new Random Floats node 2019-12-17 14:48:05 +01:00
d16d58e6f9 show position attribute by default 2019-12-17 13:52:45 +01:00
79c5b4d4af fix socket drawing 2019-12-17 13:36:53 +01:00
ccc8d664fc initial Spawn Action node 2019-12-17 13:28:38 +01:00
71124e192f minor changes 2019-12-17 13:27:49 +01:00
e1e1069b45 initial spawn node ui 2019-12-17 12:04:09 +01:00
57ab7cefdd introduce ScopedVector 2019-12-17 11:48:33 +01:00
bd5be7c70a Rename TemporaryVector/Array to LargeScopedVector/Array 2019-12-17 11:40:26 +01:00
0144b11673 Support inline storage in BLI::Array 2019-12-17 11:35:13 +01:00
ae44dad2e1 cleanup 2019-12-17 11:18:25 +01:00
c03bb9db0d store name of node and sockets in dummy node 2019-12-17 11:13:00 +01:00
1fd9485a51 set dot background color utility 2019-12-17 11:12:19 +01:00
54229b8e82 support for removing execute sockets 2019-12-17 10:39:32 +01:00
eba730f986 Simplify execute socket naming 2019-12-17 10:09:25 +01:00
fba5b503f5 fix after merge 2019-12-17 09:46:17 +01:00
9a3b370061 Merge branch 'master' into functions 2019-12-17 09:34:13 +01:00
2b84a7d5b0 fix wrong comparison 2019-12-14 18:33:39 +01:00
f31dc22ebb fix some warnings 2019-12-14 18:25:42 +01:00
34d06de0dc remove some old tests 2019-12-14 18:07:18 +01:00
b6945930e8 remove unused functionality 2019-12-14 17:57:19 +01:00
67724f884a use new indices functions 2019-12-14 17:50:33 +01:00
b52c4ddfb9 more low level generic CPPType functions 2019-12-14 17:44:56 +01:00
617ab7847f add more functions to CPPType 2019-12-14 17:16:05 +01:00
2225dab801 optimize fill operation 2019-12-14 17:06:07 +01:00
e1a662ee3a optimize float range 2019-12-14 16:53:51 +01:00
f0cb97c9a3 cleanup 2019-12-14 16:49:21 +01:00
5419ae4d83 optimize generic extend operation 2019-12-14 16:19:16 +01:00
fc30d4e272 support for removing sockets in Select node 2019-12-14 15:36:00 +01:00
21ebaf9bc6 initial Select node 2019-12-14 15:28:13 +01:00
a1b0d7e982 print warning when inputs incorrectly depend on particles 2019-12-14 14:46:40 +01:00
510da24778 keep track of contexts used by function network 2019-12-14 14:46:21 +01:00
2646b9016f more utility functions for vector and stack 2019-12-14 14:45:37 +01:00
cd2385f608 refactor signature builder 2019-12-14 14:02:33 +01:00
5381fbc1a3 turn attribute name into an input socket 2019-12-14 13:15:28 +01:00
d720463300 support nicer drawing of sockets 2019-12-14 12:18:17 +01:00
776562623c new Multi Execute node 2019-12-14 11:35:27 +01:00
8a41c15bf9 prevent trails and explosion in a the same particle system 2019-12-14 11:29:49 +01:00
46b29a75a0 remove unused code 2019-12-14 11:10:55 +01:00
984ba7e943 Merge branch 'master' into functions 2019-12-14 11:02:49 +01:00
764857eb37 fix: find IDs used by output sockets as well 2019-12-13 19:42:49 +01:00
dc0d0d3936 Merge branch 'master' into functions 2019-12-13 19:40:19 +01:00
5c83319029 new Find Non Close Points node 2019-12-12 18:28:14 +01:00
d7d365f6eb new Get List Elements node 2019-12-12 15:34:53 +01:00
b716661366 support for vertex weights in Sample Object Surface node 2019-12-12 14:59:39 +01:00
4de6eafba3 sample hooks on surface 2019-12-12 13:05:08 +01:00
ee52b2f7d8 Merge branch 'master' into functions 2019-12-12 11:17:04 +01:00
6d3cd34bd5 fix compile error 2019-12-11 17:13:16 +01:00
df783a4ee1 access emitter time info in node tree 2019-12-11 16:32:48 +01:00
4d72f25e9a make vertex group name an input socket 2019-12-11 16:05:47 +01:00
5d8036c675 access position and normal directly in Closest surface hook node 2019-12-11 15:50:06 +01:00
03bde25be9 fix context in vectorized functions 2019-12-11 15:27:53 +01:00
3a1aec54a7 cleanup 2019-12-11 15:20:21 +01:00
2a25a0bd60 cleanup 2019-12-11 15:08:54 +01:00
a080464e31 extract function vectorizer to separate file 2019-12-11 15:03:19 +01:00
95e0ea69a2 extract customizable functions into separate file 2019-12-11 14:59:14 +01:00
a678e0df39 remove unused code 2019-12-11 14:55:32 +01:00
5d686b19a5 extract particle input functions from others 2019-12-11 14:52:48 +01:00
a908d95d9f extract surface hook functions to separate file 2019-12-11 14:48:40 +01:00
423060ac2f optimize closest surface hook on object node 2019-12-11 14:37:36 +01:00
fa942b5e6f optimize get weight on surface 2019-12-11 14:24:32 +01:00
f4a9e125bf optimize get normal on surface node 2019-12-11 14:16:10 +01:00
642fa43b13 optimize get position on surface node 2019-12-11 14:10:55 +01:00
e60516bdee cleanup 2019-12-11 14:03:13 +01:00
980b128b37 cleanup 2019-12-11 14:00:39 +01:00
bd92ed7e11 optimize single value case 2019-12-11 13:58:08 +01:00
bf85e6a637 improve grouping of similar indices 2019-12-11 13:53:53 +01:00
35989c6715 convert image to socket 2019-12-11 13:01:55 +01:00
aa10876c62 vectorize surface hook nodes 2019-12-11 12:18:56 +01:00
6dd8723620 fix memory leak 2019-12-11 11:42:30 +01:00
e985b20a77 more generic way to add per element and global contexts 2019-12-11 11:36:40 +01:00
d6f8ebf1f0 Merge branch 'master' into functions 2019-12-11 10:52:23 +01:00
28c554ec27 initial static class id system 2019-12-11 10:50:08 +01:00
eaa0c567fc make element contexts non virtual 2019-12-11 10:21:44 +01:00
9e056e8fd4 Merge branch 'master' into functions 2019-12-11 09:10:17 +01:00
73ed33953a don't register keymap in background mode 2019-12-11 00:10:44 +01:00
032c685472 fix endless recursion 2019-12-10 23:42:03 +01:00
a7d26bdc33 add external data cache to emitter function 2019-12-10 23:32:18 +01:00
5685b0a72a support for accessing id data blocks from emitter function 2019-12-10 23:26:45 +01:00
5dada6b465 new birth time modes for custom emitter 2019-12-10 23:20:50 +01:00
b93d0f8975 support for removing sockets in custom emitter 2019-12-10 22:59:47 +01:00
60b3fc8239 better handling of attribute name collisions 2019-12-10 22:53:32 +01:00
f961ef3e6b improve ui of Custom Emitter node 2019-12-10 22:52:54 +01:00
d91b7625cf fix warning 2019-12-10 18:19:23 +01:00
4df45d1c4c initial Custom Emitter node 2019-12-10 18:12:51 +01:00
826a132791 support nested properties in inferencer 2019-12-10 16:46:31 +01:00
24a7851fbe new Value node 2019-12-10 16:06:32 +01:00
daf119f2a7 initial support for custom particle attributes 2019-12-10 15:30:42 +01:00
4dccb3767a optimize some math nodes 2019-12-10 14:30:07 +01:00
ea5f871d29 deduplicate code 2019-12-10 14:17:55 +01:00
4755ab5b50 optimize variadic math functions 2019-12-10 14:05:31 +01:00
6d05b0910a optimize math functions a bit 2019-12-10 13:15:01 +01:00
e5f9640223 remove some timers 2019-12-10 11:47:05 +01:00
32c25e8c89 Merge branch 'master' into functions 2019-12-10 11:29:00 +01:00
4e4d350967 remove timer 2019-12-08 23:01:28 +01:00
2ce315c588 avoid computing the computing the same things many times 2019-12-08 23:01:21 +01:00
34d68139ac extend single elements when necessary 2019-12-08 22:01:31 +01:00
b09c2c7d00 Merge branch 'master' into functions 2019-12-08 21:31:53 +01:00
a382054837 Merge branch 'master' into functions 2019-12-07 11:01:54 +01:00
56dce4ae43 initital check for whether a function can be called once only 2019-12-06 13:55:03 +01:00
2390af8430 move class from header to cc 2019-12-06 13:34:52 +01:00
7c03565594 add utility to check if an input is only a single value 2019-12-06 13:30:10 +01:00
e93fe105d1 cleanup 2019-12-06 13:01:11 +01:00
de56346eee extract methods 2019-12-06 12:58:01 +01:00
a5790756e0 extract methods 2019-12-06 12:50:54 +01:00
94a280cb99 cleanup 2019-12-06 12:42:58 +01:00
039a1134cd cleanup data copying in network evaluation 2019-12-06 12:39:03 +01:00
ce35f42c0a simplify forwarding in network evaluation 2019-12-06 12:27:41 +01:00
6ec5ece968 cleanup naming 2019-12-06 11:50:10 +01:00
29106bdaee simplify allocation in multi function network evaluation 2019-12-06 11:48:40 +01:00
98d9f2bdfa store whether function depends on per element context 2019-12-06 11:35:34 +01:00
1996429dc6 Merge branch 'master' into functions 2019-12-06 11:25:26 +01:00
e1e1dad668 Merge branch 'master' into functions 2019-12-05 20:00:52 +01:00
d3dbacea08 open group interface panel from V pie menu 2019-12-05 14:14:36 +01:00
293c476822 initial support for reordering group inputs 2019-12-05 13:58:38 +01:00
e57a0ec211 handle other socket types in operator 2019-12-05 13:14:23 +01:00
95b2871550 make it easier to create group outputs 2019-12-05 13:10:35 +01:00
d4d0360604 better default value initialization 2019-12-05 12:47:58 +01:00
eb9f980912 initial V shortcut to create group inputs 2019-12-05 12:43:41 +01:00
dd452a314a improve group node ui 2019-12-05 11:21:24 +01:00
ab678735ab Merge branch 'master' into functions 2019-12-05 09:55:13 +01:00
c44fdcfab2 fix node identifier when node is in a group 2019-12-04 17:10:31 +01:00
d5ec476e36 simplify influence generation from xnodes 2019-12-04 16:42:04 +01:00
985e3e8ddc simplify action building code 2019-12-04 16:03:15 +01:00
f101aa6c4b fix naming after recent refactor 2019-12-04 15:32:30 +01:00
ee58e62f23 rename Surface Location to Surface Hook 2019-12-04 15:04:10 +01:00
db26a32601 store emit location in particles 2019-12-04 14:27:11 +01:00
2012ea2e9d add id handle lookups to function modifiers 2019-12-04 13:49:24 +01:00
c6a00f46ad pass around Object handles instead of pointers 2019-12-04 13:33:49 +01:00
907f72d4bc initial IDHandle implementation 2019-12-04 13:21:05 +01:00
182a56e3b0 improve SurfaceLocations members 2019-12-04 12:17:22 +01:00
e5e295beed fix when having emitter in node group 2019-12-04 11:53:15 +01:00
672b085264 Merge branch 'master' into functions 2019-12-04 11:33:48 +01:00
d709399b64 new Get Normal on Surface node 2019-12-03 16:00:02 +01:00
7fb768e2c4 cleanup: remove unused class 2019-12-03 15:17:38 +01:00
f6e39cc95d add StringMap.add method 2019-12-03 15:11:46 +01:00
4127c7ff87 make execute and influence sockets work in groups 2019-12-03 15:07:40 +01:00
90529a8d4d Merge branch 'master' into functions 2019-12-03 11:55:39 +01:00
9c102058e1 new Get Image Color on Surface node 2019-12-03 11:51:47 +01:00
9e8f68f4fa remove concept of particle function inputs from code 2019-11-30 15:34:38 +01:00
f9f6ab0251 remove remaining particle input nodes 2019-11-30 15:17:59 +01:00
a4cc5f1cbb make Is In Group a normal multi-function 2019-11-30 15:14:10 +01:00
d7b991aeb7 remove Particle Randomness node 2019-11-30 14:40:07 +01:00
f71eec7604 remove Surface Weight node 2019-11-30 14:38:01 +01:00
710c3b8312 new Get Weight on Surface node 2019-11-30 14:36:19 +01:00
a561a457dc initial Get Position on Surface node 2019-11-30 13:30:34 +01:00
945a752902 update closest location on object node 2019-11-27 18:15:48 +01:00
28a70ff15c new surface location data type 2019-11-27 17:06:58 +01:00
98a4a08fce various automated variable renamings 2019-11-27 16:06:55 +01:00
ea0b7dc6d1 make multifunction generation work with inlined node trees 2019-11-27 15:47:40 +01:00
a57e050f43 cleanup creation of group input nodes 2019-11-27 15:46:10 +01:00
49c3eb8478 replace virtual with inlined tree 2019-11-27 14:42:15 +01:00
529987089d Merge branch 'master' into functions 2019-11-27 10:19:26 +01:00
ceca20b798 color exported dot clusters randomly 2019-11-26 17:52:29 +01:00
02aef365ba add some noinline attributes 2019-11-26 17:26:53 +01:00
0a667c6614 cleanup 2019-11-26 17:12:06 +01:00
cfac0f5914 refactor: extract method 2019-11-26 17:10:46 +01:00
d33d8f5b20 refactor: extract methods 2019-11-26 17:01:39 +01:00
70fe3d8dea extract functions 2019-11-26 16:52:58 +01:00
288b562e46 cleanup 2019-11-26 16:41:31 +01:00
021650c4c0 cleanup 2019-11-26 16:34:28 +01:00
352afcd0b3 use array instead of map 2019-11-26 16:14:34 +01:00
413af94fd2 deduplicate node creation 2019-11-26 16:03:25 +01:00
4ade6cdfc0 initialize ids of xnodes 2019-11-26 15:33:38 +01:00
d148d2a447 free memory of inlined node tree 2019-11-26 15:27:27 +01:00
5d42b6a204 add accessor functions for inlined node tree 2019-11-26 13:30:10 +01:00
97a5f427d0 add clusters to inlined node tree dot export 2019-11-26 13:13:46 +01:00
48f2f3cea6 change cluster usage in dot exporter 2019-11-26 12:57:47 +01:00
abe3c18cf6 Merge branch 'master' into functions 2019-11-26 10:40:54 +01:00
0e1a4f39ac use generic dot export to export function networks 2019-11-24 15:24:46 +01:00
a4cf1eb035 export inlined node tree as dot graph 2019-11-24 14:58:43 +01:00
c0d0aff4da import dot export 2019-11-24 13:56:34 +01:00
8ae3debad0 node shape utility 2019-11-24 13:30:28 +01:00
0fea5c5d59 dot file export 2019-11-24 12:55:58 +01:00
afe4577256 initial InlinedNodeTree structure 2019-11-23 18:04:56 +01:00
1f52afb3fd new Vector.remove_first_occurence_and_reorder method 2019-11-23 17:25:41 +01:00
f63d9357bf new Vector.append_and_get_index function 2019-11-23 14:57:27 +01:00
2780bb1000 Merge branch 'master' into functions 2019-11-23 13:55:40 +01:00
0a7e29739d Merge branch 'master' into functions 2019-11-21 15:55:44 +01:00
89335330fa simplify some code 2019-11-21 15:42:06 +01:00
5c316f0910 remove unused code 2019-11-21 15:12:27 +01:00
47e7a8966e cleanup nodes mapping 2019-11-21 15:10:26 +01:00
d81273eaed cleanup 2019-11-21 14:46:26 +01:00
e36da5e16e cleanup 2019-11-21 14:38:14 +01:00
2335aaf58b improve naming 2019-11-21 14:29:03 +01:00
7f9e7c23e0 improve naming 2019-11-21 14:20:14 +01:00
7de6eb1b49 define multi function to node mapping 2019-11-21 14:08:54 +01:00
3ca095f1eb simplify vsocket to multi function mapping 2019-11-21 13:44:56 +01:00
92130916d5 fix network evaluation 2019-11-21 12:48:13 +01:00
92d4376c8e make VirtualNodeTree specific to one bNodeTree 2019-11-20 18:20:16 +01:00
00b4b90361 new try_lookup method for StringMap 2019-11-20 18:11:12 +01:00
6d71136e4a new vnode to multifunction mapping 2019-11-20 17:37:28 +01:00
2c83e550c4 change the node mapping a bit 2019-11-20 17:08:47 +01:00
0cf8799ef7 more utility functions 2019-11-19 14:34:03 +01:00
046204e7b2 extract preprocessed vtree data from builder 2019-11-19 13:38:25 +01:00
3d16a8193f improved debug error checking 2019-11-19 10:49:34 +01:00
1aef4b1298 cleanup parameter checks 2019-11-19 10:17:33 +01:00
ca19757aec refactor MFParamType 2019-11-17 12:10:48 +01:00
e81dbbaa2e add missing static keywords 2019-11-15 16:09:50 +01:00
2d4f8209a7 optimize Get Nearest Point when the object is the same for every element 2019-11-15 16:03:54 +01:00
3ecb692b43 fix task scheduling 2019-11-15 16:03:19 +01:00
ca1de7fe4c use more global external data cache 2019-11-15 15:30:12 +01:00
be57a27d6d fix Map Range clamping 2019-11-15 15:28:49 +01:00
459b54b45c remove unused code 2019-11-15 15:06:36 +01:00
9843ca071c prevent recursive node groups 2019-11-14 16:31:24 +01:00
5e72329889 make group defaults work 2019-11-14 15:39:00 +01:00
2423f1c531 add Random Float node 2019-11-14 15:20:07 +01:00
44320e9e08 remove unnecessarily complex code 2019-11-14 14:43:16 +01:00
057ec4bc97 remove unused nodes 2019-11-14 13:40:10 +01:00
4e61bfbb15 initial working function groups 2019-11-14 13:38:39 +01:00
758a751fb2 new group nodes 2019-11-13 15:29:00 +01:00
7398acb56d initial group input node 2019-11-13 14:55:42 +01:00
16f7804d5f bring back Clamp and Map Range nodes 2019-11-13 14:23:21 +01:00
ccfe2a2db1 initial Closest Point on Object node 2019-11-13 13:48:03 +01:00
03d7ba7055 Make Particle Info node a normal function 2019-11-13 12:40:12 +01:00
3235d6cd41 pass MFContext directly 2019-11-13 12:02:16 +01:00
4dfc1e9026 pass MFParams directly 2019-11-13 11:53:28 +01:00
ce59ef0ea9 pass MFMask directly 2019-11-13 11:29:31 +01:00
d5e9fa61d9 testing another way to use multi function contexts 2019-11-12 15:53:00 +01:00
112ffb49d1 fix default node tree 2019-11-12 14:26:21 +01:00
1ac1081953 remove other forces, they should be build using Particle functions 2019-11-12 14:16:36 +01:00
54b40587e4 output vector from Perlin Noise node 2019-11-12 14:15:59 +01:00
ad96830a4b support mapping input vsockets to multiple new sockets 2019-11-12 14:15:08 +01:00
1d69abe558 new Custom Force and Perlin Noise node 2019-11-12 11:00:19 +01:00
a924c1a401 Merge branch 'master' into functions 2019-11-12 10:08:57 +01:00
bb15b89375 Merge branch 'functions' into functions-experimental-refactor 2019-11-08 20:46:56 +01:00
ef2b03e317 Merge branch 'master' into functions 2019-11-08 20:46:43 +01:00
b6027a2f15 fix Is In Group input 2019-11-08 20:34:01 +01:00
a74a2882ed bring back compare node 2019-11-08 20:33:44 +01:00
3a3970c2e0 change uint8_t to bool 2019-11-08 19:50:23 +01:00
a708562177 move attribute defaults back into AttributesInfo 2019-11-08 19:48:04 +01:00
b9d42020be make function name more precise 2019-11-08 19:19:54 +01:00
fea9c7c1a3 cleanup 2019-11-08 19:15:21 +01:00
9cc27bd6ff remove a node 2019-11-08 18:49:49 +01:00
5f8bd0fa71 make switch node work again 2019-11-08 18:21:26 +01:00
de3d75110c bring back object mesh info node 2019-11-08 17:50:19 +01:00
2bae4dd503 remove some nodes for now 2019-11-08 17:33:29 +01:00
8e1ced7596 bring back color nodes 2019-11-08 17:32:20 +01:00
d47962f7a9 boolean math nodes 2019-11-08 17:11:29 +01:00
366a427f04 more vector math 2019-11-08 16:56:06 +01:00
fa7c300edc more vector math 2019-11-08 16:27:58 +01:00
e390a51cc7 bring back some vector math nodes 2019-11-08 16:12:43 +01:00
470a2ce330 fix compile error 2019-11-07 15:17:44 +01:00
4e0b5fd215 cleanup 2019-11-07 14:03:46 +01:00
eada832040 make AttributesInfo non copy and non movable 2019-11-07 13:59:47 +01:00
9116016f93 rename GET_TYPE to CPP_TYPE 2019-11-07 13:48:30 +01:00
bef3e0022c use monotonic allocator for network builder 2019-11-07 13:38:51 +01:00
a4a46d8a97 use monotonic allocator for vtree generation 2019-11-07 13:21:39 +01:00
1fb8e34c9c rename functions2 to functions 2019-11-07 11:57:35 +01:00
ae862db1f4 remove old function system 2019-11-07 11:54:00 +01:00
7884ae9bc3 port particle system to new functions system 2019-11-07 11:44:08 +01:00
856049d771 merge bparticles node tree into functions node tree 2019-11-06 16:08:20 +01:00
cccaca258b simplify naming 2019-11-06 13:05:26 +01:00
6e135618be use monotonic allocator to allocate functions 2019-11-05 15:54:44 +01:00
06e398f427 rename OwnedResources to ResourceCollector 2019-11-05 15:40:03 +01:00
2ae8040373 improve aligned allocation in monotonic allocator 2019-11-05 15:32:53 +01:00
7317074eb3 bring back some more math operations 2019-11-05 14:36:45 +01:00
ab2625529c bring back more math nodes 2019-11-05 14:17:35 +01:00
a35f5ff3c8 improve add/mul/min/max math nodes 2019-11-05 13:47:57 +01:00
3a4d9fa228 remove unused code 2019-11-05 11:56:37 +01:00
720edd0c30 cleanup 2019-11-05 11:53:24 +01:00
e0554f7f31 access time from node tree 2019-11-05 11:48:29 +01:00
55ecd940ac initial more generic context handling 2019-11-05 11:19:57 +01:00
07ac997f1c make Float Range node work again 2019-11-04 23:17:01 +01:00
09862e2b2f assert earlier when nodes were not inserted correctly 2019-11-04 23:16:46 +01:00
62cd4cca56 Merge branch 'functions' into functions-experimental-refactor 2019-11-04 22:09:23 +01:00
a63b896055 Merge branch 'master' into functions 2019-11-04 22:09:06 +01:00
f52e43554f simplify interface for generating functions from node trees 2019-11-03 16:32:23 +01:00
b1bee3ffc5 update Function Points modifier to use new system 2019-11-03 16:06:25 +01:00
d5bcdeef9f rename pack list socket declaration to something more generic 2019-11-03 15:31:30 +01:00
9fdef6ae5b attributes block container compression and utilities 2019-11-03 15:09:21 +01:00
5e20def930 cleanup function allocation 2019-11-03 14:30:45 +01:00
1a90ef6e58 cleanup builder 2019-11-03 14:19:05 +01:00
f1dfadb3cb initial MFContext usage 2019-11-03 14:12:34 +01:00
fa18a28277 move multi function context to separate file 2019-11-03 13:55:49 +01:00
30a1a0bf58 separate some files 2019-11-03 13:44:31 +01:00
146f6a827b add utility to destruct and reorder attribute arrays 2019-11-03 13:08:35 +01:00
da0169bca4 simplify CPPType construction 2019-11-03 12:08:34 +01:00
dafbb5daf7 properly align inline storage in vector and map 2019-11-03 11:37:10 +01:00
5a6da2c1b1 update attribute blocks 2019-11-02 21:31:56 +01:00
45fd15f824 initial attributes block container in functions2 2019-11-02 20:48:35 +01:00
61609e90d5 initial AttributesRef in functions2 2019-11-02 20:19:49 +01:00
8523b03473 cleanup 2019-11-02 19:22:05 +01:00
4a0b22d449 cleanup 2019-11-02 19:12:46 +01:00
2c8ad4ef0b cleanup 2019-11-02 19:07:37 +01:00
4b1532b064 move file 2019-11-02 18:53:29 +01:00
74e7816a22 move node inserters to separate file 2019-11-02 13:45:22 +01:00
8ed320be86 fix memory leak 2019-11-02 13:29:06 +01:00
ed727f3c0f refactor mapping from vtree to multi functions 2019-11-02 13:26:02 +01:00
100ff71944 New VirtualNodeTree implementation 2019-11-02 12:34:39 +01:00
ef636af49e move network generation to separate file 2019-11-01 20:31:13 +01:00
fcfa225e5d move multi function network evaluation to functions2 2019-11-01 20:14:01 +01:00
e778aba584 move VTreeMFNetworkBuilder to functions2 2019-11-01 20:02:51 +01:00
ed47df29e3 move VTreeMFNetwork to functions2 2019-11-01 19:56:11 +01:00
f91bd73986 remove code from blenkernel (now lives in functions2) 2019-11-01 19:51:34 +01:00
11808ee3c2 update functiondeform modifier to using functions2 2019-11-01 19:46:54 +01:00
e9fd7c335f move tuple to functions2 2019-11-01 19:37:25 +01:00
617d8ab8dc move multi function network to functions2 2019-11-01 19:32:52 +01:00
2b805f0ae8 move multi functions to functions2 2019-11-01 19:30:31 +01:00
72eb10b467 copy generic data structures to functions2 2019-11-01 19:11:53 +01:00
324537287f initial functions2 folder 2019-11-01 19:05:09 +01:00
6379f1d035 improve performance when iterating over mask indices 2019-11-01 14:37:58 +01:00
f354aebc6f cleanup name access 2019-11-01 14:35:44 +01:00
ae8332f7c6 introduce MFMask 2019-11-01 14:17:09 +01:00
3ba1c11f3b fix memory leak 2019-10-31 15:01:53 +01:00
5b60e21f1b make text socket work again 2019-10-31 14:57:40 +01:00
badad91ac3 make Object socket work again 2019-10-31 14:39:16 +01:00
92e04dcd15 rename placeholder to dummy 2019-10-31 14:15:27 +01:00
d218811e85 access function and parameter names 2019-10-31 14:11:11 +01:00
db0ee0fe36 further improve MultiFunction API 2019-10-31 13:51:05 +01:00
e09e429f57 cleanup MultiFunction API 2019-10-31 13:43:44 +01:00
cdd69f8e6d dot export 2019-10-31 13:32:53 +01:00
53d345a897 add missing implicit conversions 2019-10-31 13:15:33 +01:00
b7c516a121 add more primitive conversions 2019-10-31 12:55:23 +01:00
16150b75ac cleanup network generation code 2019-10-31 12:27:35 +01:00
5816f75544 initial automatic node vectorization 2019-10-31 11:44:01 +01:00
0ceef31d99 support for full pointer array in virtual list 2019-10-31 10:59:46 +01:00
568315b0b8 make Get List Element node work again 2019-10-30 16:39:33 +01:00
3baf1f7ffa remove unused code 2019-10-30 16:31:23 +01:00
be738fa181 make Pack List node work again 2019-10-30 16:27:53 +01:00
cdeb4ecf8e make some list nodes work again 2019-10-30 15:32:33 +01:00
98577ce2b2 initial non recursive multi-function evaluator 2019-10-30 14:01:00 +01:00
aec147ec74 new ArrayRef.first_index method 2019-10-29 16:52:38 +01:00
cdb7f3c192 change GenericVectorArray 2019-10-29 16:31:36 +01:00
269488d1c3 use virtual list list ref in multi functions 2019-10-29 15:46:25 +01:00
c6ebe25337 initial VirtualListListRef 2019-10-29 15:00:47 +01:00
353af1c51a Support for implicit conversions, float math node and int type 2019-10-29 13:32:22 +01:00
e1ca6c4129 Merge branch 'functions' into functions-experimental-refactor 2019-10-29 11:21:58 +01:00
cacbe466b2 Merge branch 'master' into functions 2019-10-29 11:15:49 +01:00
7bef9b83fb initial MultiFunction generation from node tree 2019-10-22 13:54:55 +02:00
dfa3ed8761 insert links function 2019-10-22 13:04:54 +02:00
73a709844b make VirtualNodeTree const in many places 2019-10-22 12:51:46 +02:00
bc8d442717 initial new node inserters 2019-10-22 11:47:29 +02:00
4adbf49d83 improve ArrayRef 2019-10-22 11:47:00 +02:00
59df914983 replace ArrayOrSingleRef with VirtualListRef 2019-10-20 15:55:33 +02:00
b04aed8db6 experimental VirtualListRef 2019-10-20 15:11:52 +02:00
fc1ca9a2e2 fixes 2019-10-20 14:53:17 +02:00
f6f4f2914c utility functions 2019-10-20 14:27:54 +02:00
4d61b8b1f9 initial VTreeMFNetwork and VTreeMFNetworkBuilder 2019-10-20 13:29:38 +02:00
31ecaf4a8a make MultiFunction const in more places 2019-10-18 17:49:12 +02:00
ff29177a4c make CPPType const everywhere 2019-10-18 17:47:02 +02:00
84baab05b2 remove unused code 2019-10-18 17:46:51 +02:00
838ac481f2 cleanup 2019-10-18 17:40:18 +02:00
5151d05625 cleanup 2019-10-18 17:37:33 +02:00
53d3d32992 use MF prefix in more places 2019-10-18 17:31:22 +02:00
9dbe43f044 start using MF prefix for some classes 2019-10-18 17:23:35 +02:00
36310012ff allow passing destruct_ptr to OwnedResources 2019-10-18 17:08:55 +02:00
2f6ea75758 move destruct_ptr to BLI 2019-10-18 16:46:15 +02:00
d0dd083cbb multi function with constant output 2019-10-18 15:08:20 +02:00
416d6a17dc first created and executed multi function graph 2019-10-17 17:53:04 +02:00
59dc9f1f1a implement initial conversion from builder to network 2019-10-17 16:35:09 +02:00
c2aea94511 give nodes and sockets ids 2019-10-17 15:21:10 +02:00
94d06d7094 initial network structure 2019-10-17 15:08:00 +02:00
2f02949798 initial multi function network builder 2019-10-17 14:19:21 +02:00
0d4a90000d Merge branch 'functions' into functions-experimental-refactor 2019-10-17 10:49:29 +02:00
b660768ae0 Merge branch 'master' into functions 2019-10-17 10:49:00 +02:00
586a9c14ad pass context into multi functions 2019-10-16 13:05:57 +02:00
376f4813dd experiment with an interface to specify external data dependencies 2019-10-16 12:57:21 +02:00
b08bcb1ef4 remove unused code 2019-10-16 12:37:30 +02:00
c1d570ebb1 separate concept of data types from parameter types 2019-10-16 12:19:38 +02:00
76655021c2 remove unused code 2019-10-16 12:19:22 +02:00
2b781131ed experimental AnyAllocator 2019-10-16 11:39:27 +02:00
4d08c352c3 cleanup 2019-10-16 11:39:16 +02:00
f4455b442c separate vector function 2019-10-15 15:52:53 +02:00
34a66dea4e Combine Vector multi function 2019-10-15 15:32:06 +02:00
9952cbc715 initial multi function node tree evaluation 2019-10-15 15:12:48 +02:00
0cc550108a new add vectors multi function 2019-10-15 12:32:05 +02:00
2c06ccec82 initial params builder 2019-10-15 12:05:43 +02:00
56ab056637 test function call 2019-10-13 22:04:01 +02:00
78aa2d5f02 further implement signature builder 2019-10-13 18:32:47 +02:00
a9a8741270 further develop Signature 2019-10-13 18:32:47 +02:00
f0b62c43ef start implementing Params 2019-10-13 18:32:47 +02:00
a1308c1f98 init stuff 2019-10-13 18:32:47 +02:00
42894aa3df don't use old function system for function deform modifier 2019-10-13 18:32:47 +02:00
8a3ce65044 fix 2019-10-13 18:32:47 +02:00
630d32b159 new socket type mapping 2019-10-13 18:32:47 +02:00
7588b4e493 separate declaration and implementation 2019-10-13 18:32:47 +02:00
745c6dec4d move functions to other file 2019-10-13 18:32:47 +02:00
59b077c020 fix test 2019-10-13 18:32:47 +02:00
cad83fee9f move multi function to separate header 2019-10-13 18:32:47 +02:00
9cd357768d fix 2019-10-13 18:32:47 +02:00
029e63093d fix 2019-10-13 18:32:47 +02:00
f84f8b2a02 combine lists 2019-10-13 18:32:47 +02:00
c696a29058 list lengths 2019-10-13 18:32:47 +02:00
2ef5959f8a GenericVectorArrayOrSingleRef 2019-10-13 18:32:47 +02:00
b38ee6daab generic array or single ref 2019-10-13 18:32:47 +02:00
b4130c3d2a more generic vector array functionality 2019-10-13 18:32:47 +02:00
1ee3c53ed2 prototyping vector array usage 2019-10-13 18:32:47 +02:00
c365ec7c61 initial GenericVectorArray 2019-10-13 18:32:47 +02:00
2efdb20b0b use allocator in MonotonicAllocator and use minimum allocation size 2019-10-13 18:32:47 +02:00
0627a6b2d5 cleanup 2019-10-13 18:32:47 +02:00
375a600b8b initial ArrayOrSingleRef implementation 2019-10-13 18:32:47 +02:00
909dc85f2f node functions 2019-10-13 18:32:47 +02:00
2892434cdf improve naming 2019-10-13 18:32:47 +02:00
5ab8cc2eaf add generic mutable array ref 2019-10-13 18:32:47 +02:00
2cfb80f68c cleanup 2019-10-13 18:32:47 +02:00
ffad150868 rename 2019-10-13 18:32:47 +02:00
cfaa0e566a rename TypeCPP to CPPType 2019-10-13 18:32:47 +02:00
326878d82c initial new function type 2019-10-13 18:32:47 +02:00
bdfc3e9a6b GenericArrayRef type 2019-10-13 18:32:47 +02:00
b75cdf36a8 new tuple implementation 2019-10-13 18:32:47 +02:00
55d0c80611 add more type attributes 2019-10-13 18:32:47 +02:00
302e1e9a86 initial cpp type 2019-10-13 18:32:47 +02:00
faf2184f52 Merge branch 'master' into functions 2019-10-13 18:12:07 +02:00
65e6598e7e avoid ambiguous call to make_unique 2019-09-27 16:59:04 +02:00
503fadaeb9 cleanup Tuple class 2019-09-27 15:40:40 +02:00
37bc9ffc53 remove using namespace BLI 2019-09-27 15:27:33 +02:00
123d945027 function is noncopyable and nonmovable 2019-09-27 15:17:53 +02:00
254b69417b remove refcounter from Function class 2019-09-27 15:15:10 +02:00
0102c06cb2 remove Falloff implementation
The plan is to achieve the same functionality in a different way
that allows more customization.
2019-09-27 14:14:39 +02:00
4086bf9823 make particle colors work again
This broke in rBa168c3d282083bb4.
2019-09-27 12:35:02 +02:00
d724444dba remove some debug prints 2019-09-27 12:33:26 +02:00
033924c630 Merge branch 'master' into functions 2019-09-27 10:58:21 +02:00
ab9a01313f add resources to data graph instead of function 2019-09-26 18:15:55 +02:00
ea6db832a0 utility to print resource names 2019-09-26 18:07:59 +02:00
2263656526 add resource via VTreeDataGraphBuilder 2019-09-26 17:57:02 +02:00
d31da8e870 data graph can own arbitrary resources now 2019-09-26 17:42:52 +02:00
727a8da77f make Function class a bit smaller 2019-09-26 17:35:59 +02:00
3bca19b38a separate owned resources container from function 2019-09-26 17:23:16 +02:00
387a97ae42 experimental lazy init for unique pointers 2019-09-26 16:46:52 +02:00
b65a28b9d7 use make_unique in some places 2019-09-26 16:18:53 +02:00
f2b2279c1a Remove owns_mem attribute from Tuple 2019-09-26 15:41:19 +02:00
cdcae9d22e remove run_destructors member from Tuple 2019-09-26 15:21:17 +02:00
5b0d883e50 remove refcount from TupleMeta 2019-09-26 15:02:07 +02:00
be2358fe61 remove refcounter from data graph 2019-09-26 14:35:42 +02:00
802c820334 improved static and dynamic type checking for function bodies 2019-09-26 14:05:16 +02:00
abed72f22c store tuple as resource in function 2019-09-26 13:49:11 +02:00
74fba99cc6 initial resource storage for functions 2019-09-26 13:35:06 +02:00
5460fa6efc store StringRef directly in function
That increases the size slightly, but is easier to debug
2019-09-26 12:46:51 +02:00
353d6112d2 use header guards 2019-09-26 12:06:20 +02:00
d942d6daa7 rename file 2019-09-26 12:03:29 +02:00
7ba7667d8e reduce error handling complexity 2019-09-26 11:04:27 +02:00
b34c174dfb Merge branch 'master' into functions 2019-09-26 10:43:33 +02:00
c3d30f2992 cleanup 2019-09-26 10:43:14 +02:00
6cdc6ce355 Merge branch 'master' into functions 2019-09-25 16:02:22 +02:00
d4e58e630c Replace Falloff with weight input 2019-09-23 12:08:36 +02:00
31a3dc769d start using monotonic allocator when parsing bparticles tree 2019-09-23 11:42:04 +02:00
89db5e8946 Merge branch 'master' into functions 2019-09-23 11:01:22 +02:00
e64fa963de initial particle group implementation 2019-09-22 15:05:45 +02:00
e0b82c6616 access influences collector from action parsers 2019-09-22 14:37:20 +02:00
5c733ab445 move responsibility of registering attributes to node frontend 2019-09-22 14:14:03 +02:00
fcd6a9ddcb allow only one collision per time step 2019-09-22 13:54:48 +02:00
93c0fdcd45 pass simulation state to interfaces 2019-09-22 13:54:30 +02:00
5eecfaf824 better distinction between particle simulation and system 2019-09-22 12:59:13 +02:00
63116f2c8c improved handling of moving colliders 2019-09-22 12:44:07 +02:00
ad8733038e Merge branch 'master' into functions 2019-09-22 12:01:54 +02:00
e397b67946 cleanup 2019-09-20 16:37:41 +02:00
97da5f31d4 move responsibility to ensure that attributes exist out of simulator 2019-09-20 16:32:59 +02:00
9c46c784d5 move attributes declaration out of simulate code 2019-09-20 16:21:02 +02:00
cdfb3d3a28 move responsibility of keeping track of particle ids 2019-09-20 16:09:01 +02:00
8d860d4a9b use shared particle allocator instead of one per thread 2019-09-20 16:00:26 +02:00
f1a7d102dc don't access particles state through allocator 2019-09-20 15:09:45 +02:00
cab2f0f6bd declare more attributes in same place 2019-09-20 15:04:00 +02:00
cb974c4c66 Merge branch 'master' into functions 2019-09-20 14:38:43 +02:00
691f2d449a Merge branch 'master' into functions 2019-09-19 10:34:45 +02:00
d2bd35eab4 fix usage of frame nodes 2019-09-19 10:34:13 +02:00
21889a5475 fix crash with negative emitter rate 2019-09-19 10:30:24 +02:00
c3e289440d Merge branch 'master' into functions 2019-09-18 17:42:59 +02:00
16d5919206 copy color to new particles in trails node 2019-09-17 15:27:24 +02:00
5b1d7afb9c new particle randomness input 2019-09-17 15:04:23 +02:00
df47dd16ce reorder menu entries 2019-09-17 14:02:27 +02:00
561450715b add missing nodes to menu 2019-09-17 13:49:38 +02:00
4d4eeedfa0 rename file 2019-09-17 13:49:24 +02:00
9fecdb3a45 use reference to indicate that action cannot be null 2019-09-17 12:43:59 +02:00
872ee8bbe0 add some node mockups 2019-09-17 12:32:44 +02:00
8d285ee398 Merge branch 'master' into functions 2019-09-17 09:56:59 +02:00
e6ef82180f add execute input to point emitter 2019-09-16 17:00:37 +02:00
d51f6b010d add execute input to initial grid emitter 2019-09-16 16:56:00 +02:00
afada870e7 rename to Influences 2019-09-16 16:43:21 +02:00
8a3348d49b make it easier to add a new particle system 2019-09-16 16:40:57 +02:00
b5d2265b60 remove unused functions 2019-09-16 11:57:59 +02:00
7e3e301bb1 more centralized ownership of actions 2019-09-16 11:39:43 +02:00
a3080c2bc3 don't crash when connecting certain sockets 2019-09-16 11:15:23 +02:00
609147a4d9 improve error handling of various nodes 2019-09-16 11:04:25 +02:00
6384a61a99 Add arrow and star operator to BLI::Optional 2019-09-16 11:04:05 +02:00
4a9bfa95ed centralize function evaluation a bit more 2019-09-16 10:51:08 +02:00
881b5377cf change ownership of name vectors 2019-09-16 10:41:37 +02:00
a5e1f95467 move system discovery to vtreedata 2019-09-16 10:33:13 +02:00
f54bf13cc1 missing file in cmakelists 2019-09-16 10:26:49 +02:00
f45badafd5 Merge branch 'master' into functions 2019-09-16 10:10:22 +02:00
5f5a7fcd62 fixes after merge 2019-09-15 12:46:14 +02:00
35de65ec81 Merge branch 'master' into functions 2019-09-15 12:42:24 +02:00
0d81bf5cb0 fixes after merge 2019-09-14 12:48:25 +02:00
345b86ca4e Merge branch 'master' into functions 2019-09-14 12:44:31 +02:00
4de668c30c Merge branch 'master' into functions 2019-09-14 12:41:02 +02:00
214964b2a0 Merge branch 'master' into functions 2019-09-13 17:08:02 +02:00
f21586cfa1 fix after rename 2019-09-13 16:32:28 +02:00
5b9ee5a55e use NamedTupleRef in more places 2019-09-13 15:47:35 +02:00
c5c05aa40b improve NameTupleRef abstraction 2019-09-13 14:55:48 +02:00
71184d2bc8 fix overflow in color conversion 2019-09-13 14:24:47 +02:00
e26301b30a Rename Particle Type to Particle System and Behaviors to Influences 2019-09-13 14:09:32 +02:00
2232300639 Merge branch 'master' into functions 2019-09-13 12:28:43 +02:00
a86dda2a80 fix cmake after merge 2019-09-13 12:27:35 +02:00
ef7f059216 Merge branch 'master' into functions 2019-09-13 12:16:59 +02:00
3c4d8b1f59 rename BLI_hash.hpp to BLI_hash_cxx.h 2019-09-12 17:13:10 +02:00
d24380dd43 remove unused function 2019-09-12 16:31:02 +02:00
3cdc35dfc4 test OutputTupleRef abstraction 2019-09-12 16:29:40 +02:00
9e9e150b74 size parameter in turbulence force node 2019-09-12 15:55:47 +02:00
592470b07b simplify code by changing ownership of particle functions 2019-09-12 15:45:55 +02:00
971ad95f2b solve merge conflicts 2019-09-12 14:59:16 +02:00
cabc40db81 Merge branch 'master' into functions 2019-09-12 14:49:38 +02:00
e23abea88d add license header to memory utils 2019-09-12 12:49:18 +02:00
7b4a2d578f rename BLI_memory.h to BLI_memory_utils_cxx.h 2019-09-12 12:48:36 +02:00
e7aa06520a change .cpp to .cc in blenlib 2019-09-12 12:45:55 +02:00
2e21ec0d88 change .hpp to .h in blenlib 2019-09-12 12:41:14 +02:00
54350b7db2 change .hpp to .h 2019-09-12 12:23:42 +02:00
590b231124 reflow comment 2019-09-12 12:21:40 +02:00
7825047f47 Merge branch 'master' into functions 2019-09-12 10:09:01 +02:00
1f957995f6 Fix birth moments of emitted particles 2019-09-11 17:59:45 +02:00
1b9cc8bfb1 Merge branch 'master' into functions 2019-09-11 17:46:43 +02:00
09ffcc5de1 initial Always Execute node 2019-09-11 17:24:47 +02:00
23de6e6960 new Falloff input for Turbulence Force 2019-09-11 16:05:51 +02:00
f082115395 Merge branch 'master' into functions 2019-09-11 15:17:11 +02:00
0f47a7d0d7 use Array instead of Vector 2019-09-11 13:29:17 +02:00
8d31f929db fix Array and add tests 2019-09-11 13:28:40 +02:00
a988a16e3d new Change Particle Position node 2019-09-11 11:36:52 +02:00
5743c0eab6 new Custom Event node 2019-09-11 11:24:45 +02:00
3f28239efe move events ui to same file 2019-09-11 10:55:37 +02:00
ef8775b676 allocate VTreeDataGraph on heap 2019-09-11 10:41:47 +02:00
880c5a4360 store size of vector in debug builds to ease debugging 2019-09-11 10:18:34 +02:00
cd48588cf6 Merge branch 'master' into functions 2019-09-11 09:50:12 +02:00
972760397f fix keymap registration 2019-09-10 17:41:32 +02:00
8024da670c testing initial bit array ref implementation 2019-09-10 17:02:23 +02:00
72a05f9f4f remove unnecessary inline keywords 2019-09-10 16:14:48 +02:00
29c7232f4f comments 2019-09-10 16:11:18 +02:00
bfdf90e68c quiet warning 2019-09-10 16:05:38 +02:00
ff3f7c5291 invert Mesh Distance Falloff 2019-09-10 15:59:20 +02:00
a9112c4932 do not register keymap in background mode 2019-09-10 15:46:53 +02:00
b928050af3 initial Mesh Distance Falloff node 2019-09-10 15:44:58 +02:00
01e97d117f initial experimental Mesh Force node 2019-09-10 14:23:52 +02:00
2c0397edfb Merge branch 'master' into functions 2019-09-10 13:26:17 +02:00
a911775cbe store attributes info directly instead of unique pointer 2019-09-10 13:02:12 +02:00
c339917d7f don't store attributes info ref directly in block 2019-09-10 12:56:54 +02:00
1b3ee092db move attributes block container stuff to same file again 2019-09-10 12:39:18 +02:00
b22dc19ce7 new Dot Production operation in vector math node 2019-09-10 12:18:58 +02:00
844c2c8a79 new Project operation in vector math node 2019-09-10 12:10:40 +02:00
147863ac7c Improve copy and move constructor of Vector 2019-09-10 11:54:03 +02:00
dcd84a1051 remove limit for index range arrays 2019-09-09 17:58:43 +02:00
cfb50f6581 implement multiple density modes in Mesh Emitter node 2019-09-09 17:22:54 +02:00
cdc432429f Falloff input in Drag Force node 2019-09-09 16:23:38 +02:00
5d319ba8ff new Drag Force node 2019-09-09 16:17:32 +02:00
706bd95ae8 Merge branch 'master' into functions 2019-09-09 15:45:19 +02:00
40e9cf9df8 initial new attributes block storage 2019-09-09 15:43:23 +02:00
c541e31931 cleanup some nonmovable and noncopyable functions 2019-09-09 12:17:28 +02:00
b2a449e783 test if it builds on buildbot without alembic tests 2019-09-09 11:51:35 +02:00
11d61f3d00 test moving functions to bf_functions 2019-09-09 11:41:07 +02:00
dc02a49fb7 test adding a virtual destructor to solve a linker issue 2019-09-09 11:33:54 +02:00
63133ee688 Merge branch 'master' into functions 2019-09-09 10:55:21 +02:00
da598e31eb support for outputting None/Points/Tetrahedons 2019-09-06 17:44:25 +02:00
e876360aaa Merge branch 'master' into functions 2019-09-06 17:07:59 +02:00
aa5ea9f0fe New UInt32 attribute type 2019-09-06 16:51:32 +02:00
5045219ca9 separate BParticles Output modifier 2019-09-06 16:34:21 +02:00
d30979dddb new Constant Falloff node 2019-09-06 15:51:03 +02:00
57ceacf8b4 move falloff implementations out of header 2019-09-06 15:42:54 +02:00
12663d2e21 cleanup boolean math 2019-09-06 15:34:03 +02:00
0b8514a99c fix memory leak 2019-09-06 15:32:04 +02:00
264719c0b4 simplify string type 2019-09-06 14:50:13 +02:00
213d807a08 deduplicate some code 2019-09-06 14:14:33 +02:00
524df333bc use correct wrapper for Object pointers 2019-09-06 12:49:42 +02:00
3d85989efa rename 2019-09-06 12:26:36 +02:00
199d201cce rename 2019-09-06 12:21:32 +02:00
f45791f436 remove unused class 2019-09-06 12:18:53 +02:00
a22b7177d2 improve llvm type info for shared immutable types 2019-09-06 12:17:16 +02:00
9ba1fce608 use specialized llvm type info for pointer references 2019-09-06 11:37:25 +02:00
4e2ee7e962 remove unused code 2019-09-06 11:27:58 +02:00
d0eafffed4 Initial Falloff implementation 2019-09-06 11:21:53 +02:00
6163ce3dee Merge branch 'master' into functions 2019-09-06 09:21:28 +02:00
02cdf856f6 fix attribute initialization 2019-09-05 19:07:08 +02:00
d226d46144 Merge branch 'master' into functions 2019-09-05 18:30:52 +02:00
58997f47af initial passive modifier mode
This allows creating separate meshes for the different particle types.
2019-09-05 18:30:36 +02:00
66c07705f9 Initial Size Over Time node 2019-09-05 16:58:35 +02:00
bc654dd3dd support for choosing uv layer by name 2019-09-05 16:21:32 +02:00
882e7e4903 cleanup usage of temporary allocator 2019-09-05 15:17:43 +02:00
f541e79196 add comments 2019-09-05 14:27:02 +02:00
942cf217c5 add some comments 2019-09-05 14:18:48 +02:00
02f4bf505a more comments 2019-09-05 12:53:58 +02:00
b39ddcd628 add some comments 2019-09-05 12:43:53 +02:00
5420375d4a return StringRef from virtual node/socket 2019-09-05 12:36:45 +02:00
f59ea9a10f support not-equal operator for StringRef 2019-09-05 12:35:27 +02:00
242e027dea cleanup Vector Adaptor 2019-09-05 12:27:13 +02:00
ded8e6f0af rename test files 2019-09-05 12:17:47 +02:00
d6ac3fd2f2 rename file 2019-09-05 12:14:57 +02:00
a61852a5e2 store size in IndexRange 2019-09-05 12:12:08 +02:00
1ed83f1004 use another constructor for IndexRange 2019-09-05 11:51:54 +02:00
d22cf2fd77 replace generic Range with IndexRange 2019-09-05 11:46:55 +02:00
3a17600bed move ChunkedRange to separate file 2019-09-05 11:30:48 +02:00
3939274a46 cleanup names 2019-09-05 11:20:22 +02:00
964ee85777 access surface color from chained action context 2019-09-05 11:15:40 +02:00
f58f26a35d cleanup vertex weight input provider 2019-09-05 11:00:50 +02:00
fd8244fb26 new Combine Behaviors node 2019-09-05 10:38:03 +02:00
a6d08dfccb Merge branch 'master' into functions 2019-09-05 10:05:08 +02:00
b14e8f35f7 vertices should have a unit length normal 2019-09-04 18:05:06 +02:00
1c8f6d8807 cleanup 2019-09-04 16:27:13 +02:00
5f91002b51 better time sampling in mesh emitter 2019-09-04 16:27:13 +02:00
0e528d5361 improve spacing of trail particles 2019-09-04 16:27:13 +02:00
30185113fd take triangle areas into account 2019-09-04 16:27:13 +02:00
f0c354c97a refactor triangle weight computation 2019-09-04 16:27:13 +02:00
6e828316b3 compute barycentric weights more centrally 2019-09-04 16:27:13 +02:00
d979cd2690 use Surface Info node instead of Collision Info 2019-09-04 16:27:13 +02:00
c665ef49ad store surface velocities in surface context 2019-09-04 16:27:13 +02:00
c718c9e6c5 refactor usage of MeshSurfaceContext 2019-09-04 16:27:13 +02:00
1b1292b7b1 assert that the number of temporary buffers does not grow unbounded 2019-09-04 16:27:13 +02:00
560b55c4c8 cleanup 2019-09-04 16:27:13 +02:00
22624ad774 cleanup handling of emitter action contexts 2019-09-04 16:27:13 +02:00
cb35556472 support slicing ArrayRef with range 2019-09-04 16:27:13 +02:00
185ef25243 temporarily remove unnecessary emitter sockets 2019-09-04 16:27:13 +02:00
848603d032 Merge branch 'master' into functions 2019-09-04 16:27:02 +02:00
db230d4833 skip matrix interpolation when not necessary 2019-09-04 11:33:56 +02:00
716cc34a87 move AttributesRef to BKE namespace 2019-09-04 11:09:36 +02:00
fbe0a3950f more accurate runtime type checking in debug builds 2019-09-04 10:51:06 +02:00
90aaf67e5a Merge branch 'master' into functions 2019-09-04 09:45:37 +02:00
0edb87c629 Merge branch 'master' into functions 2019-09-03 18:12:57 +02:00
4dd3773283 Merge branch 'master' into functions 2019-09-03 16:30:22 +02:00
8443f319e3 quiet warning 2019-09-03 16:22:55 +02:00
d3210c2547 deduplicate vertex weights input code 2019-09-03 16:17:22 +02:00
24a02ee51b initial action context chaining 2019-09-03 16:07:31 +02:00
fc0a7648b5 fix finding execute sockets 2019-09-03 16:07:03 +02:00
a72bcf11e0 new Surface Weights input node 2019-09-03 15:13:27 +02:00
3398112573 refactor how input providers are parsed 2019-09-03 14:06:57 +02:00
f7206f9910 cleanup iterating over AttributeRefs 2019-09-03 13:50:22 +02:00
b245562d0e better error handling when expected action context is not given 2019-09-03 12:34:45 +02:00
2491dc812f rename stride to size 2019-09-03 11:58:45 +02:00
ee8f58eb66 move particle function input providers to separate file 2019-09-03 11:56:49 +02:00
e3454c0708 new Change Particle Size node 2019-09-03 11:39:11 +02:00
61ec4a3d89 move change color/velocity node to same file 2019-09-03 11:20:04 +02:00
370a506ad0 refactor age reached event 2019-09-03 11:16:17 +02:00
c78acc85f3 initial variation input for age reached event 2019-09-03 11:07:17 +02:00
b9a2dc60e1 rename attribute reference classes
AttributeArrays -> AttributesRef
NewParticles -> AttributesRefGroup
2019-09-03 10:53:07 +02:00
b513079ee2 Merge branch 'master' into functions 2019-09-03 10:30:32 +02:00
410599dca2 reorganize where interfaces are declared 2019-09-02 19:01:33 +02:00
551ca28108 remove unused parameter 2019-09-02 18:13:24 +02:00
147d2dfac5 don't pass particle allocator using BlockStepData 2019-09-02 18:08:44 +02:00
1d15c51bf9 use annotation for properties 2019-09-02 17:58:19 +02:00
0d700d201a remove ParticleSet and ParticleSets abstraction 2019-09-02 17:56:14 +02:00
d2fe280a6e improved Change Particle Velocity node 2019-09-02 16:09:52 +02:00
fce176dbd0 fix mesh emitter action context 2019-09-02 15:40:13 +02:00
49b6e1dccf abstract mesh surface action context 2019-09-02 15:13:49 +02:00
27081694f9 rename 2019-09-02 15:07:24 +02:00
4d46c481ac Merge branch 'master' into functions 2019-09-02 14:42:45 +02:00
06565e21ea use action context in mesh emitter 2019-09-02 12:31:49 +02:00
e45fb9e735 use more generic mesh surface action context 2019-09-02 12:11:58 +02:00
e485f030e8 fix temporary deallocation 2019-09-02 12:05:16 +02:00
2412efdf89 simplify mesh emitter more 2019-09-02 11:33:20 +02:00
9ff4828501 cleanup mesh emitter 2019-09-02 11:20:22 +02:00
bde76782eb sample varying float4x4 2019-09-02 11:13:19 +02:00
36016e2960 extract triangle sampling 2019-09-02 11:02:24 +02:00
381ece9410 extract birth moment computation 2019-09-02 10:48:21 +02:00
5f31282c46 Merge branch 'master' into functions 2019-09-02 09:59:03 +02:00
acd7915371 fix computing cumulative distribution 2019-08-28 18:05:39 +02:00
a55745ba7f sample weighted triangles differently 2019-08-28 18:01:10 +02:00
42c58fe840 support allocating larger buffers with temporary allocator 2019-08-28 16:29:30 +02:00
ea068aeb22 start implementing vertex group support in emitter 2019-08-28 14:23:38 +02:00
bc218feff1 append n times function for vector adaptor 2019-08-28 14:23:10 +02:00
fac51ca754 store attribute indices in string map 2019-08-28 12:16:51 +02:00
6e5e1e7ee7 store Range in AttributeArrays 2019-08-28 10:50:55 +02:00
c238c179d7 Merge branch 'master' into functions 2019-08-28 10:25:02 +02:00
25e5488594 don't store particle name in particle sets structure 2019-08-27 17:40:20 +02:00
b52c3b3fc7 Initial string socket type
The internal implementation is working, but not very efficient yet (every string
is allocated separately without any cache). I'm still thinking about a better
solution, but for now having any working text socket is more important.
2019-08-27 17:22:47 +02:00
7ca34c3838 Merge branch 'master' into functions 2019-08-27 14:23:35 +02:00
0ee75f415a bring back transform interpolation for mesh emitter 2019-08-27 13:54:03 +02:00
d95073c9c7 roll back some changes regarding world transition handling 2019-08-27 13:48:51 +02:00
5a7dfe59da fix some more warnings 2019-08-27 12:24:25 +02:00
c5449eb30f avoid some warnings 2019-08-27 12:20:54 +02:00
e12b1cf8ce fix some warnings 2019-08-27 12:17:56 +02:00
a32472bd31 remove unnecessary semicolon 2019-08-27 11:55:47 +02:00
955c931b45 Merge branch 'master' into functions 2019-08-27 11:19:58 +02:00
5ef500c27b cleanup arrayref and stringref 2019-08-26 15:48:26 +02:00
645a54107c add missing include 2019-08-26 15:37:16 +02:00
cd0f866aef move time from ParticlesState to SimulationState 2019-08-26 15:21:10 +02:00
2cf9e5070a start updating how the world state is used 2019-08-26 14:54:20 +02:00
357be047aa build virtual node tree in constructor 2019-08-26 12:17:51 +02:00
bccd47ab4f remove particle block from interfaces 2019-08-26 11:58:01 +02:00
5a3a155438 remove StepDescription and ParticleType entirely 2019-08-26 11:33:50 +02:00
3f01ddd5d2 don't use ParticleType abstraction in simulation code 2019-08-26 11:09:31 +02:00
0c98f500e2 don't use StepDescription abstraction in simulation code 2019-08-26 10:49:47 +02:00
3c541ff26c initial step simulator abstraction 2019-08-26 10:27:20 +02:00
7b08fe78e5 move simulation state to separate file 2019-08-26 10:05:08 +02:00
9efc8d1d9f combine particle and world state in c api 2019-08-26 09:57:40 +02:00
a5260c143c implicitely convert StringRef to std::string 2019-08-26 09:37:04 +02:00
43b449fc18 add missing const 2019-08-26 09:27:49 +02:00
08f0727864 add missing const 2019-08-26 09:25:42 +02:00
f4e3d5f30e Merge branch 'master' into functions 2019-08-26 09:18:17 +02:00
23c31ec27d add float hash 2019-08-25 14:34:10 +02:00
2e712d4eec add test 2019-08-25 14:30:36 +02:00
7e4715a534 remove unused macro 2019-08-25 14:23:32 +02:00
58754850ca remove unused mempool 2019-08-25 14:19:31 +02:00
dbdd6b88ef unify hash tables a bit 2019-08-25 14:07:56 +02:00
c52a4316d0 update the hashing template 2019-08-25 13:58:01 +02:00
bb81caeb1e Fix build error 2019-08-24 21:28:36 +02:00
6d0dad6290 Update Vector implementation 2019-08-23 17:35:19 +02:00
1e74b276c4 don't inline grow for other data structures 2019-08-23 16:57:24 +02:00
d49f1f8772 don't inline grow functions 2019-08-23 16:52:24 +02:00
f35171a9a8 add some comments 2019-08-23 16:32:49 +02:00
a3d9fc20cf store usable slots in open addressing array 2019-08-23 16:25:43 +02:00
c52e381c8b Add license header 2019-08-23 16:06:07 +02:00
af89849067 replace magic number 2019-08-23 16:04:21 +02:00
4d2dcb6a5f Initial implementation of updated ui proposal 2019-08-23 15:41:33 +02:00
9c05112910 fix after merge 2019-08-23 10:12:22 +02:00
dc383b2bfd Merge branch 'master' into functions 2019-08-23 10:01:55 +02:00
c20301adf1 fix build error 2019-08-22 14:19:30 +02:00
ac4c2b3a48 Merge branch 'master' into functions 2019-08-22 12:14:56 +02:00
Eitan
9644f7c8c7 New boolean math node with And, Or and Not operation 2019-08-22 11:47:30 +02:00
1a0a642063 fix boolean c++/llvm conversion 2019-08-22 11:44:56 +02:00
b0034fd7a2 more comments 2019-08-21 18:24:05 +02:00
33949188a7 add some comments 2019-08-21 17:57:42 +02:00
fda6430d6a improve const correctness in many places 2019-08-21 17:38:54 +02:00
700ff7b073 Merge branch 'master' into functions 2019-08-21 17:29:22 +02:00
6f511f6722 Fix raw allocator
This allocator is necessary because sometimes we don't want to use
Blenders guarded allocator. Especially when an object lives longer
than the guarded allocator.
2019-08-21 14:44:09 +02:00
7f79bc3054 Merge branch 'master' into functions 2019-08-21 09:27:24 +02:00
8c95d02504 more tests 2019-08-20 18:45:26 +02:00
6c78f41a2f add StringMap tests 2019-08-20 18:31:19 +02:00
0b2164c5ed remove unused MappedArrayRef class 2019-08-20 18:12:20 +02:00
b45cd6b8bd implement an actual string map that does not rely on std::string 2019-08-20 18:08:17 +02:00
dc01c108d4 improve ArrayRef and StringRef 2019-08-20 18:07:31 +02:00
075a36ae95 Merge branch 'master' into functions 2019-08-20 18:05:44 +02:00
c26a23f245 fix set vector remove 2019-08-20 12:34:39 +02:00
f591503f32 Merge branch 'master' into functions 2019-08-20 09:57:12 +02:00
206495642f Merge branch 'master' into functions 2019-08-19 18:42:56 +02:00
a6b66db204 cleanup Map 2019-08-19 18:34:26 +02:00
ecb8d0bdae cleanup Set 2019-08-19 18:30:16 +02:00
a00101ae5d move hash table slot iterators out of class 2019-08-19 18:24:16 +02:00
6f79e52665 Initial support for custom allocators for containers 2019-08-19 18:18:20 +02:00
607942330c Merge branch 'master' into functions 2019-08-19 10:39:12 +02:00
38b973a679 New Map, Set and SetVector implementation
All tests are runnings still, but I need to do more testing in the upcoming days.
This implementation uses a different approach for sharing code between
the different structures. I tried different abstractions in the last weeks
and this is the best one I found so far.
2019-08-18 16:31:48 +02:00
de8a52dcee low level memory utilities in blenlib 2019-08-18 12:12:39 +02:00
b0ca3469ed Merge branch 'master' into functions 2019-08-18 12:05:11 +02:00
25ab857e4d Fix particle tetrahedon mesh generation 2019-08-18 12:05:00 +02:00
a8eb9448e7 Merge branch 'master' into functions 2019-08-16 15:03:06 +02:00
f52b66c7ec cleanup type usage 2019-08-14 15:32:26 +02:00
a0d9f387bb free types when Blender exits 2019-08-14 15:20:33 +02:00
e16afbe4f5 use guarded allocator for some core types 2019-08-14 14:59:24 +02:00
7921c6cb7e store types in global variables 2019-08-14 14:39:39 +02:00
def527c9b0 Do not use a reference counter for Types
Types can be expected to stay alive until Blender exists.
This also works well with the fact that they are identified
by their pointer.

Furthermore, the number of types is fairly low, but they
are passed around a lot. Maintaining a thread-safe reference
count seems to be unnecessary overhead.
2019-08-14 13:59:05 +02:00
f073f232cf improve map method names 2019-08-14 11:53:08 +02:00
b7bc639d00 add more license headers 2019-08-14 11:46:29 +02:00
d39f5109cc add license header to blenlib files 2019-08-14 11:44:11 +02:00
1ca951cb6f Merge branch 'master' into functions 2019-08-14 09:57:15 +02:00
8b0706a6c1 fix compile error 2019-08-13 13:27:43 +02:00
180d46c76e remove copy to clipboard 2019-08-13 11:43:20 +02:00
a1fef73075 Merge branch 'master' into functions 2019-08-13 11:28:49 +02:00
1ebfffa310 fix compile error on windows 2019-08-12 17:55:52 +02:00
artem ivanov
0b15817ad2 More Float Math operations
Differential Revision: https://developer.blender.org/D5433
2019-08-12 16:36:31 +02:00
Eitan
e0ebaf8f3c Add multiply and divide to vector math node
Differential Revision: https://developer.blender.org/D5430
2019-08-12 16:24:58 +02:00
8aa6ff8ec9 Reimplement the way many arrays are allocated
This new implementation is more generic and easier to use.
2019-08-12 15:50:08 +02:00
52578524bd remove AttributeArrayCore class
It worked well, but having it does not provide enough value
to justify the additional complexity.
2019-08-12 10:30:51 +02:00
00d456761f Merge branch 'master' into functions 2019-08-12 09:23:25 +02:00
8ef0c6b0df Merge branch 'master' into functions 2019-08-07 12:02:06 +02:00
b277709d53 comment some library functions 2019-08-07 12:00:23 +02:00
f8909cfab7 only wrap intrusive listbases for now 2019-08-07 11:40:16 +02:00
4457268059 add some comments 2019-08-07 11:14:14 +02:00
b429156131 experimental reloadable function inputs 2019-08-07 11:04:30 +02:00
2428486775 allocate aligned from monotonic allocator 2019-08-07 10:54:01 +02:00
468be50313 remove unnecessary small object optimization for monotonic allocator 2019-08-07 09:33:37 +02:00
e231654e24 cleanup llvm function type creation 2019-08-06 17:40:25 +02:00
b0585aa4d4 rename element_amount to size 2019-08-06 17:23:00 +02:00
b04ec4faa5 move function to correct file 2019-08-06 17:17:34 +02:00
b46e26cd34 Fix exception when using the node search 2019-08-06 16:17:35 +02:00
71ec8895b7 rename tuple folder to cpp 2019-08-06 11:59:36 +02:00
4022d8784c New list implementation
Instead of using a templated list, it is easier to use a "generic" list, that can
handle every type with a CPPTypeInfo extension. This simplifies the code quite
a bit, because templates can be avoided in many places.
This also makes it easier to add new types.

The list will still be refcounted and still have the shared immutability semantic.
So when a list has more than one user, it is immutable.
2019-08-06 11:54:49 +02:00
a0364a6227 rename files for consistency 2019-08-05 18:18:59 +02:00
2a7b684a8a Merge branch 'master' into functions 2019-08-05 17:17:16 +02:00
b3d5ef9971 remove unused function 2019-08-05 16:35:27 +02:00
bd56ee7a78 cleanup cpp type extension 2019-08-05 15:51:05 +02:00
18820b10fd rename file 2019-08-05 14:59:34 +02:00
39989cb106 rename multimap to multi_map 2019-08-05 13:43:00 +02:00
4f282b4216 Allow passing unlinked input handlers to graph generation 2019-08-05 13:13:09 +02:00
3ea03318bb fix compile error and warning on macos 2019-08-05 13:07:40 +02:00
d5546057f2 rename classes 2019-08-05 12:58:31 +02:00
31c6db7d2a separate unlinked input grouper from inserter 2019-08-05 12:51:32 +02:00
5b8feb038d simple multivector data structure 2019-08-05 12:49:21 +02:00
80ce0cd20f join map.lookup and map.lookup_ref 2019-08-05 12:10:00 +02:00
artem ivanov
d0cdadc81e More vector math operations: Subtract, Cross Product, Reflect 2019-08-05 11:50:00 +02:00
db88d6e1a5 fix auto vectorization when function does not have certain bodies 2019-08-05 11:49:15 +02:00
6b1e4f51c0 Merge branch 'master' into functions 2019-08-05 10:39:52 +02:00
05d85c52a2 rename 2019-08-02 19:18:13 +02:00
8e9323cafa experiment with different ways to group unlinked inputs 2019-08-02 19:12:13 +02:00
afe19d51e3 remember placeholder nodes after they are created 2019-08-02 18:57:19 +02:00
f149445d38 vector.fill_indices 2019-08-02 18:51:02 +02:00
c21f39578f easily create dot graph from vtree data graph builder 2019-08-02 17:42:45 +02:00
d51db9a526 don't create array ref from single value 2019-08-02 17:42:15 +02:00
fb034c8e14 fix dot export after recent changes 2019-08-02 17:41:45 +02:00
5176484fbc rename UnlinkedInputsHandler to InputInserter 2019-08-02 16:22:06 +02:00
71d8ebd201 refactor how information about the node tree is stored 2019-08-02 16:11:25 +02:00
375577cfb9 improve file names 2019-08-02 14:10:39 +02:00
92319905a0 unify mapping names 2019-08-02 14:07:14 +02:00
2f3ccb7e90 move all tree mappings into folder 2019-08-02 14:00:46 +02:00
d537af9303 execute action for new particles after explosion 2019-08-02 13:43:56 +02:00
2be7226e86 new rgba_b attribute type 2019-08-02 13:21:12 +02:00
d022328974 new float2 particle attribute type 2019-08-02 13:18:57 +02:00
7f802fb750 initial texture color access after collision 2019-08-02 12:56:10 +02:00
3411511499 new float2 and rgba_b types 2019-08-02 12:52:40 +02:00
645293e2d9 remove redundant values 2019-08-02 10:08:51 +02:00
c5caaafd7f move collision info and particle info node in same file 2019-08-02 09:37:37 +02:00
363ba2ee7a Merge branch 'master' into functions 2019-08-02 09:27:17 +02:00
219573de22 Fix: Build error with MSVC
Zero sized arrays not being at the end of struct/class makes MSVC sad
2019-08-01 15:25:07 -06:00
480e284250 Merge branch 'master' into functions 2019-08-01 18:24:20 +02:00
f0b7499750 support for default values for vectorized inputs 2019-08-01 18:19:58 +02:00
d63f673e05 move input handlers to separate file 2019-08-01 17:55:47 +02:00
b07626e48b fix use after free in python 2019-08-01 17:25:54 +02:00
79b85c1426 add ability to store socket values as constants in IR 2019-08-01 17:18:34 +02:00
787e97057a return function body instead of bool 2019-08-01 17:18:07 +02:00
eb403083c6 support that tuples own their meta data 2019-08-01 17:17:36 +02:00
d3763513ff remove timer 2019-08-01 16:35:23 +02:00
f9a555a60a don't load socket values dynamically 2019-08-01 16:35:06 +02:00
d91a5b69d9 cleanup socket loaders 2019-08-01 16:06:25 +02:00
46bd09b789 cleanup 2019-08-01 15:56:00 +02:00
faeb98b48e compute type of every socket only once 2019-08-01 15:36:37 +02:00
0b970bc160 fix fill constructor of vector 2019-08-01 15:36:16 +02:00
795bae3410 cleanup type mappings 2019-08-01 15:07:04 +02:00
e606316ed6 rename refresh to sync_tree 2019-08-01 14:55:55 +02:00
13dce85083 fix float math node inputs 2019-08-01 14:55:20 +02:00
0ef25d8001 cleanup 2019-08-01 14:36:52 +02:00
104df5f5f2 support color in Custom Emitter node 2019-08-01 14:16:12 +02:00
69a8699b54 fix use-after-free crash from python 2019-08-01 14:15:56 +02:00
3d1de1e44e cache enum items in python 2019-08-01 14:15:28 +02:00
ffbe506a55 rename DFGraphSocket to DataSocket 2019-08-01 13:33:40 +02:00
3d2e279b3d rename DataFlowGraph to just DataGraph 2019-08-01 13:30:13 +02:00
6dc48fd18d replace DataFlowGraphBuilder implementation 2019-08-01 13:26:34 +02:00
218fcf4473 replace another map with a vector 2019-08-01 10:28:30 +02:00
1fd26737b5 use virtual socket index to replace a map with a vector 2019-08-01 10:16:56 +02:00
2f948952b5 store an index per virtual socket 2019-08-01 10:16:36 +02:00
f6ef23ebe7 remove IndexedNodeTree data structure in favor of VirtualNodeTree 2019-08-01 09:59:55 +02:00
fe5356bf25 Merge branch 'master' into functions 2019-08-01 09:52:03 +02:00
4c8746a965 Merge branch 'master' into functions 2019-07-31 18:41:50 +02:00
28ba204e17 easy access to identifier of socket 2019-07-31 18:41:06 +02:00
56e541dba6 identify types with idname 2019-07-31 18:35:24 +02:00
27b365058e remove last remainings of GraphInserters 2019-07-31 18:28:14 +02:00
22bd4ad4fb move more code out of GraphInserters 2019-07-31 17:53:37 +02:00
7ffa849297 start removing graph inserters 2019-07-31 17:43:46 +02:00
385e61a122 cleanup VTreeDataGraph creation 2019-07-31 17:28:48 +02:00
a5bc1b002f rename file 2019-07-31 17:21:43 +02:00
8e8049fa28 move VTreeDataGraph to separate file 2019-07-31 17:18:29 +02:00
b1fb402e1b cleanup VTreeDataGraph 2019-07-31 17:11:26 +02:00
69b0da1987 rename BTreeGraphBuilder to VTreeDataGraphBuilder 2019-07-31 17:01:33 +02:00
ed4db612f8 new Combine Color node 2019-07-31 16:57:04 +02:00
3e406633f7 only compile when there are outputs 2019-07-31 16:49:12 +02:00
529b78160c move ui code of multiple nodes in the same file 2019-07-31 16:29:14 +02:00
38463de2d9 extract some methods from llvm array execution 2019-07-31 16:09:20 +02:00
b6e533a0d9 don't expose different array execution functions 2019-07-31 15:48:50 +02:00
0f80acd54b don't prepare execution stack when not necessary 2019-07-31 15:40:11 +02:00
0f3b50329c cleanup llvm ir when stack info is maintained 2019-07-31 15:18:36 +02:00
14bb065f13 support for compiling particle functions down to machine code 2019-07-31 14:54:28 +02:00
eaaa8610fa some llvm usage improvements 2019-07-31 14:27:30 +02:00
36f0132394 llvm does not permit void*, so replace all uses with i8* 2019-07-31 14:24:44 +02:00
670537ed8a initial tuple call array execution 2019-07-31 11:23:13 +02:00
bff87f3a9a fix merge conflict 2019-07-31 10:35:33 +02:00
5878add697 Merge branch 'master' into functions 2019-07-31 10:30:30 +02:00
3e0fd90605 use another strategy to create functions for unlinked inputs 2019-07-30 16:13:44 +02:00
042cc17bab clang-format 2019-07-30 15:06:22 +02:00
760e084791 show node search in menu 2019-07-30 14:59:28 +02:00
9d3a92d3e3 use background color for particle type node 2019-07-30 14:59:28 +02:00
e54acfa2ff rename 2019-07-30 14:59:28 +02:00
5841005187 add buttons to create particle type nodes 2019-07-30 14:59:28 +02:00
4f5093f403 renamed particle_modifier_output to particle_effector_output 2019-07-30 14:55:15 +02:00
26d0bbffa8 added point force node for particle nodes 2019-07-30 14:41:28 +02:00
773b6bbd42 rename modifier to effector in some places
That was missing in a previous commit.
2019-07-30 13:58:17 +02:00
c2e63d660b add color attribute type 2019-07-30 13:44:39 +02:00
33c29f35b8 simplify the way attribute information is stored 2019-07-30 13:27:37 +02:00
4bbee4acf2 new Change Particle Color node 2019-07-30 12:14:42 +02:00
99e5f16d4a new Separate Color node 2019-07-30 12:01:33 +02:00
093583620c new color socket type 2019-07-30 12:01:00 +02:00
d29052a514 make object an input in mesh collision event 2019-07-30 10:59:51 +02:00
937dde6060 fix wrong element size due to alignment 2019-07-30 10:59:34 +02:00
e41084f94a cleanup style 2019-07-30 10:20:40 +02:00
40b3c50837 Merge branch 'master' into functions 2019-07-30 10:08:15 +02:00
9fb73c42fd windows compile fixes - missing includes 2019-07-29 20:28:30 +02:00
c62b1850e3 rename "size_of_type" to just "size" 2019-07-29 17:55:52 +02:00
910431e382 start taking alignment of types into account when constructing tuples 2019-07-29 17:53:12 +02:00
bd514d20e0 remove more redundant code 2019-07-29 17:21:21 +02:00
e38e761ba6 remove more redundant code 2019-07-29 17:17:38 +02:00
b645fa8d12 remove more redundant code 2019-07-29 17:13:42 +02:00
0bf70bde16 rename try_get_T to try_get<T> 2019-07-29 17:07:03 +02:00
f78e2837ff change get_T to get<T> when accessing attributes 2019-07-29 17:03:32 +02:00
deecc8c6f8 fix error when using Call node 2019-07-29 16:43:11 +02:00
555d29a0fe initialize particles with IDs 2019-07-29 16:39:35 +02:00
c28a441a9d fix coyp paste error 2019-07-29 16:05:08 +02:00
74bdbb94e5 add integer attribute type 2019-07-29 15:48:59 +02:00
d2c1f7b9ca initial particles block id 2019-07-29 15:16:21 +02:00
aa1c4663a1 remove lots of redundant code 2019-07-29 15:08:05 +02:00
ac5bf8e4f9 initial age output in particle info node 2019-07-29 14:50:19 +02:00
e87cd0c807 introduce input provider interface 2019-07-29 14:02:04 +02:00
e2a6763be3 support for freeing particle function input arrays 2019-07-29 13:51:41 +02:00
c2461a8b87 extract method to create particle function input provider 2019-07-29 13:39:17 +02:00
f2d3539cb5 new particle function input providers abstraction 2019-07-29 13:30:55 +02:00
dbc453f414 extract methods from particle function evaluation 2019-07-29 12:30:59 +02:00
58c67cdde4 remove unnecessary typedef 2019-07-29 12:19:01 +02:00
4ed19b6b1e cleanup particle function builder 2019-07-29 12:16:55 +02:00
888aec8234 move particle function building to separate file 2019-07-29 12:07:08 +02:00
5a1a8fa917 handle inputs with no dependencies separately 2019-07-29 11:55:25 +02:00
ed2180832e use debug name checking again 2019-07-29 11:20:42 +02:00
904966b3ef particle function contains two functions: with/without dependencies 2019-07-29 11:14:38 +02:00
6e83213a5f utility to iterate over trivial particle indices 2019-07-29 10:06:48 +02:00
41f83ef571 scoped timer per element 2019-07-29 10:03:27 +02:00
a8c46c4bf0 fix after merge 2019-07-29 09:13:38 +02:00
1b274efd7c Merge branch 'master' into functions 2019-07-29 09:09:33 +02:00
248ee40712 Cleanup: Fix build error with msvc. 2019-07-25 15:18:33 -06:00
7db0b9c265 add utility to combine strings on the stack 2019-07-25 15:09:57 +02:00
7a3e5c1dad simplify creating particle function 2019-07-25 14:31:25 +02:00
9b3e1859ef simplify action builders 2019-07-25 14:20:36 +02:00
63a9949c27 compute particle functions more centrally for events 2019-07-25 10:18:22 +02:00
6c3afa7801 create particle function for force inputs more centrally 2019-07-25 10:06:03 +02:00
7e4c489778 use particle function for gravity force 2019-07-25 10:01:10 +02:00
c92dd7bed6 create particle function more centrally for offset handlers 2019-07-25 09:54:46 +02:00
7de561f930 Merge branch 'master' into functions 2019-07-25 09:42:45 +02:00
03f4489e4d Merge branch 'master' into functions 2019-07-24 19:19:46 +02:00
93b01da75e use threading again 2019-07-24 19:10:55 +02:00
3976570539 use particle function in Age Reached event 2019-07-24 19:07:55 +02:00
2d925db8b0 fix double free and optimize when particle function inputs have no dependencies 2019-07-24 19:07:38 +02:00
fd0226f614 handle type extensions as references instead of pointers by default 2019-07-24 17:52:22 +02:00
85536c5e75 use function bodies as references instead of pointers by default 2019-07-24 17:43:00 +02:00
f54507724f rename 2019-07-24 17:13:33 +02:00
54724cc5b3 simplify usage of particle functions 2019-07-24 17:12:13 +02:00
b60b193384 do more checks when debugging 2019-07-24 16:27:07 +02:00
299ba77cc9 fix false positive memory leak 2019-07-24 16:15:06 +02:00
c0fd3b6962 remove tests because their are more trouble than they are worth currently 2019-07-24 16:14:50 +02:00
dec218643e use particle function in turbulence node 2019-07-24 15:54:16 +02:00
1cc5f83442 introduce force interface 2019-07-24 15:46:30 +02:00
e468ca977e use particle function in trails node 2019-07-24 15:25:43 +02:00
d9f02f209b further simplify usage of particle function 2019-07-24 15:09:55 +02:00
f169a5eeb7 improve particle function 2019-07-24 15:06:07 +02:00
bdcca74b23 rename 2019-07-24 14:47:05 +02:00
1f79a069d3 move particle function to separate file 2019-07-24 14:44:36 +02:00
d4f57524be rename 2019-07-24 13:58:04 +02:00
89001688d6 rename EventInfo to ActionContext 2019-07-24 13:56:07 +02:00
2859cf6902 cleanup executing actions 2019-07-24 13:50:36 +02:00
bc9d51d048 expose collision normal in new Collision Info node 2019-07-24 13:33:12 +02:00
712701a4ef remember socket that triggered an action 2019-07-24 12:52:35 +02:00
f777ac8a52 use new function creation method for action and offset handlers 2019-07-24 12:36:13 +02:00
efa9b1cc41 use error handling for event nodes 2019-07-24 11:47:37 +02:00
5de6dca2f5 create function to compute force inputs 2019-07-24 11:43:28 +02:00
cb091c196f use better error handling for other emitters 2019-07-24 11:37:30 +02:00
d9348adb33 better error handling when creating function for emitter inputs 2019-07-24 11:33:15 +02:00
f1c69c71c6 move FunctionBuilder to separate file and add more methods 2019-07-24 11:32:40 +02:00
b1425fc68b namespace fix 2019-07-24 11:31:53 +02:00
556691b19a Improve error handling with ValueOrError class
We might want to use exceptions instead of this.
I'm not sure yet.
2019-07-24 10:58:11 +02:00
a0f9564d1b cleanup finding placeholder dependencies 2019-07-24 10:14:51 +02:00
c21d8bd0d9 cleanup finding node inputs 2019-07-23 19:03:49 +02:00
a18d338d3f minor improvements 2019-07-23 19:02:39 +02:00
a781b6fc3a rename BTreeDataGraph to VTreeDataGraph 2019-07-23 18:06:41 +02:00
17dd4e03b8 move function generation file to correct file 2019-07-23 18:04:27 +02:00
fa26630d87 fix uninitialized memory 2019-07-23 18:00:24 +02:00
937a448de2 Remove Composition data structure
This simplifies the code and speeds up accessing function
bodies and type extensions. Now, a lock is only necessary
when create new bodies or extensions.

This is achieved at the cost of having a slighly less generic
system, because we have to give e.g. different function body
types different IDs. Since the number of different types
is expected to be fairly low, this trade off is worth it.
2019-07-23 16:54:40 +02:00
d6a7832f6d simplify virtual node tree usage 2019-07-23 14:59:18 +02:00
9869bc3bc4 Merge branch 'master' into functions 2019-07-23 09:46:00 +02:00
d6b7aecbbc reorder lines 2019-07-22 17:58:31 +02:00
5bcc78ada9 remove builders that are not necessary for now 2019-07-22 17:57:20 +02:00
c900098170 remove unnecessary usings 2019-07-22 17:34:03 +02:00
51fb6b5098 remove unnecessary type definitions 2019-07-22 17:31:20 +02:00
5a269bfb57 remove "small" from test names 2019-07-22 17:19:35 +02:00
f0c164b861 rename SmallVector to Vector 2019-07-22 17:17:47 +02:00
a1ba33090b rename SmallMap to Map 2019-07-22 17:10:42 +02:00
6a63774f43 rename SmallMultiMap to MultiMap 2019-07-22 17:07:58 +02:00
d0d6f38754 rename SmallStack to Stack 2019-07-22 17:05:37 +02:00
f179b2dd30 rename SmallSetVector to SetVector 2019-07-22 16:59:52 +02:00
f9caf48eab Rename SmallSet to just Set
The fact that the data structure has small object optimization
is not important enough to justify a more complex name.
Following commits will rename other data structures.
2019-07-22 16:57:59 +02:00
f039c43f95 cleanup 2019-07-22 16:47:32 +02:00
4b42c112fd cleanup accessing rna of virtual node 2019-07-22 16:46:11 +02:00
3dfbbf606e cleanup accessing node names 2019-07-22 16:40:29 +02:00
9a4d125533 use virtual node tree for parsing particle system node trees 2019-07-22 16:35:49 +02:00
7d5ee7c689 start using virtual node tree to generate functions 2019-07-22 15:49:13 +02:00
c71997dd67 initial virtual node tree 2019-07-22 14:19:12 +02:00
fb26304aa2 ArrayRef.contains_ptr 2019-07-22 14:18:43 +02:00
8a69395d6a rename SocketBuilder to NodeBuilder 2019-07-22 12:41:02 +02:00
86fb4243d1 cleanup 2019-07-22 12:37:31 +02:00
ddf0b72870 make socket.data_type a class property 2019-07-22 12:32:51 +02:00
b7efaadb8e get socket data type from idname 2019-07-22 12:04:42 +02:00
227a28e9e5 remove dead code 2019-07-22 10:49:46 +02:00
b1d21db61b remove colored socket builder 2019-07-22 10:48:34 +02:00
6356f27a87 Merge branch 'master' into functions 2019-07-22 10:24:28 +02:00
fa9f34c056 show particle type names in nodes 2019-07-20 14:21:22 +02:00
1180996832 add ability to select output mesh type in modifier settings 2019-07-20 14:06:51 +02:00
dd47cbf3b7 use constant velocity integrator when there are no forces 2019-07-20 13:40:00 +02:00
0767dad328 rename function 2019-07-20 13:39:17 +02:00
9fa5d75d80 Fix moving sets and maps 2019-07-20 12:57:12 +02:00
ff398d29a6 Merge branch 'master' into functions 2019-07-20 11:53:07 +02:00
9a965af529 move offset handlers to separate file 2019-07-18 17:34:40 +02:00
49d2d8b47e add timer 2019-07-18 17:18:52 +02:00
10c81747fe splitup remainings of core.hpp 2019-07-18 17:16:40 +02:00
c23ccfc0ac separate files for particle state and allocator 2019-07-18 16:59:31 +02:00
0645752ab7 cleanup 2019-07-18 16:59:08 +02:00
bd49708841 rename target to new_particles 2019-07-18 16:49:20 +02:00
c67953c53e move particle set to separate file 2019-07-18 16:47:10 +02:00
182cc12015 fix trail creation for partial time steps 2019-07-18 16:39:28 +02:00
83e75345a2 simple rate input for Trail node 2019-07-18 16:19:31 +02:00
e29914292a missing destructor 2019-07-18 15:57:34 +02:00
6793bab243 use proper constructors for step description and particle type 2019-07-18 15:39:05 +02:00
2c0c758d72 make StepDescription class non-virtual 2019-07-18 15:30:48 +02:00
234f5d9407 make ParticleType class non-virtual 2019-07-18 15:28:08 +02:00
d0eed2a7ac change how particle types declare which attributes they need 2019-07-18 15:23:45 +02:00
023f477bdd rename AttributesInfoBuilder to AttributesDeclaration 2019-07-18 15:04:23 +02:00
8dd5be76c0 initial step desription builder 2019-07-18 14:59:07 +02:00
24c5a21977 remove redundant particle type name storage 2019-07-18 14:30:53 +02:00
f2737b927d rename ForwardListener to OffsetHandler 2019-07-18 14:04:38 +02:00
1272208b2b remove redundant information 2019-07-18 13:52:58 +02:00
d908edbc8a cleanup 2019-07-18 13:47:13 +02:00
9fd56bed3f cleanup 2019-07-18 13:44:29 +02:00
e47c49c872 remove redundant information 2019-07-18 13:40:36 +02:00
168f5964b6 remove redundant information 2019-07-18 13:37:04 +02:00
fe8cace993 use block step data in more places 2019-07-18 12:56:22 +02:00
ea6bbc1aec use step block data in more functions 2019-07-18 12:39:02 +02:00
d1f05d2415 use step block data in more functions 2019-07-18 12:22:47 +02:00
a6914c973f introduce BlockStepData as container for data that would have to be passed into many functions 2019-07-18 12:16:10 +02:00
7aa22a24a7 initial forwarding listeners + particle trail node
Still looking for a better name instead of Forwarding Listeners
2019-07-18 12:08:36 +02:00
4672d7aa83 Merge branch 'master' into functions 2019-07-18 10:37:40 +02:00
d6230d1563 don't always use cache for now since it makes testing more annoying 2019-07-17 18:01:25 +02:00
e800a2d5fa experimental initial grid emitter 2019-07-17 17:45:44 +02:00
0df9c55578 pass time step in from the modifier 2019-07-17 17:11:05 +02:00
a2b128a451 experimental Close By Points event 2019-07-17 16:46:13 +02:00
54f7163310 minor changes 2019-07-17 15:57:17 +02:00
09bc3a0aac Revert "use evaluated node tree"
This reverts commit eddb4d0af4.

Sometimes the evaluated node trees are not updated when the real
node tree changes. Use original trees until this is fixed.
2019-07-17 11:20:47 +02:00
da04c045fe velocity and size input for point emitter 2019-07-16 18:18:53 +02:00
ce2081e5b3 support for interpolated float values 2019-07-16 18:18:09 +02:00
06d8ed1a8a store color per particle 2019-07-16 17:59:20 +02:00
ec7054772b utility operators to create emitter and particle system trees 2019-07-16 17:33:13 +02:00
bd573cf2d7 use vector adaptor instead of pointer+length in fgraph tuple call 2019-07-16 16:29:13 +02:00
667b56f87b use "ifdef DEBUG" instead of "if DEBUG" 2019-07-16 16:28:49 +02:00
eddb4d0af4 use evaluated node tree 2019-07-16 16:12:56 +02:00
c41a9d0e88 fix fgraph tuple call 2019-07-16 16:12:06 +02:00
55a74c35dd fix vector math node 2019-07-16 15:59:42 +02:00
c35feef507 new node to get the vertices of a mesh 2019-07-16 15:36:22 +02:00
9a02226aa2 support for geometry dependencies of functions 2019-07-16 15:35:50 +02:00
f4dac36c05 extract another function for linking 2019-07-16 14:52:06 +02:00
a5b90dc661 extract method that links functions 2019-07-16 14:43:47 +02:00
70f8f3231b Custom Emitter functions can have inputs now 2019-07-16 14:33:08 +02:00
6a8985dfa5 utility to map multiple sockets 2019-07-16 13:22:58 +02:00
f0cc032f83 construct SmallVector from arbitrary containers 2019-07-16 13:04:26 +02:00
39ebd2fd1f more general function tree dependency discovery 2019-07-16 12:57:30 +02:00
8fec347121 more powerful custom emitter 2019-07-16 11:37:43 +02:00
f058e7b11a remove unnecessary check 2019-07-16 11:32:12 +02:00
8ba1856a13 fix bug in fgraph tuple call 2019-07-16 11:32:01 +02:00
38e223e392 initialize attributes by repeating a given array 2019-07-16 10:00:57 +02:00
f388fdc4f1 Merge branch 'master' into functions 2019-07-16 09:37:19 +02:00
36bd4e1225 get rid of static block size 2019-07-15 18:09:07 +02:00
e95c0078a2 initial custom function emitter 2019-07-15 17:56:02 +02:00
94d2a11636 more debug time checks 2019-07-15 17:25:19 +02:00
ad6fa16304 use more debug time checks 2019-07-15 17:19:02 +02:00
c5d18a0a8a check that indices correspond to correct outputs in debug build 2019-07-15 17:09:32 +02:00
6d208e3183 remove indirection 2019-07-15 16:54:47 +02:00
89a8b1f4f5 cleanup events 2019-07-15 16:51:23 +02:00
aefdc1807a cleanup emitters 2019-07-15 16:43:27 +02:00
b5a74ae166 remove a level of indirection 2019-07-15 16:23:42 +02:00
034956978e more boilerplate code removal 2019-07-15 16:18:59 +02:00
fa9bf0c5b1 cleanup 2019-07-15 16:15:06 +02:00
719357ffda revisit autorefcount 2019-07-15 16:07:24 +02:00
f2421c042e abstract interpolated vectors and matrices 2019-07-15 15:35:45 +02:00
0b3ff01ba4 bring back some emitter settings 2019-07-15 15:23:20 +02:00
39476c5ce3 remove boilerplate code for emitters 2019-07-15 15:18:35 +02:00
419f0de8d3 initialize emitter differently 2019-07-15 15:11:36 +02:00
25b3b122e6 experiment with remembering last point emitter position 2019-07-15 14:39:59 +02:00
2e1ba1c02a interpolate vectors 2019-07-15 14:37:37 +02:00
65f2000075 cleanup variable shadowing 2019-07-15 13:49:29 +02:00
3c979ed37e delete particles in same taskpool as simulation 2019-07-15 12:08:23 +02:00
89b625a0ce Merge branch 'master' into functions 2019-07-15 11:47:47 +02:00
b6b26efb9f Merge branch 'master' into functions 2019-07-12 15:06:01 +02:00
a84fcf8cde actually use threading... 2019-07-12 14:49:30 +02:00
60a2d39782 remove temporary code 2019-07-12 14:08:34 +02:00
45b4704df6 use function to compute point input of point emitter 2019-07-12 14:05:33 +02:00
3915ca912a remove unused code 2019-07-12 13:58:11 +02:00
82844c5f11 cleanup dependency builder 2019-07-12 13:51:20 +02:00
b6c1d3e1bd make updating depsgraph work again 2019-07-12 12:39:57 +02:00
fe4c294656 improve fgraph dependencies 2019-07-12 12:24:43 +02:00
b6820e4a87 fixes 2019-07-12 12:17:43 +02:00
da34e3476e cleanup 2019-07-12 12:02:26 +02:00
b0015fc7cd multimap fix 2019-07-12 12:00:39 +02:00
c77abe1e8d initial revised function dependency handling 2019-07-12 10:33:22 +02:00
5366c5c827 utility functions to access data flow graph 2019-07-12 10:27:52 +02:00
53d00eb08b simplify array printing 2019-07-12 10:14:27 +02:00
b124984220 fix when there are no triangles in mesh 2019-07-12 10:14:12 +02:00
3708e233b5 add multiple in multimap 2019-07-12 09:16:44 +02:00
5b7f49edc4 comment in stringmap 2019-07-11 16:34:53 +02:00
800a578ed7 use StringMap everywhere 2019-07-11 16:30:46 +02:00
12149d8e1b initial string map 2019-07-11 15:50:46 +02:00
05d742427f cleanup action builders 2019-07-11 15:39:06 +02:00
d8719603f8 pass build context instead of separate parameters 2019-07-11 15:30:13 +02:00
db6a45ce1f reorder functions 2019-07-11 15:21:11 +02:00
e0a7c11dd0 cleanup simple emitter builders 2019-07-11 15:14:12 +02:00
32e435bbc3 simplify event inserters 2019-07-11 14:44:01 +02:00
9f1c625056 cleanup force node handling 2019-07-11 14:29:17 +02:00
abb76708d1 simplify create function for node inputs 2019-07-11 13:47:53 +02:00
79ec9180e6 rename GeneratedGraph to BTreeDataGraph 2019-07-11 13:37:43 +02:00
57f7d83def cleanup executing actions for a subset 2019-07-11 12:47:05 +02:00
8eb57698c4 cleanup running action from event 2019-07-11 12:36:09 +02:00
401ff628bd settings size in point emitter is not necessary anymore 2019-07-11 12:28:31 +02:00
75cc874922 introduce attributes info builder 2019-07-11 12:24:06 +02:00
7a62e775bb simplify calling action from emitter 2019-07-11 11:46:10 +02:00
615269b749 rename modifiers to effectors 2019-07-11 11:20:15 +02:00
202708eeae run action on particle birth 2019-07-11 11:17:53 +02:00
5114a48fd7 correct usage of attribute offsets that are not available 2019-07-11 10:15:56 +02:00
35dcbf506d fill an array partially 2019-07-11 09:53:39 +02:00
ed9bc5f5c0 Merge branch 'master' into functions 2019-07-11 09:37:08 +02:00
5f02cc2d3a simple clear cache operator 2019-07-10 17:17:26 +02:00
5216bf6014 get rid of particles.range() 2019-07-10 16:53:39 +02:00
dee695f2da cleanup usage of particle indices 2019-07-10 16:45:05 +02:00
4d6b6ab7e3 fix wrong index access 2019-07-10 16:34:07 +02:00
d7fd4ed39c rename particle_indices to pindices 2019-07-10 16:30:45 +02:00
b5af31fb57 use particle indices to trigger particles 2019-07-10 16:28:43 +02:00
157f0aedcb remove unused code 2019-07-10 16:23:16 +02:00
37a3a41de8 cleanup 2019-07-10 16:21:28 +02:00
8e2ae56b25 access time factors to next event with particle indices 2019-07-10 16:19:31 +02:00
25e7319488 access next event indices with particle indices 2019-07-10 16:11:31 +02:00
18e8a12ef1 use particle indices to access remaining durations 2019-07-10 15:58:53 +02:00
9386bcb29a rename durations to remaining_durations 2019-07-10 15:45:28 +02:00
0135d47a06 compute remaining durations in every thread again 2019-07-10 15:43:10 +02:00
1f9186c270 store remaining durations instead of end times 2019-07-10 15:17:56 +02:00
85b8376829 pass array allocator to emitter and execute event interface 2019-07-10 14:56:44 +02:00
3d93967292 take event execute interface out of action interface 2019-07-10 14:35:57 +02:00
8b13cd86ec more centralized solution to getting an array ref for a range 2019-07-10 14:21:53 +02:00
ab0f8b46a6 use ParticleSets abstraction instead of emitter targets 2019-07-10 13:54:33 +02:00
8ea9f57601 simplify event execute interface 2019-07-10 12:59:20 +02:00
d00457ba64 cleanup ParticleAllocators class 2019-07-10 12:39:15 +02:00
ee70791626 rename BlockAllocator to ParticleAllocator 2019-07-10 12:35:20 +02:00
1104d30f9e remove intermediate class 2019-07-10 12:32:18 +02:00
d191a1cee7 start simplifying the emitter interface 2019-07-10 12:27:18 +02:00
d58a5ac3aa Merge branch 'master' into functions 2019-07-10 11:58:14 +02:00
f09794f280 size input for mesh emitter 2019-07-10 11:36:04 +02:00
b197bf5903 sync node trees when file is loaded 2019-07-10 11:33:33 +02:00
317a2ff1e9 unify float and float3 caching 2019-07-10 11:22:27 +02:00
d34c240ebf Cache particle blocks in container for reuse 2019-07-10 11:05:46 +02:00
804ea8fe82 store and cache size per particle 2019-07-10 10:26:48 +02:00
5e22b41ce1 normal and emitter velocity inputs 2019-07-09 17:07:56 +02:00
ab6106149f move world state to mesh emitter 2019-07-09 17:01:58 +02:00
7b674cc684 pass emitter object and rate into mesh emitter node 2019-07-09 16:56:19 +02:00
fa483d50d1 pass object into object transforms node 2019-07-09 16:23:57 +02:00
7c10fa0ac3 object list type 2019-07-09 16:20:40 +02:00
761090b9d4 object type in function system 2019-07-09 16:09:22 +02:00
0a07de8839 object data type in ui 2019-07-09 16:02:30 +02:00
1b1fcd79da basic caching system so that particles can be rendered 2019-07-09 15:56:38 +02:00
52040433a1 rename modifier 2019-07-09 13:48:00 +02:00
a9c1831b07 remove unused code 2019-07-09 13:33:06 +02:00
d2e4f94205 move action builders to separate functions 2019-07-09 13:32:20 +02:00
4b9b9c7813 simplify inserters 2019-07-09 13:24:16 +02:00
72913dbafc initial process node interface 2019-07-09 12:55:15 +02:00
6ab1d300d6 fix variable names 2019-07-09 12:29:30 +02:00
1bfe567129 new node_frontend interface 2019-07-09 12:27:26 +02:00
fb1fdbd217 remove unnecessary includes 2019-07-09 12:16:54 +02:00
43d037b086 move inserters to separate file 2019-07-09 12:13:34 +02:00
d845e15750 move integrator to seprate file 2019-07-09 12:02:11 +02:00
8364c3aafc move step description to separate file 2019-07-09 11:53:36 +02:00
81795f30b4 move world state to separate file 2019-07-09 11:44:37 +02:00
f3b06e8b15 taking emitter velocity into account 2019-07-09 11:23:06 +02:00
3d919e445a add ability to cache the world state to avoid stepping effects 2019-07-09 10:53:56 +02:00
9863f2bfec new map.add_override method 2019-07-09 10:53:14 +02:00
438aae9d0f remove Function from displace modifier (was only for testing) 2019-07-09 09:58:12 +02:00
30dee2dbd2 specify default inputs for some nodes 2019-07-09 09:50:07 +02:00
d94c249194 add ability to specify default values for data sockets 2019-07-09 09:49:55 +02:00
0d28e20bc3 move possibly empty arrays to end of struct for msvc compatibility 2019-07-09 09:32:35 +02:00
b01071a4f3 Merge branch 'master' into functions 2019-07-08 17:55:29 +02:00
435698e219 rename insert to add 2019-07-08 17:55:07 +02:00
ad7c91b346 new compare function 2019-07-08 17:34:48 +02:00
fed773cec6 random number node should have float instead of int input 2019-07-08 17:14:02 +02:00
9d79363098 move functions to correct file 2019-07-08 17:09:29 +02:00
317158e106 reintroduce unique_ptr for actions and events 2019-07-08 17:08:31 +02:00
6e86e314ef move action interface to separate file 2019-07-08 16:56:27 +02:00
65292981a4 improve ActionInterface 2019-07-08 16:50:28 +02:00
6dd1e480b5 initial Action interface 2019-07-08 16:21:44 +02:00
2a0abf0adf initial condition action 2019-07-08 16:09:32 +02:00
f7e7335123 improved event info usage 2019-07-08 15:39:54 +02:00
49e5434e94 initial collision event info 2019-07-08 15:13:57 +02:00
b293739f1f initial event info 2019-07-08 14:23:08 +02:00
c8816dbd31 StringRef.drop_prefix 2019-07-08 14:14:45 +02:00
6bfa473b60 simplify StringRef operator overloads 2019-07-08 14:02:19 +02:00
cba2b0367c stringref: iterate, startswith and endswith 2019-07-08 13:57:25 +02:00
1251ef30aa gather required attributes from particle type and events 2019-07-08 13:30:58 +02:00
fe697e5c1f SmallSet.add_multiple_new 2019-07-08 13:30:08 +02:00
db89c65746 remove separate EventFilter class 2019-07-08 12:57:39 +02:00
03e95e569b distribute tetrahedons in parallel 2019-07-08 12:43:39 +02:00
d71543bf60 new utility to process a range with multiple threads 2019-07-08 12:42:35 +02:00
fce3694f0d new ChunkedRange 2019-07-08 12:42:13 +02:00
d824cb4a7f allow using array allocator in integrator 2019-07-08 11:53:38 +02:00
16a23f4195 rename FixedArrayAllocator to just ArrayAllocator 2019-07-08 11:44:21 +02:00
7387e36267 simplify allocating arrays and vectors from fixed array allocator 2019-07-08 11:41:38 +02:00
fc412c78b4 comment on fixed array allocator 2019-07-08 11:08:23 +02:00
ef8cbccd54 simplify method names 2019-07-08 11:03:26 +02:00
5503207730 use scoped array allocations to simplify memory management 2019-07-08 11:00:41 +02:00
fff24d71f7 cleanup multimap 2019-07-08 10:37:28 +02:00
3c67bda1d2 Merge branch 'master' into functions 2019-07-08 09:56:40 +02:00
2e701cbaaf rename file to BLI_small_multimap 2019-07-06 18:01:23 +02:00
20bd3b5ed1 add vertex colors to tetrahedons for visualization 2019-07-06 17:30:00 +02:00
e852f7d356 create SmallVector from MappedArrayRef 2019-07-06 17:12:11 +02:00
6715600796 flatten float3 attribute of container 2019-07-06 16:49:12 +02:00
b832be6206 improved particle to tetrahedon conversion 2019-07-06 16:38:26 +02:00
b2188f052b initial particle info node 2019-07-06 15:36:02 +02:00
f204ea5624 Fix append_n_time reallocating every time 2019-07-06 15:14:51 +02:00
1d2adb08f8 Fix ArrayLookup for the case when all slots are used or dummies 2019-07-06 14:43:31 +02:00
f7e0f429e2 remove unused modifier properties 2019-07-05 18:07:12 +02:00
2746f423bd initial turbulence node 2019-07-05 17:38:29 +02:00
f67431d729 use gravity node in simulation 2019-07-05 16:56:40 +02:00
30c6880fe0 initial gravity force node ui 2019-07-05 16:39:29 +02:00
fa79121db2 initial mesh collision event node 2019-07-05 15:40:58 +02:00
d5f21d2aac cleanup age reached event inserter 2019-07-05 15:19:33 +02:00
7beef61562 get node of socket from indexed tree 2019-07-05 15:13:28 +02:00
57cb7849fa construct SmallStack from array 2019-07-05 15:03:48 +02:00
cc8ff01d8e deduplicate function create code 2019-07-05 14:49:18 +02:00
2c8e8d547f add speed input to explode node 2019-07-05 14:42:54 +02:00
681ae8d03c initial explode particle node 2019-07-05 14:38:35 +02:00
0380b22606 better handling of zero duration 2019-07-05 13:42:52 +02:00
452369f1b7 simulate more events per step, again 2019-07-05 12:57:03 +02:00
278dc870c0 allow event filters to add attributes to a particle type 2019-07-05 12:53:37 +02:00
f9edcf46b3 improved change direction action 2019-07-05 12:23:45 +02:00
873f483836 new change direction action 2019-07-05 11:15:57 +02:00
7de0213588 access element at index in listbase 2019-07-05 11:15:31 +02:00
821b7e5360 initial build action from nodes 2019-07-05 10:48:44 +02:00
fc490e4236 new action that does nothing 2019-07-05 10:38:58 +02:00
b71291c96d cleanup 2019-07-05 10:38:44 +02:00
e02befdd2c remove unnecessary IndexedBParticlesTree 2019-07-05 10:28:43 +02:00
5e7dc72f11 better function signature for inserters 2019-07-05 10:24:38 +02:00
057455726c new kill particle node ui 2019-07-05 10:14:01 +02:00
c5330b6d94 new control flow socket 2019-07-05 10:11:40 +02:00
9328e6f0bf Merge branch 'master' into functions 2019-07-05 09:53:41 +02:00
d3c5e882b0 Use monotonic allocator instead of more complex ones 2019-07-04 18:04:58 +02:00
16c92706d8 some comments for allocators 2019-07-04 17:33:46 +02:00
7f410f0655 initial replaceable unlinked inputs handler
Depending the use case, unlinked node inputs should be handled differently.
Sometimes, it is okay to load them from RNA on every call, but
sometimes they should also be hardcoded into the generated assembly.
2019-07-04 16:30:31 +02:00
cdd5d41e6e fix memory leak 2019-07-04 16:08:07 +02:00
3a0cfed4aa first time using the function nodes within bparticle nodes 2019-07-04 15:57:38 +02:00
82ae82488e cleanup data flow graph generation 2019-07-04 15:31:09 +02:00
e7ff5b1470 don't use output parameter when building data flow graph 2019-07-04 15:02:10 +02:00
7a6ab07e9e make it possible to build data flow graphs for any node tree 2019-07-04 14:49:53 +02:00
bee737bbad store list with non-reroute and non-frame nodes explicitely 2019-07-04 14:03:06 +02:00
d66644dd87 cleanup finding input and output nodes of function 2019-07-04 13:57:05 +02:00
be0ed93f99 use indexed node tree in more places 2019-07-04 13:44:33 +02:00
b06ed62500 initial age reached event node 2019-07-04 13:29:49 +02:00
8628f329e8 cleanup rna access 2019-07-04 11:34:49 +02:00
4ae4d125cd simple point emitter node for testing 2019-07-04 11:30:49 +02:00
c44a8e5ede initial emitter inserter 2019-07-04 11:17:21 +02:00
4cb0cb6a06 improve indexed node tree 2019-07-04 10:54:17 +02:00
96f4921704 refactor IndexedBParticlesTree 2019-07-04 10:32:57 +02:00
a6b5767d27 rename NodeTreeQuery to IndexedNodeTree 2019-07-04 10:29:35 +02:00
28c4b3e6f8 identify particle types with name instead of integer
While this might be less efficient, it is much more comfortable to work with.
Also it might be possible to make it a bit more efficient again in the future.
2019-07-04 10:20:32 +02:00
fefeaec48d Merge branch 'master' into functions 2019-07-03 19:11:23 +02:00
5aa6c03fbc use BLI_STATIC_ASSERT 2019-07-03 19:10:07 +02:00
f16c8eec40 optimize adding multiple new values to multimap 2019-07-03 19:02:49 +02:00
10437bba07 only use new multimap implementation 2019-07-03 19:01:14 +02:00
2df06e3172 fix issue with multiple links at same socket 2019-07-03 18:49:57 +02:00
d14073a5fc better multimap implementation for a specific use case 2019-07-03 18:42:29 +02:00
918cdba723 missing from last commit 2019-07-03 18:42:01 +02:00
33dda8463d improved lookup or insert functions for map 2019-07-03 18:41:16 +02:00
b9fee1a5d7 return index when value was inserted before 2019-07-03 17:09:33 +02:00
9af1aa48ab remove unnecessary template parameter 2019-07-03 16:56:01 +02:00
d9277bf1c4 support storing multiple connected sockets per socket 2019-07-03 16:35:36 +02:00
5db4d8269e add multiple new elements to multimap 2019-07-03 16:33:53 +02:00
d037390cd2 iterate keys of multimap 2019-07-03 16:13:35 +02:00
011e88d03c convert linked list to array for further processing 2019-07-03 15:57:56 +02:00
29413c894b class to simplify querying bparticle node tree 2019-07-03 15:51:39 +02:00
b80000f073 rename BNodeTreeLookup to NodeTreeQuery 2019-07-03 15:36:32 +02:00
9c7ef45214 Use float3 instead of custom vector type in function system 2019-07-03 15:34:47 +02:00
bf55ab38d8 comment on llvm builder and types 2019-07-03 15:16:22 +02:00
2448312278 comment on tuple-call 2019-07-03 15:01:54 +02:00
8840be2fb9 Merge branch 'master' into functions 2019-07-03 11:19:24 +02:00
aaef6e6e3a comment on tuple 2019-07-02 18:38:06 +02:00
7a7592e615 comment on CPPTypeInfo 2019-07-02 18:01:06 +02:00
c347373fc6 Comment on SourceInfo, FunctionGraph and DataFlowGraphBuilder 2019-07-02 17:51:10 +02:00
32fdee4444 comment on data flow graph 2019-07-02 17:41:56 +02:00
f5358bc122 comment on Function class 2019-07-02 17:27:00 +02:00
9a9b1e1595 separate declaration from implementation for Function type 2019-07-02 17:11:20 +02:00
6e786c85ea comment on type system 2019-07-02 17:01:14 +02:00
49804947e9 separate declaration and implementation of methods of type 2019-07-02 16:42:20 +02:00
b22a82869c get rid of using TypeVector 2019-07-02 16:33:12 +02:00
4fcd92f624 Tuple now has a weak reference to its metadata to prevent synchronization overhead 2019-07-02 16:31:34 +02:00
d94d68afde parse very simple bparticles node tree 2019-07-02 16:09:56 +02:00
5481e5119b use multimap to more generally store socket origins 2019-07-02 15:31:01 +02:00
1a7507709f get number of values stored per key in multimap 2019-07-02 15:30:32 +02:00
a0cff9838a utility to get nodes with idname 2019-07-02 15:05:38 +02:00
deb642d2ec disable bmesh unit test due to linker errors that I cannot fix now 2019-07-02 15:01:22 +02:00
e0af39a0dc construct SmallVector from ListBase 2019-07-02 15:00:38 +02:00
7db1888bf2 move node tree lookup utilities to BKE 2019-07-02 14:15:20 +02:00
a4fd3f7cc4 store pointer to node tree in modifier data 2019-07-02 12:51:32 +02:00
33e09fe233 initial particle type and mesh emitter node 2019-07-02 12:40:01 +02:00
d41e65e44c rename function_nodes folder to nodes and add bparticles tree type 2019-07-02 12:13:16 +02:00
d5b0df396a various small improvements 2019-07-02 12:02:54 +02:00
940776370c Merge branch 'master' into functions 2019-07-02 09:13:37 +02:00
59d9310b28 initial point randomization accross surface 2019-07-01 17:45:21 +02:00
77d8f118ef avoid stepping when the emitter is moving quickly 2019-07-01 17:29:14 +02:00
2e2fab2f3b cleanup 2019-07-01 17:12:10 +02:00
145e061bce minor cleanup 2019-07-01 17:02:26 +02:00
05027c4d41 cleanup bounce code a little 2019-07-01 16:57:43 +02:00
d7e2e5f99d remove comments that are more confusing than helpful 2019-07-01 15:53:46 +02:00
ad516eda2f cleanup event handling code 2019-07-01 15:47:56 +02:00
6ae9324ada comment on time span 2019-07-01 15:40:22 +02:00
8a6a59d99e comment on particle block 2019-07-01 15:36:15 +02:00
7e2418a877 rename block.size() to block.capacity() 2019-07-01 15:26:28 +02:00
7afeb9775a rename inactive to unused to avoid confusion 2019-07-01 15:25:09 +02:00
f52ff92cc3 rename block.slice() to block.attributes_slice() 2019-07-01 15:21:01 +02:00
ab0c7b8485 rename block.slice_all() to block.attributes_all() 2019-07-01 15:19:24 +02:00
f67bb0ad35 rename block.slice_active() to block.attributes() 2019-07-01 15:16:12 +02:00
c74de0c2e9 comment on particles container 2019-07-01 15:14:39 +02:00
b9baffc59d Comment on AttributeArraysCore and AttributeArrays 2019-07-01 15:02:39 +02:00
eb3fc2c23a comments for AttributeInfo 2019-07-01 14:48:27 +02:00
468e2b8e66 cleanup extracting all particle positions 2019-07-01 14:14:02 +02:00
0de90d6f88 make sure event data is not overwritten by later events 2019-07-01 14:01:06 +02:00
50802c0e6c comment remaining api functions 2019-07-01 13:43:27 +02:00
00bde8527d more comments on api 2019-07-01 12:59:59 +02:00
ac57332ddf access current simulation time through accessor 2019-07-01 12:42:08 +02:00
eb2da8bc5a improve attribute interface 2019-07-01 12:39:02 +02:00
6f069a03d1 new integrator interface 2019-07-01 12:20:55 +02:00
4bdc04e8fb comment particle system api 2019-07-01 12:12:05 +02:00
37c0e0e6e9 cleanup: separate declarations from implementations 2019-07-01 11:42:15 +02:00
a8eb1d28db start cleaning up core.hpp 2019-07-01 11:24:22 +02:00
585d6a51c0 initial api for threading with thread local data
This does look quite ugly so far, but it is still better than doing it manually every time.
2019-07-01 11:08:00 +02:00
6335c3dee8 change threading api 2019-07-01 10:16:29 +02:00
6289393f7b initial c++ api for parallel processing on top of BLI_task 2019-07-01 09:57:34 +02:00
d65427ca94 Merge branch 'master' into functions 2019-07-01 09:37:12 +02:00
2c3d53cf7f minor changes 2019-06-30 15:59:47 +02:00
3c5f321639 fix indices errors 2019-06-30 15:51:18 +02:00
af46f07ef5 initial bounce test 2019-06-30 15:21:43 +02:00
b7b2849c82 initial event storage 2019-06-30 14:34:31 +02:00
ae346fb579 bring back old test setup 2019-06-30 14:07:58 +02:00
4fb660d036 rename run_actions to execute_events 2019-06-30 13:55:20 +02:00
27149c94ee rename EventAction to Event + interface name changes 2019-06-30 13:54:22 +02:00
2618c497c5 rename old Event to EventFilter 2019-06-30 13:49:18 +02:00
3c80e4bc92 code for testing 2019-06-30 13:47:20 +02:00
59e58328ec multithread deletion of tagged particles 2019-06-30 13:42:31 +02:00
c839b2b7b5 use Vector Adapator to simulate to next event 2019-06-30 13:29:01 +02:00
ea5a9c8ec0 use array allocator in simulate_with_max_n_events function 2019-06-30 13:11:26 +02:00
88f5ba087a remove last event times for now 2019-06-30 12:17:23 +02:00
749af6d36c enable threading again 2019-06-30 12:10:40 +02:00
b60dcf9765 store fixed array allocator per thread 2019-06-30 11:51:03 +02:00
8e6bdabb00 always display nanoseconds for now 2019-06-30 11:27:18 +02:00
eb78369271 initial usage of fixed array allocator in simulation 2019-06-30 11:16:14 +02:00
686fa5ca84 utility to allocate attributes from array allocator 2019-06-30 11:12:02 +02:00
0fd83de6c3 new fixed array allocator 2019-06-30 11:11:34 +02:00
80a84f7c11 remove some timers 2019-06-30 11:00:48 +02:00
aaf4b00ba1 test impact of manual vectorization (2x speedup) 2019-06-30 10:40:31 +02:00
2ec577c75e separate methods of integrator 2019-06-30 10:40:08 +02:00
2f91feeb03 allocate attributes at 64 byte aligned addresses 2019-06-30 10:37:49 +02:00
78362edb49 optimization when indices are trivial 2019-06-30 09:55:54 +02:00
1e45e1b6b2 don't check for events when there are none 2019-06-30 09:53:24 +02:00
0bbf940965 better timing statistics 2019-06-30 09:49:10 +02:00
d183496162 cleanup: pass events instead of particle type 2019-06-30 09:26:04 +02:00
b6e0a11e41 prepare simulation for optimizations 2019-06-30 09:22:28 +02:00
a8473ead9e new emitter for testing 2019-06-30 09:21:56 +02:00
ffb79ef037 support printing timings in nanoseconds 2019-06-30 09:04:54 +02:00
e9b83d74d2 cleanup 2019-06-29 16:19:12 +02:00
d53b5af637 refactor high level simulation code 2019-06-29 16:17:01 +02:00
5f7e8e6670 refactor simulation main entry point 2019-06-29 16:04:42 +02:00
ee16f26610 remove unnecessary use of smart pointers 2019-06-29 15:56:25 +02:00
c2e13a2f94 combine event and action 2019-06-29 15:51:38 +02:00
19dda33497 optimization for the case when particle indices are trivial 2019-06-29 15:36:51 +02:00
8dd4082b27 easy access of first and last element in array ref 2019-06-29 15:36:13 +02:00
d206062e10 implicitely convert SmallSetVector to ArrayRef 2019-06-29 15:11:22 +02:00
1d031a92a5 define attributes as part of particle type 2019-06-29 15:05:15 +02:00
425d620d57 more generic way to apply attribute offsets 2019-06-29 14:14:48 +02:00
f77dfe6e94 cleanup: rename to attribute_offsets 2019-06-29 13:48:59 +02:00
b65783941c separate integrator from simulation 2019-06-29 13:44:00 +02:00
0f26e99517 bring back loop to simulate n events 2019-06-29 13:08:48 +02:00
506b6d7df9 temporarily unrolled event loop 2019-06-29 12:53:19 +02:00
efd91c4701 integrate particles of entire block instead of a particle set 2019-06-29 12:29:06 +02:00
21dfdbc58b Merge branch 'master' into functions 2019-06-28 17:42:08 +02:00
7e767d0858 initial experimental vector adaptor data structure 2019-06-28 17:41:15 +02:00
3be92ce31b function to simulate a block 2019-06-28 16:41:18 +02:00
bb537df8d0 cleanup remove unused return parameter 2019-06-28 15:46:15 +02:00
3dbd8b81ba compute ideal offsets only once per particle per time step
I have to bring back simulating multiple events per particle now.
2019-06-28 15:43:50 +02:00
6c5a2fecf6 refactor: move computation of ideal offsets up 2019-06-28 15:33:56 +02:00
4c85e861ea refactor applying remaining particle offsets 2019-06-28 15:31:36 +02:00
b0f2b24160 cleanup 2019-06-28 15:12:42 +02:00
40f65055e3 loop only over particles with events instead of all 2019-06-28 14:58:18 +02:00
624794e006 float3 * scalar operator 2019-06-28 14:46:15 +02:00
a0fcdb0f98 extract method to compute current time per particle 2019-06-28 14:29:16 +02:00
035d92dd1a faster temporary random number function 2019-06-28 14:20:04 +02:00
a4a69e605c improve interface for killing particles 2019-06-28 14:11:06 +02:00
105353359c improve birth time handling in action interface 2019-06-28 13:49:47 +02:00
c500e94670 cleanup handling of birth times in emitters 2019-06-28 13:30:36 +02:00
d2e050e5e1 experimental explode action 2019-06-28 12:50:16 +02:00
485b07dc55 give action access to current time per particle 2019-06-28 12:30:50 +02:00
58452b095d initial test for spawning new particles in an action 2019-06-28 11:32:08 +02:00
788297480f split EmitTarget into EmitTargetBase and TimeSpanEmitTarget 2019-06-28 10:53:15 +02:00
fad7613963 simulate newly created particles until there are no new ones 2019-06-28 10:45:15 +02:00
b928475df0 separate partial simulation of new particles from emitters 2019-06-28 10:34:38 +02:00
2835c8df6f allow SmallVector to use ArrayRef 2019-06-28 09:59:32 +02:00
83a8f830c0 simulate particles of all types at the same time 2019-06-28 09:16:09 +02:00
7326d0a3f8 Merge branch 'master' into functions 2019-06-28 08:56:38 +02:00
17441b327b use one block allocator per thread instead of per block 2019-06-27 17:03:44 +02:00
700c2c823a keep track of newly allocated blocks 2019-06-27 16:21:29 +02:00
58253b535f make Block Allocator part of action interface 2019-06-27 15:41:25 +02:00
dd55ac9128 cleanup: remove unnecessary state parameter 2019-06-27 15:30:56 +02:00
878028d385 make it easier for emitters to specify birth moments 2019-06-27 15:07:39 +02:00
42d70c8152 emitter decides at which time individual particles are spawned 2019-06-27 14:29:26 +02:00
ab136cb188 size-value constructor for SmallVector 2019-06-27 13:59:18 +02:00
f2ed497129 initialize attributes with default values 2019-06-27 13:46:03 +02:00
e858f2e9ff thread safe block creation and deletion 2019-06-27 13:27:52 +02:00
551ae21bff use block allocator to allow muliple emitters to emit into the same block 2019-06-27 13:25:01 +02:00
2fa66f6f96 move function from header to cpp 2019-06-27 12:40:33 +02:00
8349161f14 refactor emitter interface internals
The problem previously was that all the information about which
blocks contain the attributes was not accessible by the emitter.
2019-06-27 12:36:47 +02:00
db8c116f5c remove request_raw function from public emitter interface 2019-06-27 11:21:59 +02:00
938bd0edc4 ParticleSet should know the block it is in 2019-06-27 11:13:48 +02:00
40a2f975dc Merge branch 'master' into functions 2019-06-27 10:02:07 +02:00
06fab69664 visualize different particle types with vertex colors 2019-06-26 18:18:38 +02:00
ddb44cefbd figure out how to add vertex colors to a new mesh 2019-06-26 15:58:32 +02:00
6ea4623ea1 ability to store attribute defaults in AttributeInfo 2019-06-26 15:34:57 +02:00
1d807a8399 Allow emitters to emit multiple types of particles 2019-06-26 14:46:44 +02:00
6704c82293 new ActionInterface class 2019-06-26 14:12:12 +02:00
333d82ebc0 remove unused variable 2019-06-26 12:52:08 +02:00
165580c661 Update attribute arrays based on which attributes are required 2019-06-26 12:51:58 +02:00
9728f45e89 particles container has responsibility to allocate attribute arrays again 2019-06-26 12:06:22 +02:00
2d7673578e comment out unused variables 2019-06-26 11:41:12 +02:00
6736ce6a03 Merge branch 'master' into functions 2019-06-26 11:34:08 +02:00
059639e301 new EventInterface abstraction 2019-06-24 12:37:27 +02:00
c2e4c7490f take reference to emitter interface 2019-06-24 09:47:30 +02:00
4b5a23b096 rename EmitterHelper to EmitterInterface 2019-06-24 09:44:14 +02:00
c5744593ec rename pindex_of to get_particle_index 2019-06-24 09:40:51 +02:00
b12daf64ca separate tuple from tuple-call 2019-06-24 09:38:54 +02:00
450d3be01f Merge branch 'master' into functions 2019-06-24 09:13:21 +02:00
7c4208f8a9 Merge branch 'master' into functions 2019-06-21 18:52:00 +02:00
5f0286302e Comment methods of ArrayRef and StringRef 2019-06-21 18:51:37 +02:00
da5f1dd8e5 comment methods of some more data structures 2019-06-21 18:41:04 +02:00
b247fc7d46 comments for methods of SmallVector 2019-06-21 18:12:07 +02:00
a19a5f8675 initial code layout for updating the required attributes 2019-06-21 16:56:19 +02:00
3a87096f24 allocate attributes arrays in AttributeArraysCore 2019-06-21 16:48:19 +02:00
8ee05156e6 simulate all particle types with description 2019-06-21 16:21:25 +02:00
098cb4ceaa cleanup copying ArrayRef to pointer 2019-06-21 16:12:16 +02:00
cf81da2547 refactor towards supporting multiple particle types 2019-06-21 16:03:30 +02:00
ab51c0e7dc initial particle type intermediate class 2019-06-21 15:10:23 +02:00
3e5fb5d83e fix using wrong length 2019-06-21 14:56:13 +02:00
d5bc8a6840 support point and tetrahedon mesh creation 2019-06-21 14:45:41 +02:00
db06b3a0b4 comment to note invariants of particle indices arrays 2019-06-21 14:14:34 +02:00
da1524fca8 new ParticleSet abstraction: attribute arrays + particle indices 2019-06-21 14:09:59 +02:00
5a31c30b5c transform emitter mesh to world space 2019-06-21 13:28:17 +02:00
cae29a0d9d transform collision rays to object space 2019-06-21 13:23:55 +02:00
c9958be749 initial mesh collision event 2019-06-21 12:53:51 +02:00
1294a9b5b4 generate tetraeders for particles 2019-06-21 12:02:27 +02:00
9f53e98472 minor cleanup 2019-06-21 11:32:55 +02:00
a7a6fe3ebc initial double event avoidance 2019-06-21 11:19:16 +02:00
5d590fc1bb extract method to simulate multiple events per step 2019-06-21 11:00:48 +02:00
e5fa7e58ba Merge branch 'master' into functions 2019-06-21 10:24:06 +02:00
f1369dd6ac bring back multithreading support 2019-06-20 15:49:49 +02:00
ad051d46aa don't inline simulation functions to make profiles more useful 2019-06-20 15:20:55 +02:00
a29da3be76 remove outdated simulation code 2019-06-20 15:17:23 +02:00
82c4bdc6d0 move events and actions to separate files 2019-06-20 15:16:57 +02:00
f0cca10248 use mesh surface emitter again 2019-06-20 15:05:08 +02:00
0bf6fa4729 test multiple events 2019-06-20 14:56:42 +02:00
9c7c2d0de3 support for multiple events per particle per time step 2019-06-20 14:34:09 +02:00
0886cdb1fe support killing particles again 2019-06-20 14:23:39 +02:00
c7b1129e77 bring back event handling 2019-06-20 13:57:32 +02:00
bcc877e180 compress blocks after each simulation step 2019-06-20 12:51:07 +02:00
2a9316d33c actually free emitters etc. 2019-06-20 12:44:07 +02:00
831d5665b0 apply forces to particles again 2019-06-20 12:36:23 +02:00
cfb18bb6c3 Pass particle influences into the right functions 2019-06-20 12:21:30 +02:00
dd8d2517d6 separate emitters from particle influencers 2019-06-20 12:16:43 +02:00
5561684337 support emitting particles again 2019-06-20 12:10:07 +02:00
f7cca29528 bring back creating the combined positon array 2019-06-20 11:18:54 +02:00
c8bf758a9a restructure solver api
Now I have to bring back all the functionality that was there already.
2019-06-20 11:04:45 +02:00
c74934cbf9 remove abstractions that are wrong for now 2019-06-20 10:17:09 +02:00
10fe6f6037 Merge branch 'master' into functions 2019-06-20 09:43:01 +02:00
05969e5418 initial curve emitter 2019-06-19 12:24:20 +02:00
0a7715e308 move forces into separate file 2019-06-19 11:06:23 +02:00
3138c7c5d7 rename files 2019-06-19 10:39:02 +02:00
3134c78661 remove turbulence force to have less distorted profiles 2019-06-19 10:34:30 +02:00
20c7fa6bcc extract temporary method for old particle deletion 2019-06-19 10:34:08 +02:00
d43d28a348 avoid creating the same arrays many times 2019-06-19 10:29:58 +02:00
5554851f15 refactor moving particles to next event time 2019-06-18 18:23:10 +02:00
ae80a416bd extract methods to simulate to next event vs. to next frame 2019-06-18 16:45:18 +02:00
7b15ec8713 Integrate particles again after an event 2019-06-18 16:22:05 +02:00
647503ec47 remove specialized step function for new particles 2019-06-18 15:18:31 +02:00
7629b86581 use indices mask to update only certain particles 2019-06-18 15:02:59 +02:00
913e130897 naming cleanup 2019-06-18 14:26:57 +02:00
de5971b1df initial positional event abstraction 2019-06-18 14:21:35 +02:00
d600fb3a45 more explicit particle integration step 2019-06-18 14:02:32 +02:00
17bff65c6b Use multithreading when moving particles forward
Timings in my current test file (nanoseconds per particle per time step):
* Debug Build: 150ns
* Optimized Build: 47ns
* With threading: 9ns
2019-06-18 12:35:22 +02:00
962a64aaaa restructure simulation steps in solver 2019-06-18 12:03:46 +02:00
5d08ae535a Utility to convert SmallSet to SmallVector 2019-06-18 12:03:15 +02:00
dd856ee973 Cleanup: reorder some functions 2019-06-18 11:49:15 +02:00
e8e94a6800 Allow emitters to emit into separate buffers 2019-06-18 11:46:14 +02:00
14125d2652 minor emitter API improvement 2019-06-18 10:05:16 +02:00
155c1de9ad improved particle attribute handling 2019-06-17 15:52:04 +02:00
8482ee2be9 utilities to create a range before/after another 2019-06-17 15:51:06 +02:00
270f4cb1f0 SmallVector: Append N Times 2019-06-17 15:13:19 +02:00
125ff9f320 initial mesh surface emitter 2019-06-17 12:16:41 +02:00
e8ecbf3a42 Emit from other objects origin 2019-06-17 11:19:26 +02:00
b010464151 simple point emitter 2019-06-17 10:59:04 +02:00
e77d269088 Merge branch 'master' into functions 2019-06-17 10:14:23 +02:00
dd201e3fc3 Merge branch 'master' into functions 2019-06-13 11:31:10 +02:00
4faf2de83a initial particle action abstraction 2019-06-10 12:23:15 +02:00
aa05731607 compute new positions and velocities in separate buffer 2019-06-10 12:05:28 +02:00
81eecb252a cleanup naming 2019-06-10 12:04:16 +02:00
97ecf23069 ArrayRef.copy_from 2019-06-10 12:03:29 +02:00
8e3178e1f2 use NamedBuffers in more places 2019-06-10 11:11:32 +02:00
2d73ff2380 rename buffer accessors 2019-06-10 11:07:40 +02:00
c49ca5c99f rename Vec3 to float3 2019-06-10 10:53:36 +02:00
b5fda893ce add byte attribute type 2019-06-09 13:51:37 +02:00
bcc8a07fd3 experimental turbulence force 2019-06-09 13:18:55 +02:00
5da27a41c1 improve naming 2019-06-09 12:59:41 +02:00
da1eb092eb flag killed particles in step function 2019-06-09 12:55:26 +02:00
93e38f5f6b cleanup stepping a slice of particles 2019-06-09 12:45:24 +02:00
4ffc3c46a1 partial step newly emitted particles 2019-06-09 12:37:21 +02:00
a38b89ecb5 initial emitter info class 2019-06-09 11:58:00 +02:00
270cee3d4a fix old particle removal 2019-06-08 14:02:51 +02:00
dc26770356 keep track of time since simulation start 2019-06-08 14:00:24 +02:00
a4de314d20 ArrayRef take_front and take_back methods 2019-06-08 13:55:21 +02:00
c77945366c pass elapsed seconds into step function 2019-06-08 13:39:49 +02:00
f693a5b66d automatically initialize attributes the emitter does not care about 2019-06-08 13:30:33 +02:00
c76ed1781b method to fill an ArrayRef 2019-06-08 13:28:35 +02:00
941159fba5 emitter can decide which attributes it initializes 2019-06-08 12:59:04 +02:00
e3d3d2eec7 introduce concept of particle block slices 2019-06-08 12:38:30 +02:00
3fd4418cfd fix lazy init unit test 2019-06-08 12:37:49 +02:00
c0b36372d0 easy access last element in vector 2019-06-08 12:37:39 +02:00
3c04bdbddb cleanup naming and implement some destructors 2019-06-08 11:54:45 +02:00
17804e4ecb experiment with an emitter abstraction 2019-06-07 23:12:35 +02:00
dbc50aa156 initial deletion or particles and compression of blocks 2019-06-07 22:43:29 +02:00
c2fa4a33fa test NamedBuffersRef abstraction to separate components
More specifically this separates implementation details of
Forces and ParticleBlocks.
2019-06-07 18:07:54 +02:00
9351db7146 work-in-progress functions to compress a set of particle blocks 2019-06-07 17:50:33 +02:00
4c0e7a285a initial particles container 2019-06-07 17:18:18 +02:00
d0cbd39310 initial force implementation 2019-06-07 15:53:48 +02:00
2c519ceb63 simple Vec3 type 2019-06-07 15:53:12 +02:00
2bcf091ba9 control simulation with some properties 2019-06-07 15:13:11 +02:00
80ec80cb83 don't reset simulation when pausing playback 2019-06-07 12:34:15 +02:00
ed02e1d252 cleanup interface to solver 2019-06-07 12:30:39 +02:00
d3013152ce little bit more interesting particle movement 2019-06-07 12:24:28 +02:00
3d797d0070 splitup bparticles code into multiple files 2019-06-07 12:17:22 +02:00
41cbcf96e9 try a different approach to connect state to solvers 2019-06-07 12:00:02 +02:00
01196be661 initial particle system api test
Still not happy with the way solver-dependent state is handled.
2019-06-07 11:04:01 +02:00
741ed59745 very simple particles state reset logic 2019-06-06 17:43:23 +02:00
b61fce82f9 more consistent naming in C wrappers 2019-06-06 11:33:46 +02:00
c5850f6ef1 use runtime data in modifier 2019-06-06 11:21:31 +02:00
56a0a71649 new simulations folder with some test code 2019-06-06 10:42:01 +02:00
6f728beec9 Merge branch 'master' into functions 2019-06-06 10:10:35 +02:00
6262b2bf7c initial empty particle nodes modifier 2019-06-05 10:28:26 +02:00
0387abd20f better explanation for lazy-init macros 2019-06-05 10:05:27 +02:00
473b79b4c2 remove unused include 2019-06-05 09:58:01 +02:00
6ffab86a4d simplify naming for lazy init macros 2019-06-05 09:56:25 +02:00
63c4712450 lazy init: thread safe registration and utility to list all 2019-06-05 09:47:27 +02:00
4df64a4393 improve move semantic usage in BLI::Optional 2019-06-04 18:14:37 +02:00
6ac4a72b28 free cached vectorized functions 2019-06-04 18:05:15 +02:00
77df7c61e6 Destruct lazy initialized objects when Blender quits 2019-06-04 17:38:05 +02:00
b8cb48b630 Merge branch 'master' into functions 2019-06-04 16:31:37 +02:00
a5413ba0f8 sort includes 2019-05-28 15:18:19 +02:00
5ea27e3d14 cleanup SmallVector 2019-05-28 15:14:20 +02:00
a34761afc0 Reduce wasted space in Function class
This is achieved by storing strings in a single buffer instead
of using `std::string`, which does small object optimization
for every string individually. This optimization can be done
because all strings are known when the function is build and
don't change later on.
2019-05-28 12:11:11 +02:00
5c72fb6a34 implement == operator for StringRef 2019-05-28 11:42:53 +02:00
3913b81f9e construct StringRefNull from pointer and length 2019-05-28 11:15:50 +02:00
a02cf6a05b Merge branch 'master' into functions 2019-05-28 10:53:36 +02:00
68174cf0b2 Merge branch 'master' into functions 2019-05-23 17:27:26 +02:00
cbb8bd467b better cross platform exponent computation 2019-05-22 17:31:43 +02:00
8c37c378a4 more assertions in ArrayLookup 2019-05-22 17:21:12 +02:00
e59d0263ba create ArrayRef from std::vector and std::array 2019-05-22 17:11:09 +02:00
dac0f4864d cleanup SmallMap 2019-05-22 17:00:10 +02:00
28887080a5 ArrayRef constructor for SmallSet 2019-05-22 16:41:53 +02:00
3ab2a2af29 correct small object optimization for sets and maps 2019-05-22 16:37:07 +02:00
d5b707b6fb improve SmallStack class 2019-05-22 16:22:47 +02:00
9ec8e308e7 more efficient small vector extend 2019-05-22 16:16:34 +02:00
b3283176a0 fix memory leaks in unit tests 2019-05-22 16:05:01 +02:00
24c3b57ec3 remove unused StringCollection 2019-05-22 15:53:15 +02:00
7863cf89de cleanup ScopedTimer 2019-05-22 15:41:20 +02:00
900e7f6352 Merge branch 'master' into functions 2019-05-22 15:31:28 +02:00
bddc6999b0 support for caching auto vectorized functions 2019-05-20 11:19:06 +02:00
357fa4a5ba equality operator for functions 2019-05-20 11:07:41 +02:00
0338da1063 smallmap: lookup or insert using key function 2019-05-20 11:07:23 +02:00
341b078d91 allow creating small vector with different size from array ref 2019-05-20 11:06:53 +02:00
d8d6f2a521 smallmap: lookup or insert using callback 2019-05-20 10:55:15 +02:00
92a3a4e029 speedup when all types in tuple meta are trivially destructible 2019-05-20 09:51:33 +02:00
0b63963c5a llvm vectors are not stored as struct anymore 2019-05-20 09:42:29 +02:00
a10f336346 Merge branch 'master' into functions 2019-05-20 09:36:28 +02:00
1bde9ab004 remove signature and paramter classes 2019-05-17 12:02:22 +02:00
ffeea91347 don't use signature in function anymore 2019-05-17 11:59:40 +02:00
e0032e8446 remove more dependencies on signature and parameter types 2019-05-17 11:46:31 +02:00
d6eb9668a0 move more signature logic into function 2019-05-17 11:18:30 +02:00
3bc03102d8 Merge branch 'master' into functions 2019-05-17 11:11:49 +02:00
3cddf75818 use StringRef and ArrayRef in more places 2019-05-16 12:02:57 +02:00
9d92456c88 use ArrayRef in more places 2019-05-16 11:52:56 +02:00
9107197320 use ArrayRef in more places 2019-05-16 11:46:39 +02:00
0a66b12776 less usage of InputParameter and OutputParameter type 2019-05-16 11:40:12 +02:00
9de7d3fa45 use new FunctionBuilder instead of creating Signature manually 2019-05-16 10:46:57 +02:00
3f82445d43 windows build fix 2019-05-16 10:15:21 +02:00
eb74be102e Rename StridedArrayRef to MappedArrayRef 2019-05-15 18:03:08 +02:00
836a780649 Merge branch 'master' into functions 2019-05-15 17:55:11 +02:00
8ab87c1998 initial StringCollection class 2019-05-15 17:16:47 +02:00
39d4e0182c use string ref in llvm ir builder 2019-05-15 11:39:25 +02:00
23c1b1edc8 deduplicate string ref code 2019-05-15 11:38:06 +02:00
13e06e7670 use string ref in more places 2019-05-15 11:22:50 +02:00
6dedb028d8 use string ref in more places 2019-05-15 11:17:20 +02:00
3b6bed43cd use string ref for type names 2019-05-15 11:10:02 +02:00
92c1d9044c new StringRefNull class 2019-05-15 11:00:07 +02:00
6e4866465d initial StringRef class 2019-05-15 10:49:38 +02:00
dbced1d563 Merge branch 'master' into functions 2019-05-15 10:16:35 +02:00
4b6799394f Some documentation for the C++ data structures in BLI 2019-05-13 18:38:37 +02:00
f7fd87d9d2 Merge branch 'master' into functions 2019-05-13 10:05:30 +02:00
3cb181ffe0 utilities to access function parameters 2019-05-12 20:25:49 +02:00
f959f4d2b2 use ArrayRef in more places 2019-05-12 20:07:16 +02:00
f2e5ed0e34 missing from last commit 2019-05-12 20:04:36 +02:00
38531114f7 initial support for defaults when using auto vectorization 2019-05-12 20:04:16 +02:00
4a2193927d improve ArrayRef 2019-05-12 19:47:46 +02:00
a2ef8e34d5 support different list lengths in llvm vectorization 2019-05-12 17:53:41 +02:00
ec2c1e54ed print with stacktrace from IR 2019-05-09 13:20:29 +02:00
d9c7df2492 put current loop iteration on stack 2019-05-09 13:02:41 +02:00
9f6e0a74cb float comparison IR 2019-05-09 12:43:58 +02:00
192b5e9cfb simplify usage of construct builders 2019-05-09 12:29:00 +02:00
e0c2784327 support for calling printf from llvm ir 2019-05-09 12:23:12 +02:00
9880a1b366 printing from Ir cleanup 2019-05-09 10:57:30 +02:00
6151808f1b initial if then else construct helper 2019-05-09 10:45:07 +02:00
989c2691ac improve ir loop constructs 2019-05-09 10:31:22 +02:00
5fe4ad93bc more specialized iterations loop builder 2019-05-09 10:20:24 +02:00
dbb52fec27 initial for loop builder helper 2019-05-09 09:51:45 +02:00
6df353d805 Merge branch 'master' into functions 2019-05-08 18:06:43 +02:00
bbb3770be2 speedup size constructor of small vector 2019-05-03 12:42:50 +02:00
49131279ee generate more readable IR 2019-05-03 12:39:21 +02:00
c1267d9e01 allow passing function pointer name 2019-05-03 12:18:35 +02:00
4cd8792882 cleanup code builder interface 2019-05-03 12:16:00 +02:00
6ad32d6675 create llvm wrapper function for calls to pointers 2019-05-03 12:09:40 +02:00
4390091f8b utility to create a float constant 2019-05-03 11:38:33 +02:00
2a957e405d cleanup small vector 2019-05-03 11:37:58 +02:00
c38b9e12b2 Merge branch 'master' into functions 2019-05-03 10:43:49 +02:00
2a87cfd809 allocate function bodies within function 2019-05-02 11:39:42 +02:00
0ca57c14af rename extend to add_extension 2019-05-02 11:21:52 +02:00
5d4bf32c40 allocate type extensions in type directly
This makes sense, since every extension is owned
by a Type object. Also this improves thread safety.
2019-05-02 11:19:05 +02:00
9deeb8eb22 use centralized pool to reuse llvm contexts 2019-05-02 10:48:30 +02:00
676918e7a1 Merge branch 'master' into functions 2019-05-02 10:16:52 +02:00
6e652a42fc splitup llvm vectorization into multiple methods 2019-05-01 19:26:51 +02:00
640a744d54 start simplifying automatic vectorization 2019-05-01 19:12:04 +02:00
1ab8b7f658 move c functions to access lists to lists.cpp 2019-05-01 18:26:42 +02:00
28051e2754 rerun clang format on functions folder 2019-05-01 18:01:03 +02:00
bde00c4aed Merge branch 'master' into functions 2019-05-01 17:59:27 +02:00
576243ba39 Initial automatic function vectorization with llvm 2019-05-01 15:27:00 +02:00
f09f8ad61f move slicing functionality to ArrayRef 2019-05-01 11:39:05 +02:00
034639a877 initial vector slicing API 2019-05-01 10:57:26 +02:00
fd5d972efb Merge branch 'master' into functions 2019-05-01 10:20:10 +02:00
ffe0796c41 use first-class llvm vector for Vector type 2019-04-30 13:58:13 +02:00
e8e0e7bc69 rename SimpleLLVMTypeInfo to PackedLLVMTypeInfo 2019-04-30 12:48:44 +02:00
dc2979a942 cleanup LLVMBool type info 2019-04-30 12:42:26 +02:00
2524a5e509 new TrivialLLVMTypeInfo to simplify creating other types 2019-04-30 12:35:19 +02:00
45271f785a clear cached node states on file load 2019-04-30 12:07:20 +02:00
f5d0dbed20 move btree lookup class to separate file 2019-04-30 11:57:38 +02:00
3b00f6625c Merge branch 'master' into functions
This also removes dependency creation for function drivers
(due to merge conflicts that I could not resolve yet).
2019-04-30 10:55:36 +02:00
d1aa60da80 Merge branch 'master' into functions 2019-04-29 11:42:58 +02:00
0e0495cf32 Merge branch 'master' into functions 2019-04-29 10:52:11 +02:00
8f70d4986e splitup forwarding function 2019-04-28 21:15:43 +02:00
6c1e5d7f34 extract method that ensure all inputs 2019-04-28 19:30:39 +02:00
1aa827d496 extract method that ensures required inputs 2019-04-28 19:23:59 +02:00
b287de4e68 deduplicate stack setup code 2019-04-28 19:20:24 +02:00
f16e64435f deduplicate some code 2019-04-28 19:15:57 +02:00
26ce24b928 better type names 2019-04-28 19:12:26 +02:00
e80d9a5391 destruct unused values as early as possible 2019-04-28 18:56:16 +02:00
f48b9823a4 deduplicate code to setup tuples 2019-04-28 18:45:09 +02:00
1242de1b6d deduplicate some code 2019-04-28 18:38:47 +02:00
64210d6682 simplify stack info setup 2019-04-28 18:33:36 +02:00
049d66aa80 initial support for lazy inputs in new fgraph evaluation 2019-04-28 18:25:29 +02:00
da3d297b3f subscript operator for range 2019-04-28 17:50:44 +02:00
7b75b665d3 group node info into a struct 2019-04-28 15:06:23 +02:00
c9eb9f4ad1 fix error in last merge 2019-04-28 14:49:59 +02:00
df0b4a4d0e Merge branch 'master' into functions 2019-04-28 14:42:08 +02:00
c27bbb3eca use more correct type name 2019-04-27 23:59:33 +02:00
3f6357b970 initialize llvm for tests 2019-04-27 23:40:53 +02:00
93dea8967d unit test for Float Range function 2019-04-27 23:29:33 +02:00
5b6dde93e9 initial unit test for functions system 2019-04-27 23:18:14 +02:00
1db1ac121a reduce likelyhood for heap allocation in fgraph evaluation 2019-04-27 22:32:11 +02:00
b76f54e540 splitup graph evaluation in three parts 2019-04-27 22:23:23 +02:00
d01cc80b08 move more into the value storage abstraction 2019-04-27 22:16:28 +02:00
76c3bd772e move value storage into separate struct 2019-04-27 22:03:04 +02:00
e0531b4338 use macro for pointer offset 2019-04-27 20:21:41 +02:00
05985d98ff put values in a struct that are accessed together 2019-04-27 20:15:58 +02:00
833cdfdd0c remove unused socket flag 2019-04-27 19:58:30 +02:00
21f1e501a7 do less unnecessary data copies 2019-04-27 19:49:33 +02:00
bbede5b3bd copy computed value to fn_out immediatly 2019-04-27 19:34:49 +02:00
bae0d22e06 make it optional to run value destructors when tuple is destructed 2019-04-27 17:04:55 +02:00
eece95823c multipool tried to deallocate the wrong pointer 2019-04-27 12:55:07 +02:00
9ca8b7a444 initial non recursive evaluation of new data flow graph 2019-04-27 12:48:04 +02:00
a9efbd6bcd utility set functions 2019-04-27 12:21:13 +02:00
04a4f1aa4d extract ensure tuple calls function 2019-04-27 10:24:43 +02:00
ad168871b1 dot export for new data flow graph 2019-04-27 10:01:36 +02:00
4346e88286 Split up the data flow graph data structure
The main goal is to be able to traverse the graph very efficiently
once it is build. This is hard when the structure has to be dynamic
(i.e. it can be changed). The solution is to use a builder that
can dynamically construct the graph. Once everything is set up,
the graph is converted into the compact form for further use.
2019-04-26 19:21:28 +02:00
ccc4285dee Merge branch 'master' into functions 2019-04-26 17:09:11 +02:00
a8bc2fc2b7 Merge branch 'master' into functions 2019-04-25 09:57:14 +02:00
81b9187dda Merge branch 'master' into functions 2019-04-24 09:22:11 +02:00
844745da77 Simple range iterator with tests 2019-04-19 13:56:49 +02:00
34fda46a3e produce lookup statistics for map and set 2019-04-19 11:19:23 +02:00
866e9c31e9 socket builder utility function 2019-04-19 10:34:22 +02:00
6a7efc26bd support conversions in all directions between bool, int and float 2019-04-18 11:25:20 +02:00
12904214d1 update inferencing to new type rules 2019-04-18 11:01:17 +02:00
9b3e36f6c4 concept of conversion groups in type system 2019-04-18 10:42:39 +02:00
7178267f20 start using a better defined type system 2019-04-18 10:19:30 +02:00
2141478180 implicit conversions between float and integer lists 2019-04-18 09:42:29 +02:00
5333710282 Merge branch 'master' into functions 2019-04-18 09:13:01 +02:00
8c6457820b bring back llvm include dirs 2019-04-17 11:10:51 +02:00
bd54f55f3a add bf_functions to LIB 2019-04-17 11:00:22 +02:00
2213234715 Merge 'master' into 'functions' 2019-04-17 10:28:33 +02:00
9e1d43367c Merge 'master' into 'functions' 2019-04-17 10:26:56 +02:00
06a966ebe7 Merge 'master' into 'functions' 2019-04-17 10:25:47 +02:00
d348a27380 improved reuse of dummy slots in array lookup 2019-04-15 15:33:56 +02:00
b07b7d0a63 deduplicate some array lookup code 2019-04-15 15:03:23 +02:00
5d83b59751 splitup tests for set and set_vector 2019-04-15 14:48:07 +02:00
9bd835e1fb don't use linear search in SmallSetVector 2019-04-15 14:31:18 +02:00
4687f961f0 remove refcount class that is not used anymore 2019-04-15 14:26:16 +02:00
6615900384 pack list declaration handles implicitely convertable types 2019-04-15 10:39:05 +02:00
955dc9f977 add LIB to CMakeLists.txt 2019-04-15 10:33:39 +02:00
a628f1842b Merge branch 'master' into functions 2019-04-15 10:24:47 +02:00
158425fc61 use a multimap data structure to store links of output sockets 2019-04-11 13:47:01 +02:00
f92bc17cb3 utility to count the number of times an output socket is used 2019-04-08 18:57:01 +02:00
7e2f02b019 more generic function to find relevant sockets in a function graph 2019-04-08 18:35:58 +02:00
45917d435d utility functions for set and map 2019-04-08 18:34:35 +02:00
e352d7d3ca new Float Range node 2019-04-08 17:29:04 +02:00
750d47e4d9 fix inferencing of vectorized nodes 2019-04-08 17:06:11 +02:00
db03f3399c fix probing function 2019-04-08 17:03:24 +02:00
54d4464a29 remove "small" from some type names 2019-04-08 16:13:44 +02:00
5a1279fdce faster adding to array lookup 2019-04-08 16:01:16 +02:00
6742728ff1 don't use llvm fgraph execution for now 2019-04-08 12:39:03 +02:00
338d84676f cleanup array lookup structure 2019-04-08 12:35:30 +02:00
b26a74c470 method to pop item from map 2019-04-07 20:22:06 +02:00
d866113089 End all files with a newline 2019-04-07 19:44:27 +02:00
76a1e9bdb8 Merge branch 'master' into functions 2019-04-07 17:21:30 +02:00
f6f8323082 Fix Sin operation in Float Math node
The patch only fixed the python part. I added the c++ part.

Differential Revision: https://developer.blender.org/D4658
2019-04-07 17:17:29 +02:00
0f1b4d7c38 Use actual hash tables instead of linear search
The hash functions themselves are not optimized yet.
2019-04-07 17:01:31 +02:00
6f96045c2f rename ptr to rna to avoid confusing with actual pointers 2019-04-07 00:01:41 +02:00
9e8babf885 vectorize Float Math node 2019-04-06 23:54:06 +02:00
ece895e7d5 remove some redundency 2019-04-06 23:43:35 +02:00
be53a35ad3 allow lazy tuple call in fgraph ir generation 2019-04-06 23:42:57 +02:00
e38e04e9af cleanup vectorized node inserters 2019-04-06 23:24:12 +02:00
44d8980780 cleanup and vectorize Vector Math node 2019-04-06 23:07:12 +02:00
5ea3eca380 use function name prefix for inserters 2019-04-06 22:50:20 +02:00
954b2de3d5 improve method names 2019-04-06 22:42:52 +02:00
28f239a384 remove BuilderContext 2019-04-06 22:27:58 +02:00
decd4d8ecf rename Builder to GraphBuilder 2019-04-06 22:13:24 +02:00
d3b807ff02 move BuilderContext into Builder 2019-04-06 22:08:13 +02:00
87b472e1f6 use common prefix for type getters 2019-04-06 21:48:43 +02:00
586210c437 use common prefix for function getters 2019-04-06 21:44:10 +02:00
b4a3d036a9 cleanup auto vectorization function 2019-04-06 21:18:08 +02:00
49553de662 vectorized Separate Vector node 2019-04-06 21:06:06 +02:00
59116b27ea Merge branch 'master' into functions 2019-04-06 18:52:37 +02:00
c251ddeafc simplify execution stack management 2019-04-06 18:46:42 +02:00
362f8ec767 remove debug print 2019-04-06 18:14:26 +02:00
66e4eb795d higher level macro for tuple allocation 2019-04-06 18:12:48 +02:00
05e3ee5ae6 automatically destruct stack allocated tuples in c++ 2019-04-06 18:05:34 +02:00
5296f03f9f initial generic automatic vectorization, used in Combine Vector node 2019-04-06 17:21:07 +02:00
acbfda0c6b Implicit conversion from individual elements to lists 2019-04-06 15:23:17 +02:00
7c5cf3fd79 vectorized output sockets don't need a property 2019-04-06 14:58:29 +02:00
84670db6ea List Length node and fail early when socket types don't match 2019-04-06 12:00:35 +02:00
2e2f289d25 Vectorization support for Node UI 2019-04-06 11:05:40 +02:00
1456a030f4 initial IR for vector addition 2019-04-05 19:31:11 +02:00
0f42dd82ac new Vector Math node 2019-04-05 18:57:31 +02:00
cb158219e0 Generate LLVM IR for Mul and Sin 2019-04-05 18:44:01 +02:00
6fa863f6d9 Sin operation in Float Math node 2019-04-05 12:45:11 +02:00
3273d6be58 remove notes and unused variable 2019-04-05 12:31:34 +02:00
4a3720740d use the socket name directly, instead of a getter function 2019-04-05 12:29:07 +02:00
52ff44d02c Validate more aspects of the node tree while syncing 2019-04-05 12:10:30 +02:00
23a8864669 Splitup C API for separate components in different files 2019-04-05 11:32:34 +02:00
072fbb030a fix for reroute nodes 2019-04-04 17:53:37 +02:00
2865ca6fb6 Merge branch 'master' into functions 2019-04-04 17:49:29 +02:00
c789c5288d Fix: print python error message if there is one 2019-04-04 14:29:52 +02:00
dd5c352af5 More robust node tree update after changes
This implements a tree wide synching procedure, that corrects
all invalid things it can find. Also, trees are updated in
the correct order, when they depend on each other.
2019-04-04 14:26:20 +02:00
8675779372 Merge branch 'master' into functions 2019-04-03 19:01:49 +02:00
6ce1e30539 Merge branch 'master' into functions 2019-04-03 18:26:41 +02:00
4e84ea3da0 Merge branch 'master' into functions 2019-04-03 15:19:27 +02:00
2a8c7b8230 use cache to avoid building the same function ir twice 2019-04-03 11:55:11 +02:00
bcb6fa6e51 use better socket names in conversion to functions 2019-04-03 11:13:52 +02:00
ac7107df7c better socket name accessor function 2019-04-03 10:25:11 +02:00
d9097f7484 initial automatic update of call node 2019-04-03 10:05:26 +02:00
c1ba8dcd85 Fix 2019-04-02 12:35:49 +02:00
118ce79baf initial reroute support in graph conversion 2019-04-02 12:30:45 +02:00
6e78ef3ce5 initial support for reroutes in the ui 2019-04-02 11:29:31 +02:00
40d37cc8a0 Fix Get List Element node 2019-04-01 13:52:15 +02:00
9b2f1c0b38 fix modifier definition 2019-04-01 13:51:55 +02:00
212014e0d2 Merge branch 'master' into functions 2019-04-01 12:23:44 +02:00
7ace279696 cleanup pack list node converter 2019-04-01 10:42:13 +02:00
62059b465f improve Pack List node UI 2019-04-01 10:32:54 +02:00
c7447b51bd Pack List nodes have two inputs by default 2019-04-01 10:27:50 +02:00
02765a86cc create pack list node if certain type from search 2019-04-01 10:20:19 +02:00
62f4467a49 simple operators to create new function trees from modifier 2019-04-01 10:11:56 +02:00
25e1a10de6 type extension base class 2019-03-29 15:57:24 +01:00
7b210749bb simple operator to setup new function trees 2019-03-29 14:11:37 +01:00
b9a4ff5d38 Refactor node socket declaration 2019-03-29 13:56:14 +01:00
166e05b6ed store node in declaration 2019-03-29 09:53:36 +01:00
b958410308 cleanup 2019-03-29 09:39:12 +01:00
9f3ffe53bd name some virtual registers 2019-03-28 19:55:58 +01:00
b0f77c11d1 utility functions to optimize and print generated code 2019-03-28 19:55:44 +01:00
6af5d940db cleanup 2019-03-28 18:17:34 +01:00
bd480232ee remove LLVMCompiledBody 2019-03-28 18:09:46 +01:00
8259f92110 don't cache llvm type per context 2019-03-28 17:48:41 +01:00
6304ecbb06 ability to turn stack maintance on and off 2019-03-28 17:39:14 +01:00
40c12c675f move execution context pointer through llvm 2019-03-28 17:25:29 +01:00
b60be30ed5 cleanup pointer calls 2019-03-28 16:30:48 +01:00
cdf4591edb Improve interface of IR generators and wrap IRBuilder<> 2019-03-28 12:47:29 +01:00
c7bf98a186 push initial function caller information on execution stack 2019-03-28 09:50:12 +01:00
031bc7ca2d Use Vector List in Function Points modifier 2019-03-27 12:18:25 +01:00
721581c366 fix 2019-03-27 12:16:45 +01:00
925b0b732c show problems in separate problems panel 2019-03-27 11:36:26 +01:00
65ee9b6233 cleanup 2019-03-27 10:34:32 +01:00
439fdfcda7 initial ability to show warning messages in nodes 2019-03-27 10:30:55 +01:00
80a994776b use multi mempool for source information 2019-03-26 17:34:41 +01:00
aebddd0ed6 initial multi mempool 2019-03-26 17:34:12 +01:00
1a8bc27052 Use Blender's guarded allocators 2019-03-26 16:56:23 +01:00
0b2baaab1a missing include guards 2019-03-26 16:55:05 +01:00
895f68c8b2 fix panel idname 2019-03-26 11:28:59 +01:00
f0524205d6 Merge branch 'master' into functions 2019-03-26 11:23:05 +01:00
a90dca0ff5 also keep track of link sources 2019-03-26 11:20:33 +01:00
c23e2becdc print with traceback utility 2019-03-26 11:00:08 +01:00
72593ecaed cleanup 2019-03-26 10:51:49 +01:00
6b72c23e0a data flow graph manages source info allocation 2019-03-26 10:45:50 +01:00
024247797f keep track of original nodes 2019-03-26 10:33:10 +01:00
de7094a930 new SourceInfo class to keep track of where functions come from 2019-03-26 10:02:57 +01:00
9539b402b8 initial Execution Stack 2019-03-26 09:52:14 +01:00
8b777f5acf function should not be copied 2019-03-26 09:51:38 +01:00
9295e3bdde pass (currently empty) execution context into tuple call 2019-03-26 09:31:23 +01:00
bf8a98ffc5 experimental lazy fgraph evaluation 2019-03-25 09:57:44 +01:00
20e12025ea Merge branch 'master' into functions 2019-03-24 18:41:02 +01:00
9421bf6655 initial body type for lazy input evaluation 2019-03-24 18:40:23 +01:00
d79805e1db cleanup classes that are used in a composition 2019-03-24 17:29:06 +01:00
13ef2b1065 remove special type info for lists 2019-03-24 17:03:07 +01:00
f463cfb4c9 fix 2019-03-24 16:38:50 +01:00
c3a3b2e9b1 new Switch node 2019-03-24 16:16:59 +01:00
28a1b801b1 new Boolean type 2019-03-24 16:14:25 +01:00
b033626948 experimental byte code interpreter for function graph 2019-03-24 13:52:44 +01:00
0c15bc41b0 better naming 2019-03-24 13:52:14 +01:00
d819361cc5 simplify allocating tuple in prepared buffer 2019-03-24 11:31:33 +01:00
dc171b2a3e non recursive method to find required sockets 2019-03-24 10:41:01 +01:00
e77a8b97e1 initial support for calling subprograms 2019-03-22 11:57:03 +01:00
cf72da183d fail early when node inserter does not work 2019-03-22 11:52:49 +01:00
0efee91b63 rename tree type 2019-03-22 10:51:53 +01:00
95ccb24857 implement custom search terms for nodes 2019-03-22 10:21:01 +01:00
24d89e1cce better file naming 2019-03-21 18:44:47 +01:00
ad79af4843 typo 2019-03-21 18:40:36 +01:00
c6e4c29988 implement concept of implicit conversions 2019-03-21 12:17:35 +01:00
b31b4d5df8 cleanup 2019-03-21 12:16:14 +01:00
b52af3a031 refactor frontend data type definition system 2019-03-21 11:12:35 +01:00
8450e44cb6 move data type information into a separate file 2019-03-21 11:01:04 +01:00
fb038ebe53 refactor list decision inferencing 2019-03-21 10:56:11 +01:00
1a73618b36 cleanup file structure 2019-03-21 10:46:05 +01:00
8968155985 improve file name 2019-03-21 10:41:53 +01:00
5cc1bbd6de update tree automatically after changes 2019-03-21 10:39:57 +01:00
1ae0a8d760 Fix ListCPPTypeInfo 2019-03-20 20:03:45 +01:00
6db961e8b2 Merge branch 'master' into functions 2019-03-20 19:36:45 +01:00
1d64c35c3b allow removal of sockets from pack list node 2019-03-20 19:33:34 +01:00
e25a0c4bb3 remove dead code 2019-03-20 19:11:23 +01:00
81d5383ce2 save socket states 2019-03-20 19:07:35 +01:00
8788431086 allow changing type of Pack List node 2019-03-20 18:51:02 +01:00
1b90194608 allow declarations to draw in node 2019-03-20 18:16:55 +01:00
8d5f02a191 New Pack List Input operator 2019-03-20 18:11:56 +01:00
28fc08bff9 replace Append to List and Combine Lists nodes with Pack List 2019-03-20 18:06:27 +01:00
c59b457ee5 Merge branch 'master' into functions 2019-03-20 12:53:45 +01:00
46f5cf2b41 remove code that is not used currently 2019-03-20 12:53:04 +01:00
a2ca81bf6e initial version of less automatic inferencer 2019-03-20 12:46:30 +01:00
7533b4416e decision id cleanup 2019-03-19 17:11:49 +01:00
4c499e6d09 Merge branch 'master' into functions 2019-03-19 12:05:06 +01:00
fae338bf7c initial variadic list declaration 2019-03-19 12:03:47 +01:00
37bb26a217 cleanup list function generation 2019-03-19 11:06:38 +01:00
882ce6812f cleanup graph generation for combine lists and get list element 2019-03-19 10:51:46 +01:00
f7a9d8f447 cleanup Graph generation for Append to List node 2019-03-19 10:40:10 +01:00
c7e2b27199 Merge branch 'master' into functions 2019-03-18 16:08:50 +01:00
af2f924b11 Unified socket declaration system
Function input/output use the same structure to declare
sockets as other nodes now.

The type inferencer can be invoked in the panel on the
right in the node editor.

The list nodes work with floats, vectors and ints.
2019-03-18 16:05:21 +01:00
d0ae91b7c0 Merge branch 'master' into functions 2019-03-14 10:41:28 +01:00
dee5ee40e0 actually run the inferencer on a node tree 2019-03-13 16:21:30 +01:00
614c8be1d8 Use data type names instead of idname in c++ 2019-03-12 18:47:57 +01:00
51885aea9d simple inferencer in python with tests 2019-03-12 18:29:16 +01:00
185c80e9ba data type socket builder 2019-03-12 17:20:10 +01:00
255e1fe149 data type info 2019-03-12 16:48:00 +01:00
bd3334feaa allow more advanced socket declarations 2019-03-12 16:30:41 +01:00
c15103f454 steps towards a second list type 2019-03-11 17:58:36 +01:00
121189e560 disable some debug prints 2019-03-10 19:15:51 +01:00
163af9c8cb Merge branch 'master' into functions 2019-03-10 19:07:23 +01:00
a0627749b6 cleanup c wrapper 2019-03-10 18:59:44 +01:00
5a637fafd2 typo 2019-03-10 18:32:30 +01:00
391ee16746 new Combine Lists node 2019-03-10 18:29:00 +01:00
cfafdde927 use function to generate a list of floats 2019-03-10 18:10:53 +01:00
eaf5914496 allow float list input and output in frontend 2019-03-10 17:36:31 +01:00
a8cb18c644 new Function Points modifier for testing 2019-03-10 17:26:08 +01:00
b5f64cdb6e float list type in C interface 2019-03-10 16:28:14 +01:00
5ab0eca7c6 fgraph ir builder prefers precompiled ir if available 2019-03-10 16:21:24 +01:00
6281aa7f5d fix double value forwarding 2019-03-10 16:04:14 +01:00
5c916fa8f8 utility to copy dot format to clipboard 2019-03-10 15:49:15 +01:00
7fa6389d62 Get List Element and Append to List node 2019-03-10 15:38:11 +01:00
dcd90fae85 start implementing float list in frontend 2019-03-10 15:03:53 +01:00
9f850e5e4e get float list element function 2019-03-10 14:56:05 +01:00
5b3f7c09d2 cleanup 2019-03-10 14:55:34 +01:00
fe5c13386c use control2 as seed 2019-03-10 14:27:32 +01:00
4688ed1e28 use ctrl+A to open the node search 2019-03-10 14:27:22 +01:00
20f9248222 simple node search 2019-03-10 14:16:59 +01:00
657204dfce use auto load for registration 2019-03-10 13:57:37 +01:00
6c49690847 also allow heap allocation for tuples in C 2019-03-10 13:11:02 +01:00
57450b4fbe improve thread safety 2019-03-10 12:51:44 +01:00
1c844a694a cleanup 2019-03-10 12:17:37 +01:00
a53b2b4564 allow tuple stack allocation in C 2019-03-10 12:06:51 +01:00
ac02c2daf2 cleanup C wrapper 2019-03-10 10:44:20 +01:00
e57c3996bd store possible tuple meta in tuple call body 2019-03-10 10:26:19 +01:00
f6d994faac stack allocate tuple 2019-03-10 10:00:51 +01:00
0c8c082f9d improve shared lists 2019-03-09 16:11:10 +01:00
2e5df2cfa6 allow tuple call to modify fn_in 2019-03-09 14:22:14 +01:00
01d09210ff use shared list in tuple 2019-03-08 14:54:36 +01:00
75ecfd03ab more generic CPP and LLVM type info for lists 2019-03-08 14:31:50 +01:00
468f4f7985 Rename "Shared" to "AutoRefCount" 2019-03-08 14:09:29 +01:00
dcd4e2f767 more specific tuple access functions 2019-03-08 14:06:16 +01:00
151c9cd9ff make SharedImmutable work with the automatic refcounting 2019-03-08 13:56:50 +01:00
9697e81dab use intrusive refcounter because it simplifies things quite a bit 2019-03-08 13:42:55 +01:00
70534e5106 Merge branch 'master' into functions 2019-03-08 13:12:57 +01:00
d11b9c7239 cleanup 2019-03-07 11:38:48 +01:00
e60d04b129 rename RefCounted to RefCountedPtr 2019-03-07 11:22:50 +01:00
2c5ca6c7be refcounter cleanup 2019-03-07 11:17:49 +01:00
b0552bbe57 Merge branch 'master' into functions 2019-03-06 13:59:30 +01:00
51aa004a39 initial list types implementation 2019-03-06 13:59:00 +01:00
ebab49d135 define separate and combine vector nodes in terms of llvm ir 2019-03-06 11:37:54 +01:00
8b0c9e4331 don't hardcode llvm include dirs 2019-03-06 11:23:04 +01:00
4b39cbdeef fix "make full" on windows 2019-03-06 09:45:28 +01:00
8ba4f227ea remove printing 2019-03-05 15:22:56 +01:00
771074d848 improve ir wrapper for tuple call 2019-03-05 15:13:48 +01:00
b23cf5f41a put multiple unlinked inputs into a single function 2019-03-05 14:55:39 +01:00
8f5e6cf087 destruct tuple in wrapper 2019-03-05 13:48:00 +01:00
c4f1560ef3 Merge branch 'master' into functions 2019-03-05 13:36:52 +01:00
c1bad0da7a improve LLVMCompiledBody 2019-03-04 16:29:56 +01:00
3dcfe05354 build llvm ir for function graph 2019-03-04 16:14:45 +01:00
a6374a2896 missing renamings 2019-03-04 14:19:34 +01:00
5a81ea8dcd cleanup file naming 2019-03-04 14:16:15 +01:00
d8815d5b41 cleanup naming of function bodies and derive functions 2019-03-04 14:12:01 +01:00
f0d53df716 rename "LLVMGenBody" -> "LLVMGenerateIRBody" 2019-03-04 13:37:00 +01:00
7310c95ab7 Merge branch 'master' into functions 2019-03-04 13:29:50 +01:00
8a8b7d40ac deduplicate compilation code 2019-03-03 20:41:54 +01:00
21fc76b50d precompiled llvm function body 2019-03-03 20:13:24 +01:00
662b5ade05 generate separate wrapper functions 2019-03-03 15:03:56 +01:00
0e177a3b50 initial llvm wrapper for tuple call 2019-03-03 13:53:30 +01:00
149e6aa58c don't use SmallVector in tuple 2019-03-03 11:36:00 +01:00
c090a2f821 cleanup 2019-03-03 11:07:39 +01:00
e99f72ae6d common base class for function bodies 2019-03-03 10:56:57 +01:00
aa179bdfa3 separate tuple from its meta data 2019-03-02 22:00:47 +01:00
0ed75e7dbe only types know how they should be stored/loaded 2019-03-02 12:48:47 +01:00
910d7d4be0 compile llvm to tuple call 2019-03-02 12:14:06 +01:00
5ad9010ebf initial llvm integration (include path is still hardcoded...) 2019-03-01 19:30:20 +01:00
a42fe3e7df cleanup 2019-03-01 18:07:13 +01:00
a74e970b1d minor improvement 2019-03-01 17:30:22 +01:00
80efd2fed8 split core into multiple files 2019-03-01 17:19:36 +01:00
2cdb3d825a Merge branch 'master' into functions 2019-03-01 16:33:35 +01:00
8085925bc6 naming cleanup 2019-03-01 16:31:41 +01:00
1f504e3bd9 separate dependencies from tuple call body 2019-03-01 16:27:45 +01:00
73ceb30a98 cleanup 2019-03-01 16:08:57 +01:00
b25aa2c753 only equal types are allowed to be linked 2019-03-01 15:51:40 +01:00
7260d0333e fix 2019-03-01 15:44:13 +01:00
bdf1522fae move CPU specific stuff to backend folder 2019-03-01 15:34:11 +01:00
7333478220 refactor function generation from data flow nodes 2019-03-01 13:41:54 +01:00
4a502bef3c fix 2019-03-01 13:40:51 +01:00
d26f3663b1 Merge branch 'master' into functions 2019-03-01 10:32:36 +01:00
dd372c4d3d first test using optional value 2019-02-28 14:42:54 +01:00
c4d221b149 simple BLI::optional<T> type (C++11 compatible) 2019-02-28 14:18:06 +01:00
dbc584ea9c move some files 2019-02-28 14:01:47 +01:00
97997dd056 header cleanup 2019-02-28 12:40:20 +01:00
060a6c0e06 rename function headers 2019-02-28 12:31:34 +01:00
451884d2ea better separation between functions and nodes 2019-02-28 12:25:57 +01:00
367b065369 Merge branch 'master' into functions 2019-02-28 11:45:46 +01:00
5c72773a6d typo and minor improvement 2019-02-25 17:35:06 +01:00
b7ec20cc27 Merge branch 'master' into functions 2019-02-25 15:56:19 +01:00
3901ae2cb7 init defaults in tuple 2019-02-22 15:42:32 +01:00
e8187d58e5 Map Range node 2019-02-22 15:09:47 +01:00
9458baa8fe pass seed to driver function 2019-02-22 14:44:11 +01:00
c9a9e8670b pass index to function in displace modifier 2019-02-22 14:28:33 +01:00
5846212aab fix and cleanup 2019-02-22 14:27:53 +01:00
4108d2f4f9 integer socket 2019-02-22 14:27:34 +01:00
eaeda7dc6b remove unnecessary file 2019-02-22 13:53:47 +01:00
adba334093 utility function 2019-02-22 13:53:25 +01:00
36efb78551 improved naming 2019-02-22 13:42:41 +01:00
038a32ce1c Merge branch 'master' into functions 2019-02-21 16:56:36 +01:00
95f02d7806 new Driver Variable type that evaluates a function 2019-02-21 16:56:00 +01:00
be308462b4 vector socket actually works now 2019-02-21 16:54:41 +01:00
660ca276ca add function relations 2019-02-21 16:51:42 +01:00
daaa02f8b1 Use weight function in displace modifier 2019-02-21 14:32:59 +01:00
6593ba7e6b improved C function API 2019-02-21 14:27:10 +01:00
4f686995c8 read from original tree 2019-02-21 13:40:49 +01:00
2fbdd08636 Merge branch 'master' into functions 2019-02-20 17:20:01 +01:00
1472b4a77f simple to use function timer 2019-02-20 17:19:09 +01:00
de6a5ea3a0 clamp node as combination of min and max functions 2019-02-20 16:59:21 +01:00
d82a6a89b4 min and max of floats 2019-02-20 16:44:21 +01:00
72b67178dc vector distance node 2019-02-20 16:32:31 +01:00
dbd5c54510 debug print for functions 2019-02-20 16:21:40 +01:00
2218d7bf9e check function signature in modifier 2019-02-20 16:06:09 +01:00
e865bc730d check function signature with c wrapper 2019-02-20 15:48:22 +01:00
c4f39dd4aa remove some testing code 2019-02-20 15:34:52 +01:00
263bf06f66 annotation... 2019-02-20 15:25:48 +01:00
fa306a3c4a more generic float math node 2019-02-20 15:25:04 +01:00
08da311c74 dynamically add and remove sockets 2019-02-20 15:05:47 +01:00
513b7b3c78 add outputs dynamically 2019-02-20 14:21:54 +01:00
2ac967c63e typo 2019-02-20 13:48:06 +01:00
7699ea4d27 refactor graph generation 2019-02-20 13:44:03 +01:00
e3c61a30e1 refactor data flow graph generation 2019-02-20 12:50:58 +01:00
c1c17ba542 lookup_default 2019-02-20 12:49:44 +01:00
0267002a47 Merge branch 'master' into functions 2019-02-19 19:27:51 +01:00
dfdc955b1c cleanup 2019-02-19 17:54:57 +01:00
144a90688c better lazy init macro 2019-02-19 17:54:00 +01:00
a2ecba884a missing pragma once 2019-02-19 17:53:24 +01:00
e417f07ee2 use mempool to allocate nodes 2019-02-19 17:17:38 +01:00
66389f8933 inference list relations properly 2019-02-18 18:18:47 +01:00
cca48e2d00 different way to store Type Relations 2019-02-18 17:22:52 +01:00
d533afa17b all_equal tests 2019-02-18 17:21:23 +01:00
1a282bdca1 Signature.has_interface 2019-02-18 17:21:09 +01:00
6922161179 SmallVector::all_equal 2019-02-18 17:20:34 +01:00
a5cf0149dc Merge branch 'master' into functions 2019-02-18 16:24:46 +01:00
30d7e0814f fix SmallVector 2019-02-18 15:00:33 +01:00
c3b7bfbded use allowed namespace definition syntax only 2019-02-18 14:59:46 +01:00
7df89986a5 Merge branch 'functions-in-train' into functions 2019-02-17 21:17:11 +01:00
34e1684fa2 Merge branch 'master' into functions 2019-02-17 21:09:08 +01:00
47ea90771d initial type relations and improved inferencer 2019-02-17 17:44:21 +01:00
d93ecc84bb initial type inferencer 2019-02-17 15:54:00 +01:00
b166e18d56 small vector - remove and reorder 2019-02-17 15:49:43 +01:00
d7fca3e468 initial lazy init macro 2019-02-17 14:46:54 +01:00
e3cdeb80b1 MemPool 2019-02-17 14:17:48 +01:00
f2c8e39d29 small stack 2019-02-17 13:32:29 +01:00
27dd613a84 Merge branch 'master' into functions 2019-02-13 17:00:47 +01:00
aafe1034bb store node tree pointer in modifier
Unfortunately, there are still issues with the COW system resulting in a crash.
2019-02-12 19:20:45 +01:00
393f220f48 setup object dependencies correctly 2019-02-12 14:32:14 +01:00
79d2ea4f41 cleanup 2019-02-11 18:20:27 +01:00
139cdff657 object transforms node 2019-02-11 18:01:48 +01:00
10395fd00d separate vector node 2019-02-11 17:33:34 +01:00
e49edb2ef1 actually read socket value 2019-02-11 17:13:31 +01:00
fb3e05ff62 better usage of wrapper 2019-02-11 16:57:36 +01:00
548eb3a822 listbase wrapper 2019-02-11 16:51:33 +01:00
62cfea48a3 initial node tree to function conversion 2019-02-11 16:10:17 +01:00
caa03d7a5d cleanup 2019-02-10 20:14:26 +01:00
edad572189 FunctionGraph - a graph with specified inputs and outputs 2019-02-10 20:14:25 +01:00
8133fb0fad cleanup 2019-02-10 20:14:25 +01:00
4c1a59fa96 cleanup 2019-02-10 20:14:25 +01:00
49385f89b9 function input and output node 2019-02-10 20:14:25 +01:00
c4364f3499 initial node tree 2019-02-10 20:14:25 +01:00
791902b2d2 better dot exprot 2019-02-10 20:14:25 +01:00
785289594b SmallMap.add should not replace existing entries 2019-02-10 20:14:25 +01:00
ffdf77dd59 better naming 2019-02-10 20:14:25 +01:00
6ad32098af do not use this-> for prefixed member variables 2019-02-10 20:14:25 +01:00
34026205f0 store more type info in Type 2019-02-10 20:14:25 +01:00
5743ffc46f cmake fix 2019-02-10 20:14:25 +01:00
c3b0b85d47 move Composition to BLI 2019-02-10 20:14:25 +01:00
ac8555af9e Function and Type are final classes - can still be extended with Composition 2019-02-10 20:14:25 +01:00
999a802600 generate function from data flow graph 2019-02-10 20:14:25 +01:00
59d589e736 move concrete type definitions into separate translation unit 2019-02-10 20:14:24 +01:00
4c3941745a types don't have to be const everywhere 2019-02-10 20:14:24 +01:00
04350ca976 initial value iterator 2019-02-10 20:14:24 +01:00
ff59b09f02 cleanup 2019-02-10 20:14:24 +01:00
d5e675bddb append rvalue reference to smallvector 2019-02-10 20:14:24 +01:00
ecd2e2b454 move shared without incref and decref 2019-02-10 20:14:24 +01:00
a9c1796470 use shared ownership for functions and types 2019-02-10 20:14:24 +01:00
05f9492580 actually free elements in small vector 2019-02-10 20:14:24 +01:00
328a6e9c91 use shared ownership for functions and types 2019-02-10 20:14:24 +01:00
7773e1c2af better separation of concerns for shared objects 2019-02-10 20:14:24 +01:00
542caff21b custom reference counter that supports manual incref and decref 2019-02-10 20:14:24 +01:00
4d572be4e6 small set vector 2019-02-10 20:14:23 +01:00
74e40a8863 Tuple::copy_element 2019-02-10 20:14:23 +01:00
8d55ff177d extend set and vector data structure 2019-02-10 20:14:23 +01:00
fff8781973 dot export for data flow graph 2019-02-10 20:14:23 +01:00
252e46a346 input and output parameter class 2019-02-10 20:14:23 +01:00
010a4a76b5 data flow graph 2019-02-10 20:14:23 +01:00
434e2afe3c more generic dynamic composition of types and functions 2019-02-10 20:14:23 +01:00
5784e17ff7 renaming 2019-02-10 20:14:23 +01:00
617d35315c test dynamic composition instead of inheritance for functions 2019-02-10 20:14:23 +01:00
f63f7c1c86 minor fix, should be solved differently.. 2019-02-10 20:14:23 +01:00
d5e25680df separate actual core from cpu functions 2019-02-10 20:14:23 +01:00
6185d5fa7d typo 2019-02-10 20:14:23 +01:00
25ff42d7d5 use const ref parameter 2019-02-10 20:14:23 +01:00
317a2880f6 fill test 2019-02-10 20:14:23 +01:00
f4e7621ee7 don't construct unneeded objects in SmallVector 2019-02-10 20:14:22 +01:00
cbefe2ad55 initial SmallMap 2019-02-10 20:14:22 +01:00
0774265195 modifier fix 2019-02-10 20:14:22 +01:00
3012e7a3c2 Tuple structure (no copy/move functionality yet) 2019-02-10 20:14:22 +01:00
a22763349a use static size information to increase performance 2019-02-10 20:14:22 +01:00
4328946e12 work better with uninitialized memory + tests for SmallVector 2019-02-10 20:14:21 +01:00
be5c59f09a cleanup api a bit 2019-02-10 20:14:20 +01:00
a52d9b4bac actually deform something 2019-02-10 20:14:20 +01:00
59970cc12f move test code to new modifier 2019-02-10 20:14:20 +01:00
46a4cf3697 new deform modifier 2019-02-10 20:14:20 +01:00
ebc898756a deform function test 2019-02-10 20:14:20 +01:00
a9322b7e58 small buffer inherits small vector 2019-02-10 20:14:20 +01:00
54b8d6ba0b more const 2019-02-10 20:14:20 +01:00
a3aaf9d4f9 implement move semantics properly, hopefully 2019-02-10 20:14:20 +01:00
b36a4d7c72 first successful execution 2019-02-10 20:14:20 +01:00
178d41c250 fix 2019-02-10 20:14:20 +01:00
520d7cd663 better naming 2019-02-10 20:14:20 +01:00
bd44822f89 implement other small vector constructors 2019-02-10 20:14:20 +01:00
37e0362215 cleanup 2019-02-10 20:14:19 +01:00
9b3a4c1697 real SmallVector implementation + make types const 2019-02-10 20:14:19 +01:00
09a561aa25 more initial setup 2019-02-10 20:14:19 +01:00
7fbebda942 basic code structure 2019-02-10 20:14:19 +01:00
ade4c61063 function api design 2019-02-10 20:14:19 +01:00
8753 changed files with 612159 additions and 964712 deletions

View File

@@ -2,7 +2,7 @@
# Configuration of clang-format
# =============================
#
# Tested to work with versions: 8 to 11.
# Tested to work with versions: 6 to 8.
# This causes parameters on continuations to align to the opening brace.
#
@@ -132,7 +132,9 @@ PenaltyBreakAssignment: 100
AllowShortFunctionsOnASingleLine: None
SortIncludes: true
# Disable for now since it complicates initial migration tests,
# TODO: look into enabling this in the future.
SortIncludes: false
# Don't right align escaped newlines to the right because we have a wide default
AlignEscapedNewlines: DontAlign
@@ -161,7 +163,6 @@ PenaltyBreakString: 1000000
# "^\s+[A-Z][A-Z0-9_]+\s*\([^\n]*\)\n\s*\{"
ForEachMacros:
- BEGIN_ANIMFILTER_SUBCHANNELS
- BKE_pbvh_vertex_iter_begin
- BLI_FOREACH_SPARSE_RANGE
- BLI_SMALLSTACK_ITER_BEGIN
- BMO_ITER
@@ -192,7 +193,6 @@ ForEachMacros:
- FOREACH_MAIN_ID_BEGIN
- FOREACH_MAIN_LISTBASE_BEGIN
- FOREACH_MAIN_LISTBASE_ID_BEGIN
- FOREACH_MESH_BUFFER_CACHE
- FOREACH_NODETREE_BEGIN
- FOREACH_OBJECT_BEGIN
- FOREACH_OBJECT_FLAG_BEGIN
@@ -215,7 +215,6 @@ ForEachMacros:
- GHASH_ITER_INDEX
- GPU_SELECT_LOAD_IF_PICKSEL_LIST
- GP_EDITABLE_STROKES_BEGIN
- GP_EVALUATED_STROKES_BEGIN
- GSET_FOREACH_BEGIN
- GSET_ITER
- GSET_ITER_INDEX
@@ -239,7 +238,7 @@ ForEachMacros:
- LISTBASE_FOREACH_BACKWARD
- LISTBASE_FOREACH_MUTABLE
- LISTBASE_FOREACH_BACKWARD_MUTABLE
- LISTBASE_FOREACH_INDEX
- MAN2D_ITER_AXES_BEGIN
- MAN_ITER_AXES_BEGIN
- NODE_INSTANCE_HASH_ITER
- NODE_SOCKET_TYPES_BEGIN
@@ -247,23 +246,16 @@ ForEachMacros:
- NODE_TYPES_BEGIN
- PIXEL_LOOPER_BEGIN
- PIXEL_LOOPER_BEGIN_CHANNELS
- RENDER_PASS_ITER_BEGIN
- RNA_BEGIN
- RNA_PROP_BEGIN
- RNA_STRUCT_BEGIN
- RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
- SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
- SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
- SEQ_ALL_BEGIN
- SEQ_ITERATOR_FOREACH
- SURFACE_QUAD_ITER_BEGIN
- SEQP_BEGIN
- SEQ_BEGIN
- foreach
- ED_screen_areas_iter
- SLOT_PROBING_BEGIN
- SET_SLOT_PROBING_BEGIN
- MAP_SLOT_PROBING_BEGIN
- VECTOR_SET_SLOT_PROBING_BEGIN
StatementMacros:
- PyObject_HEAD
- PyObject_VAR_HEAD
# Use once we bump the minimum version to version 8.
# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
# StatementMacros:
# - PyObject_VAR_HEAD
# - STRINGIFY

View File

@@ -1,47 +0,0 @@
# The warnings below are disabled because they are too pedantic and not worth fixing.
# Some of them will be enabled as part of the Clang-Tidy task, see T78535.
Checks: >
-*,
readability-*,
-readability-uppercase-literal-suffix,
-readability-magic-numbers,
-readability-isolate-declaration,
-readability-convert-member-functions-to-static,
-readability-implicit-bool-conversion,
-readability-avoid-const-params-in-decls,
-readability-simplify-boolean-expr,
-readability-make-member-function-const,
-readability-misleading-indentation,
-readability-use-anyofallof,
-readability-function-cognitive-complexity,
bugprone-*,
-bugprone-narrowing-conversions,
-bugprone-unhandled-self-assignment,
-bugprone-branch-clone,
-bugprone-macro-parentheses,
-bugprone-reserved-identifier,
-bugprone-sizeof-expression,
-bugprone-integer-division,
-bugprone-redundant-branch-condition,
modernize-*,
-modernize-use-auto,
-modernize-use-trailing-return-type,
-modernize-avoid-c-arrays,
-modernize-use-nodiscard,
-modernize-loop-convert,
-modernize-pass-by-value,
# Cannot be enabled yet, because using raw string literals in tests breaks
# the windows compiler currently.
-modernize-raw-string-literal
CheckOptions:
- key: modernize-use-default-member-init.UseAssignment
value: 1

View File

@@ -1,104 +0,0 @@
# git config blame.ignoreRevsFile .git-blame-ignore-revs
#
# After running the above, commits listed in this file will be
# ignored by git blame. The blame will be shifted to the person
# who edited the line(s) before the ignored commit.
#
# To disable this ignorance for a command, run as follows
# git blame --ignore-revs-file="" <other options>
#
# Changes that belong here:
# - Massive comment, doxy-sections, or spelling corrections.
# - Clang-format, PEP8 or other automated changes which are *strictly* "no functional change".
# - Several commits should be added to this list at once, because adding
# one extra commit (to edit this file) after every cleanup is noisy.
# - No clang-tidy changes.
#
# Note:
# - The comment above the SHA should be the first line of the commit.
# - It is fine to pack together similar commits if they have the same explanatory comment.
# - Use only 40 character git SHAs; not smaller ones, not prefixed with rB.
#
# https://git-scm.com/docs/git-blame/2.23.0
# white space commit. (2 spaces -> tab).
0a3694cd6ebec710da7110e9f168a72d47c71ee0
# Cycles: Cleanup, spacing after preprocessor
cb4b5e12abf1fc6cf9ffc0944e0a1bc406286c63
# ClangFormat: apply to source, most of intern
e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1
# Code Style: use "#pragma once" in source directory
91694b9b58ab953f3b313be9389cc1303e472fc2
# Code Style: use "#pragma once" in some newer headers
8198dbb888856b8c11757586df02aca15f132f90
# Code Style: use "#pragma once" in intern/ghost
1b1129f82a9cf316b54fbc025f8cfcc1a74b8589
# Cleanup: mostly comments, use doxy syntax & typos
e0cb02587012b4b2f4b18363dc7d0a7da2c02093
# Cleanup: use C comments for descriptive text
2abfcebb0eb7989e3d1e7d03f37ecf5c088210af
# use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
afacd184982e58a9c830a3d5366e25983939a7ba
# Spelling: It's Versus Its
3a7fd309fce89213b0224b3c6807adb2d1fe7ca8
# Spelling: Then Versus Than
d1eefc421544e2ea632fb35cb6bcaade4c39ce6b
# Spelling: Miscellaneous
84ef3b80de4915a24a9fd2fd214d0fa44e59b854
# Spelling: Loose Versus Lose
c0a6bc19794c69843c38451c762e91bc10136e0f
# Spelling: Apart Versus A Part
3d26cd01b9ba6381eb165e11536345ae652dfb41
# Cleanup: use 2 space indentation for CMake
3076d95ba441cd32706a27d18922a30f8fd28b8a
# Cleanup: use over-line for doxy comments
4b188bb08cf5aaae3c68ab57bbcfa037eef1ac10
# Cleanup: General comment style clean up of graph_edit.c and fcurve.c
0105f146bb40bd609ccbda3d3f6aeb8e14ad3f9e
# Cleanup: pep8 (indentation, spacing, long lines)
41d2d6da0c96d351b47acb64d3e0decdba16cb16
# Cleanup: pep8, blank lines
bab9de2a52929fe2b45ecddb1eb09da3378e303b
# Cleanup: PEP8 for python changes
1e7e94588daa66483190f45a9de5e98228f80e05
# GPencil: Cleanup pep8
a09cc3ee1a99f2cd5040bbf30c8ab8c588bb2bb1
# Cleanup: trailing space, remove tabs, pep8
c42a6b77b52560d257279de2cb624b4ef2c0d24c
# Cleanup: use C style doxygen comments
8c1726918374e1d2d2123e17bae8db5aadde3433
# Cleanup: use doxy sections for imbuf
c207f7c22e1439e0b285fba5d2c072bdae23f981
# Cleanup: clang-format
c4d8f6a4a8ddc29ed27311ed7578b3c8c31399d2
b5d310b569e07a937798a2d38539cfd290149f1c
8c846cccd6bdfd3e90a695fabbf05f53e5466a57
4eac03d821fa17546f562485f7d073813a5e5943
1166110a9d66af9c5a47cee2be591f50fdc445e8
# Cleanup: clang-format.
40d4a4cb1a6b4c3c2a486e8f2868f547530e0811

3
.gitignore vendored
View File

@@ -46,6 +46,3 @@ Desktop.ini
# smoke simulation noise tile (generated)
waveletNoiseTile.bin
# testing environment
/Testing

File diff suppressed because it is too large Load Diff

View File

@@ -26,31 +26,24 @@
define HELP_TEXT
Blender Convenience Targets
Convenience Targets
Provided for building Blender, (multiple at once can be used).
* debug: Build a debug binary.
* full: Enable all supported dependencies & options.
* lite: Disable non essential features for a smaller binary and faster build.
* release: Complete build with all options enabled including CUDA and Optix, matching the releases on blender.org
* headless: Build without an interface (renderfarm or server automation).
* cycles: Build Cycles standalone only, without Blender.
* bpy: Build as a python module which can be loaded from python directly.
* deps: Build library dependencies (intended only for platform maintainers).
* developer: Enable faster builds, error checking and tests, recommended for developers.
* config: Run cmake configuration tool to set build options.
* ninja: Use ninja build tool for faster builds.
* ccache: Use ccache for faster rebuilds.
Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir.
Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments.
Other Convenience Targets
Provided for other building operations.
* config: Run cmake configuration tool to set build options.
* deps: Build library dependencies (intended only for platform maintainers).
The existance of locally build dependancies overrides the pre-built dependencies from subversion.
These must be manually removed from '../lib/' to go back to using the pre-compiled libraries.
Project Files
Generate project files for development environments.
@@ -63,7 +56,7 @@ Package Targets
* package_debian: Build a debian package.
* package_pacman: Build an arch linux pacman package.
* package_archive: Build an archive package.
* package_archive: Build an archive package.
Testing Targets
Not associated with building Blender.
@@ -78,6 +71,17 @@ Testing Targets
which are tagged to use the stricter formatting
* test_deprecated:
Checks for deprecation tags in our code which may need to be removed
* test_style_c:
Checks C/C++ conforms with blenders style guide:
https://wiki.blender.org/wiki/Source/Code_Style
* test_style_c_qtc:
Same as test_style but outputs QtCreator tasks format
* test_style_osl:
Checks OpenShadingLanguage conforms with blenders style guide:
https://wiki.blender.org/wiki/Source/Code_Style
* test_style_osl_qtc:
Checks OpenShadingLanguage conforms with blenders style guide:
https://wiki.blender.org/wiki/Source/Code_Style
Static Source Code Checking
Not associated with building Blender.
@@ -87,22 +91,11 @@ Static Source Code Checking
* check_splint: Run blenders source through splint (C only).
* check_sparse: Run blenders source through sparse (C only).
* check_smatch: Run blenders source through smatch (C only).
* check_descriptions: Check for duplicate/invalid descriptions.
Spell Checkers
This runs the spell checker from the developer tools repositor.
* check_spelling_c: Check for spelling errors (C/C++ only),
* check_spelling_c: Check for spelling errors (C/C++ only).
* check_spelling_c_qtc: Same as check_spelling_c but outputs QtCreator tasks format.
* check_spelling_osl: Check for spelling errors (OSL only).
* check_spelling_py: Check for spelling errors (Python only).
Note: an additional word-list is maintained at: 'source/tools/check_source/check_spelling_c_config.py'
Note: that spell checkers can take a 'CHECK_SPELLING_CACHE' filepath argument,
so re-running does not need to re-check unchanged files.
Example:
make check_spelling_c CHECK_SPELLING_CACHE=../spelling_cache.data
* check_descriptions: Check for duplicate/invalid descriptions.
Utilities
Not associated with building Blender.
@@ -128,16 +121,10 @@ Utilities
* source_archive:
Create a compressed archive of the source code.
* source_archive_complete:
Create a compressed archive of the source code and all the libraries of dependencies.
* update:
Updates git and all submodules and svn.
updates git and all submodules
* update_code:
Updates git and all submodules but not svn.
* format:
* format
Format source code using clang (uses PATHS if passed in). For example::
make format PATHS="source/blender/blenlib source/blender/blenkernel"
@@ -165,10 +152,6 @@ Information
endef
# HELP_TEXT (end)
# This makefile is not meant for Windows
ifeq ($(OS),Windows_NT)
$(error On Windows, use "cmd //c make.bat" instead of "make")
endif
# System Vars
OS:=$(shell uname -s)
@@ -197,13 +180,8 @@ endif
ifndef DEPS_INSTALL_DIR
DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
# Add processor type to directory name, except for darwin x86_64
# which by convention does not have it.
ifeq ($(OS_NCASE),darwin)
ifneq ($(CPU),x86_64)
DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
endif
else
ifneq ($(OS_NCASE),darwin)
# Add processor type to directory name
DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
endif
endif
@@ -217,7 +195,7 @@ endif
# in libraries, or python 2 for running make update to get it.
ifeq ($(OS_NCASE),darwin)
ifeq (, $(shell command -v $(PYTHON)))
PYTHON:=$(DEPS_INSTALL_DIR)/python/bin/python3.7m
PYTHON:=../lib/darwin/python/bin/python3.7m
ifeq (, $(shell command -v $(PYTHON)))
PYTHON:=python
endif
@@ -240,10 +218,6 @@ ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_lite
CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake" $(CMAKE_CONFIG_ARGS)
endif
ifneq "$(findstring release, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_release
CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_release.cmake" $(CMAKE_CONFIG_ARGS)
endif
ifneq "$(findstring cycles, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_cycles
CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake" $(CMAKE_CONFIG_ARGS)
@@ -261,10 +235,6 @@ ifneq "$(findstring developer, $(MAKECMDGOALS))" ""
CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake" $(CMAKE_CONFIG_ARGS)
endif
ifneq "$(findstring ccache, $(MAKECMDGOALS))" ""
CMAKE_CONFIG_ARGS:=-DWITH_COMPILER_CCACHE=YES $(CMAKE_CONFIG_ARGS)
endif
# -----------------------------------------------------------------------------
# build tool
@@ -358,13 +328,11 @@ all: .FORCE
debug: all
full: all
lite: all
release: all
cycles: all
headless: all
bpy: all
developer: all
ninja: all
ccache: all
# -----------------------------------------------------------------------------
# Build dependencies
@@ -379,7 +347,7 @@ deps: .FORCE
@cmake -H"$(DEPS_SOURCE_DIR)" \
-B"$(DEPS_BUILD_DIR)" \
-DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
-DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
@echo
@echo Building dependencies ...
@@ -434,6 +402,45 @@ test_cmake: .FORCE
test_deprecated: .FORCE
$(PYTHON) tests/check_deprecated.py
test_style_c: .FORCE
# run our own checks on C/C++ style
PYTHONIOENCODING=utf_8 $(PYTHON) \
"$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
"$(BLENDER_DIR)/source/blender" \
"$(BLENDER_DIR)/source/creator" \
--no-length-check
test_style_c_qtc: .FORCE
# run our own checks on C/C++ style
USE_QTC_TASK=1 \
PYTHONIOENCODING=utf_8 $(PYTHON) \
"$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
"$(BLENDER_DIR)/source/blender" \
"$(BLENDER_DIR)/source/creator" \
--no-length-check \
> \
"$(BLENDER_DIR)/test_style.tasks"
@echo "written: test_style.tasks"
test_style_osl: .FORCE
# run our own checks on C/C++ style
PYTHONIOENCODING=utf_8 $(PYTHON) \
"$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
"$(BLENDER_DIR)/intern/cycles/kernel/shaders" \
"$(BLENDER_DIR)/release/scripts/templates_osl"
test_style_osl_qtc: .FORCE
# run our own checks on C/C++ style
USE_QTC_TASK=1 \
PYTHONIOENCODING=utf_8 $(PYTHON) \
"$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
"$(BLENDER_DIR)/intern/cycles/kernel/shaders" \
"$(BLENDER_DIR)/release/scripts/templates_osl" \
> \
"$(BLENDER_DIR)/test_style.tasks"
@echo "written: test_style.tasks"
# -----------------------------------------------------------------------------
# Project Files
@@ -456,8 +463,7 @@ project_eclipse: .FORCE
check_cppcheck: .FORCE
$(CMAKE_CONFIG)
cd "$(BUILD_DIR)" ; \
$(PYTHON) \
"$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
"$(BLENDER_DIR)/check_cppcheck.txt"
@echo "written: check_cppcheck.txt"
@@ -481,9 +487,6 @@ check_smatch: .FORCE
cd "$(BUILD_DIR)" ; \
$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py"
check_mypy: .FORCE
$(PYTHON) "$(BLENDER_DIR)/source/tools/check_source/check_mypy.py"
check_spelling_py: .FORCE
cd "$(BUILD_DIR)" ; \
PYTHONIOENCODING=utf_8 $(PYTHON) \
@@ -494,17 +497,26 @@ check_spelling_c: .FORCE
cd "$(BUILD_DIR)" ; \
PYTHONIOENCODING=utf_8 $(PYTHON) \
"$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
--cache-file=$(CHECK_SPELLING_CACHE) \
"$(BLENDER_DIR)/source" \
"$(BLENDER_DIR)/intern/cycles" \
"$(BLENDER_DIR)/intern/guardedalloc" \
"$(BLENDER_DIR)/intern/ghost" \
check_spelling_c_qtc: .FORCE
cd "$(BUILD_DIR)" ; USE_QTC_TASK=1 \
PYTHONIOENCODING=utf_8 $(PYTHON) \
"$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
"$(BLENDER_DIR)/source" \
"$(BLENDER_DIR)/intern/cycles" \
"$(BLENDER_DIR)/intern/guardedalloc" \
"$(BLENDER_DIR)/intern/ghost" \
> \
"$(BLENDER_DIR)/check_spelling_c.tasks"
check_spelling_osl: .FORCE
cd "$(BUILD_DIR)" ;\
PYTHONIOENCODING=utf_8 $(PYTHON) \
"$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
--cache-file=$(CHECK_SPELLING_CACHE) \
"$(BLENDER_DIR)/intern/cycles/kernel/shaders"
check_descriptions: .FORCE
@@ -516,24 +528,14 @@ check_descriptions: .FORCE
#
source_archive: .FORCE
python3 ./build_files/utils/make_source_archive.py
source_archive_complete: .FORCE
cmake \
-S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
-DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
# This assumes CMake is still using a default `PACKAGE_DIR` variable:
python3 ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
./build_files/utils/make_source_archive.sh
INKSCAPE_BIN?="inkscape"
icons: .FORCE
BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
INKSCAPE_BIN=$(INKSCAPE_BIN) \
"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
INKSCAPE_BIN=$(INKSCAPE_BIN) \
"$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
icons_geom: .FORCE
BLENDER_BIN=$(BLENDER_BIN) \
@@ -542,12 +544,9 @@ icons_geom: .FORCE
update: .FORCE
$(PYTHON) ./build_files/utils/make_update.py
update_code: .FORCE
$(PYTHON) ./build_files/utils/make_update.py --no-libraries
format: .FORCE
PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
# -----------------------------------------------------------------------------
@@ -556,11 +555,10 @@ format: .FORCE
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py: .FORCE
ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
$(BLENDER_BIN) \
--background -noaudio --factory-startup \
--python doc/python_api/sphinx_doc_gen.py
sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
ASAN_OPTIONS=halt_on_error=0 \
$(BLENDER_BIN) --background -noaudio --factory-startup \
--python doc/python_api/sphinx_doc_gen.py
cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
doc_doxy: .FORCE
@@ -568,9 +566,8 @@ doc_doxy: .FORCE
@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
doc_dna: .FORCE
$(BLENDER_BIN) \
--background -noaudio --factory-startup \
--python doc/blender_file_format/BlendFileDnaExporter_25.py
$(BLENDER_BIN) --background -noaudio --factory-startup \
--python doc/blender_file_format/BlendFileDnaExporter_25.py
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
doc_man: .FORCE

View File

@@ -30,12 +30,11 @@
# build_deps 2015 x64 / build_deps 2015 x86
#
# MAC OS X USAGE:
# Install with homebrew: brew install autoconf automake bison cmake libtool pkg-config yasm
# Additional requirements for macOS arm64: brew install flex
# Install with homebrew: brew install cmake autoconf automake libtool yasm nasm
# Run "make deps" from main Blender directory
#
# LINUX USAGE:
# Install compiler cmake autoconf automake libtool yasm tcl
# Install compiler cmake autoconf automake libtool yasm nasm tcl
# Run "make deps" from main Blender directory
#
####################################################################################################
@@ -47,19 +46,22 @@ include(ExternalProject)
include(cmake/check_software.cmake)
include(cmake/options.cmake)
include(cmake/versions.cmake)
include(cmake/download.cmake)
if(ENABLE_MINGW64)
include(cmake/setup_mingw64.cmake)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
include(cmake/setup_mingw64.cmake)
else()
include(cmake/setup_mingw32.cmake)
endif()
else()
set(mingw_LIBDIR ${LIBDIR})
endif()
include(cmake/zlib.cmake)
include(cmake/zstd.cmake)
include(cmake/openal.cmake)
include(cmake/png.cmake)
include(cmake/jpeg.cmake)
include(cmake/boost.cmake)
include(cmake/blosc.cmake)
include(cmake/pthreads.cmake)
include(cmake/openexr.cmake)
@@ -73,61 +75,48 @@ include(cmake/cuew.cmake)
include(cmake/opensubdiv.cmake)
include(cmake/sdl.cmake)
include(cmake/opencollada.cmake)
include(cmake/opencolorio.cmake)
include(cmake/llvm.cmake)
include(cmake/clang.cmake)
if(APPLE)
include(cmake/openmp.cmake)
endif()
if(UNIX)
include(cmake/nasm.cmake)
endif()
include(cmake/openimageio.cmake)
include(cmake/tiff.cmake)
if(WIN32)
include(cmake/flexbison.cmake)
elseif(UNIX AND NOT APPLE)
include(cmake/flex.cmake)
endif()
include(cmake/flexbison.cmake)
include(cmake/osl.cmake)
include(cmake/tbb.cmake)
include(cmake/openvdb.cmake)
include(cmake/nanovdb.cmake)
include(cmake/python.cmake)
option(USE_PIP_NUMPY "Install NumPy using pip wheel instead of building from source" OFF)
if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
set(USE_PIP_NUMPY ON)
else()
include(cmake/numpy.cmake)
endif()
include(cmake/python_site_packages.cmake)
include(cmake/package_python.cmake)
include(cmake/numpy.cmake)
include(cmake/usd.cmake)
include(cmake/potrace.cmake)
include(cmake/haru.cmake)
# Boost needs to be included after python.cmake due to the PYTHON_BINARY variable being needed.
include(cmake/boost.cmake)
include(cmake/pugixml.cmake)
include(cmake/ispc.cmake)
if(UNIX)
# Rely on PugiXML compiled with OpenImageIO
else()
include(cmake/pugixml.cmake)
endif()
include(cmake/openimagedenoise.cmake)
include(cmake/embree.cmake)
if(NOT APPLE)
include(cmake/xr_openxr.cmake)
endif()
# OpenColorIO and dependencies.
include(cmake/expat.cmake)
include(cmake/yamlcpp.cmake)
include(cmake/opencolorio.cmake)
if(BLENDER_PLATFORM_ARM)
include(cmake/sse2neon.cmake)
endif()
include(cmake/xr_openxr.cmake)
if(WITH_WEBP)
include(cmake/webp.cmake)
endif()
if(WIN32)
# HMD branch deps
include(cmake/hidapi.cmake)
# OCIO deps
include(cmake/tinyxml.cmake)
include(cmake/yamlcpp.cmake)
# LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
# include(cmake/lcms.cmake)
endif()
if(NOT WIN32 OR ENABLE_MINGW64)
include(cmake/gmp.cmake)
include(cmake/openjpeg.cmake)
if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
if(WIN32)
@@ -141,6 +130,7 @@ if(NOT WIN32 OR ENABLE_MINGW64)
include(cmake/vpx.cmake)
include(cmake/x264.cmake)
include(cmake/xvidcore.cmake)
include(cmake/faad.cmake)
include(cmake/ffmpeg.cmake)
include(cmake/fftw.cmake)
include(cmake/sndfile.cmake)
@@ -169,7 +159,6 @@ endif()
if(UNIX AND NOT APPLE)
include(cmake/libglu.cmake)
include(cmake/mesa.cmake)
include(cmake/wayland_protocols.cmake)
endif()
include(cmake/harvest.cmake)

View File

@@ -16,9 +16,28 @@
#
# ***** END GPL LICENSE BLOCK *****
if(ALEMBIC_HDF5)
set(ALEMBIC_HDF5_HL)
# in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really
# unhappy, stub it with the debug mode lib. it's not linking it in at this
# point in time anyhow
if(BUILD_MODE STREQUAL Debug)
set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT})
endif()
endif()
set(ALEMBIC_EXTRA_ARGS
-DBUILDSTATIC=ON
-DLINKSTATIC=ON
-DALEMBIC_LIB_USES_BOOST=ON
-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-DBoost_USE_MULTITHREADED=ON
-DUSE_STATIC_BOOST=On
-DBoost_USE_STATIC_LIBS=ON
-DBoost_USE_STATIC_RUNTIME=OFF
-DBoost_DEBUG=ON
-DBOOST_ROOT=${LIBDIR}/boost
-DBoost_NO_SYSTEM_PATHS=ON
-DILMBASE_ROOT=${LIBDIR}/openexr
-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR
-DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
@@ -33,6 +52,7 @@ set(ALEMBIC_EXTRA_ARGS
-DUSE_PRMAN=0
-DUSE_HDF5=Off
-DUSE_STATIC_HDF5=Off
-DHDF5_ROOT=${LIBDIR}/hdf5
-DUSE_TESTS=Off
-DALEMBIC_NO_OPENGL=1
-DUSE_BINARIES=ON
@@ -41,12 +61,13 @@ set(ALEMBIC_EXTRA_ARGS
-DGLUT_INCLUDE_DIR=""
-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
${ALEMBIC_HDF5_HL}
)
ExternalProject_Add(external_alembic
URL file://${PACKAGE_DIR}/${ALEMBIC_FILE}
URL ${ALEMBIC_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${ALEMBIC_HASH_TYPE}=${ALEMBIC_HASH}
URL_HASH MD5=${ALEMBIC_MD5}
PREFIX ${BUILD_DIR}/alembic
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/alembic
@@ -71,6 +92,7 @@ endif()
add_dependencies(
external_alembic
external_boost
external_zlib
external_openexr
)

View File

@@ -29,16 +29,16 @@ set(BLOSC_EXTRA_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
)
# Prevent blosc from including its own local copy of zlib in the object file
# Prevent blosc from including it's own local copy of zlib in the object file
# and cause linker errors with everybody else.
set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
-DPREFER_EXTERNAL_ZLIB=ON
)
ExternalProject_Add(external_blosc
URL file://${PACKAGE_DIR}/${BLOSC_FILE}
URL ${BLOSC_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${BLOSC_HASH_TYPE}=${BLOSC_HASH}
URL_HASH MD5=${BLOSC_HASH}
PREFIX ${BUILD_DIR}/blosc
PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}

View File

@@ -18,27 +18,33 @@
set(BOOST_ADDRESS_MODEL 64)
if(BLENDER_PLATFORM_ARM)
set(BOOST_ARCHITECTURE arm)
else()
set(BOOST_ARCHITECTURE x86)
endif()
if(WIN32)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(PYTHON_ARCH x64)
set(PYTHON_ARCH2 win-AMD64)
set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
else()
set(PYTHON_ARCH x86)
set(PYTHON_ARCH2 win32)
set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
set(BOOST_ADDRESS_MODEL 32)
endif()
set(BOOST_TOOLSET toolset=msvc-14.1)
set(BOOST_COMPILER_STRING -vc141)
set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
set(BOOST_BUILD_COMMAND b2)
set(BOOST_BUILD_COMMAND bjam)
set(BOOST_BUILD_OPTIONS runtime-link=shared )
set(BOOST_HARVEST_CMD ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
if(BUILD_MODE STREQUAL Release)
set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
endif()
elseif(APPLE)
set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
set(BOOST_BUILD_COMMAND ./b2)
set(BOOST_BUILD_OPTIONS toolset=clang-darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
set(BOOST_HARVEST_CMD echo .)
set(BOOST_PATCH_COMMAND echo .)
else()
@@ -54,21 +60,6 @@ else()
endif()
endif()
if(WITH_BOOST_PYTHON)
set(JAM_FILE ${BUILD_DIR}/boost.user-config.jam)
configure_file(${PATCH_DIR}/boost.user.jam.in ${JAM_FILE})
set(BOOST_PYTHON_OPTIONS
--with-python
--user-config=${JAM_FILE}
)
if(WIN32 AND BUILD_MODE STREQUAL Debug)
set(BOOST_PYTHON_OPTIONS
${BOOST_PYTHON_OPTIONS}
define=BOOST_DEBUG_PYTHON
)
endif()
endif()
set(BOOST_OPTIONS
--with-filesystem
--with-locale
@@ -85,28 +76,19 @@ set(BOOST_OPTIONS
-sNO_LZMA=1
-sNO_ZSTD=1
${BOOST_TOOLSET}
${BOOST_PYTHON_OPTIONS}
)
string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
ExternalProject_Add(external_boost
URL file://${PACKAGE_DIR}/${BOOST_FILE}
URL ${BOOST_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${BOOST_HASH_TYPE}=${BOOST_HASH}
URL_HASH MD5=${BOOST_HASH}
PREFIX ${BUILD_DIR}/boost
UPDATE_COMMAND ""
PATCH_COMMAND ${BOOST_PATCH_COMMAND}
CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS} --prefix=${LIBDIR}/boost install
BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS} --prefix=${LIBDIR}/boost install
BUILD_IN_SOURCE 1
INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
)
if(WITH_BOOST_PYTHON)
add_dependencies(
external_boost
external_python
external_numpy
)
endif()

View File

@@ -25,14 +25,12 @@ if(UNIX AND NOT APPLE)
set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
&& export PREFIX=${BZIP2_PREFIX})
else()
set(BZIP2_CONFIGURE_ENV ${CONFIGURE_ENV})
endif()
ExternalProject_Add(external_bzip2
URL file://${PACKAGE_DIR}/${BZIP2_FILE}
URL ${BZIP2_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${BZIP2_HASH_TYPE}=${BZIP2_HASH}
URL_HASH SHA256=${BZIP2_HASH}
PREFIX ${BUILD_DIR}/bzip2
CONFIGURE_COMMAND echo .
BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}

View File

@@ -26,23 +26,12 @@ if(UNIX)
set(_required_software
autoconf
automake
bison
${_libtoolize_name}
pkg-config
tclsh
nasm
yasm
tclsh
)
if(NOT APPLE)
set(_required_software
${_required_software}
# Needed for Mesa.
meson
ninja
)
endif()
foreach(_software ${_required_software})
find_program(_software_find NAMES ${_software})
if(NOT _software_find)
@@ -51,18 +40,6 @@ if(UNIX)
unset(_software_find CACHE)
endforeach()
if(APPLE)
# Homebrew has different default locations for ARM and Intel macOS.
if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
set(HOMEBREW_LOCATION "/opt/homebrew")
else()
set(HOMEBREW_LOCATION "/usr/local")
endif()
if(NOT EXISTS "${HOMEBREW_LOCATION}/opt/bison/bin/bison")
string(APPEND _software_missing " bison")
endif()
endif()
if(_software_missing)
message(
"\n"
@@ -70,13 +47,10 @@ if(UNIX)
" ${_software_missing}\n"
"\n"
"On Debian and Ubuntu:\n"
" apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n"
" apt install autoconf automake libtool yasm nasm tcl\n"
"\n"
"On macOS Intel (with homebrew):\n"
" brew install autoconf automake bison libtool pkg-config yasm\n"
"\n"
"On macOS ARM (with homebrew):\n"
" brew install autoconf automake bison flex libtool pkg-config yasm\n"
"On macOS (with homebrew):\n"
" brew install cmake autoconf automake libtool yasm nasm\n"
"\n"
"Other platforms:\n"
" Install equivalent packages.\n")

View File

@@ -0,0 +1,61 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(CLANG_EXTRA_ARGS
-DCLANG_PATH_TO_LLVM_SOURCE=${BUILD_DIR}/ll/src/ll
-DCLANG_PATH_TO_LLVM_BUILD=${LIBDIR}/llvm
-DLLVM_USE_CRT_RELEASE=MD
-DLLVM_USE_CRT_DEBUG=MDd
-DLLVM_CONFIG=${LIBDIR}/llvm/bin/llvm-config
)
if(WIN32)
set(CLANG_GENERATOR "Ninja")
else()
set(CLANG_GENERATOR "Unix Makefiles")
endif()
ExternalProject_Add(external_clang
URL ${CLANG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${CLANG_HASH}
PREFIX ${BUILD_DIR}/clang
CMAKE_GENERATOR ${CLANG_GENERATOR}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/clang
)
if(MSVC)
if(BUILD_MODE STREQUAL Release)
set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
else()
set(CLANG_HARVEST_COMMAND
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/
)
endif()
ExternalProject_Add_Step(external_clang after_install
COMMAND ${CLANG_HARVEST_COMMAND}
DEPENDEES mkdir update patch download configure build install
)
endif()
add_dependencies(
external_clang
ll
)

View File

@@ -19,9 +19,9 @@
set(CLEW_EXTRA_ARGS)
ExternalProject_Add(external_clew
URL file://${PACKAGE_DIR}/${CLEW_FILE}
URL ${CLEW_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${CLEW_HASH_TYPE}=${CLEW_HASH}
URL_HASH MD5=${CLEW_HASH}
PREFIX ${BUILD_DIR}/clew
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/clew

View File

@@ -19,9 +19,9 @@
set(CUEW_EXTRA_ARGS)
ExternalProject_Add(external_cuew
URL file://${PACKAGE_DIR}/${CUEW_FILE}
URL ${CUEW_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${CUEW_HASH_TYPE}=${CUEW_HASH}
URL_HASH MD5=${CUEW_HASH}
PREFIX ${BUILD_DIR}/cuew
PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}

View File

@@ -1,96 +0,0 @@
function(download_source dep)
set(TARGET_FILE ${${dep}_FILE})
set(TARGET_HASH_TYPE ${${dep}_HASH_TYPE})
set(TARGET_HASH ${${dep}_HASH})
if(PACKAGE_USE_UPSTREAM_SOURCES)
set(TARGET_URI ${${dep}_URI})
else()
set(TARGET_URI https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE})
endif()
set(TARGET_FILE ${PACKAGE_DIR}/${TARGET_FILE})
message("Checking source : ${dep} (${TARGET_FILE})")
if(NOT EXISTS ${TARGET_FILE})
message("Checking source : ${dep} - source not found downloading from ${TARGET_URI}")
file(DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
TIMEOUT 1800 # seconds
EXPECTED_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
TLS_VERIFY ON
SHOW_PROGRESS
)
endif()
endfunction(download_source)
download_source(ZLIB)
download_source(OPENAL)
download_source(PNG)
download_source(JPEG)
download_source(BOOST)
download_source(BLOSC)
download_source(PTHREADS)
download_source(OPENEXR)
download_source(FREETYPE)
download_source(GLEW)
download_source(FREEGLUT)
download_source(ALEMBIC)
download_source(GLFW)
download_source(CLEW)
download_source(GLFW)
download_source(CUEW)
download_source(OPENSUBDIV)
download_source(SDL)
download_source(OPENCOLLADA)
download_source(OPENCOLORIO)
download_source(LLVM)
download_source(OPENMP)
download_source(OPENIMAGEIO)
download_source(TIFF)
download_source(OSL)
download_source(PYTHON)
download_source(TBB)
download_source(OPENVDB)
download_source(NANOVDB)
download_source(NUMPY)
download_source(LAME)
download_source(OGG)
download_source(VORBIS)
download_source(THEORA)
download_source(FLAC)
download_source(VPX)
download_source(OPUS)
download_source(X264)
download_source(XVIDCORE)
download_source(OPENJPEG)
download_source(FFMPEG)
download_source(FFTW)
download_source(ICONV)
download_source(SNDFILE)
if(WITH_WEBP)
download_source(WEBP)
endif()
download_source(SPNAV)
download_source(JEMALLOC)
download_source(XML2)
download_source(TINYXML)
download_source(YAMLCPP)
download_source(EXPAT)
download_source(PUGIXML)
download_source(FLEXBISON)
download_source(BZIP2)
download_source(FFI)
download_source(LZMA)
download_source(SSL)
download_source(SQLITE)
download_source(EMBREE)
download_source(USD)
download_source(OIDN)
download_source(LIBGLU)
download_source(MESA)
download_source(NASM)
download_source(XR_OPENXR_SDK)
download_source(WL_PROTOCOLS)
download_source(ISPC)
download_source(GMP)
download_source(POTRACE)
download_source(HARU)
download_source(ZSTD)
download_source(FLEX)

View File

@@ -26,59 +26,24 @@ set(EMBREE_EXTRA_ARGS
-DEMBREE_RAY_MASK=ON
-DEMBREE_FILTER_FUNCTION=ON
-DEMBREE_BACKFACE_CULLING=OFF
-DEMBREE_TASKING_SYSTEM=INTERNAL
-DEMBREE_MAX_ISA=AVX2
-DEMBREE_TASKING_SYSTEM=TBB
-DEMBREE_TBB_ROOT=${LIBDIR}/tbb
-DTBB_ROOT=${LIBDIR}/tbb
-DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
)
if(TBB_STATIC_LIBRARY)
set(EMBREE_EXTRA_ARGS
${EMBREE_EXTRA_ARGS}
-DEMBREE_TBB_LIBRARY_NAME=tbb_static
-DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_static
)
endif()
if(WIN32)
set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
if(BUILD_MODE STREQUAL Debug)
list(APPEND EMBREE_EXTRA_ARGS
-DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_debug
-DEMBREE_TBB_LIBRARY_NAME=tbb_debug
)
endif()
else()
set(EMBREE_BUILD_DIR)
endif()
if(BLENDER_PLATFORM_ARM)
ExternalProject_Add(external_embree
GIT_REPOSITORY ${EMBREE_ARM_GIT}
GIT_TAG "blender-arm"
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/embree
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/embree
)
else()
ExternalProject_Add(external_embree
URL file://${PACKAGE_DIR}/${EMBREE_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
PREFIX ${BUILD_DIR}/embree
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/embree
)
endif()
add_dependencies(
external_embree
external_tbb
ExternalProject_Add(external_embree
URL ${EMBREE_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${EMBREE_HASH}
PREFIX ${BUILD_DIR}/embree
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/embree
)
if(WIN32)
if(BUILD_MODE STREQUAL Release)

View File

@@ -1,35 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(EXPAT_EXTRA_ARGS
-DEXPAT_BUILD_DOCS=OFF
-DEXPAT_BUILD_EXAMPLES=OFF
-DEXPAT_BUILD_TESTS=OFF
-DEXPAT_BUILD_TOOLS=OFF
-DEXPAT_SHARED_LIBS=OFF
)
ExternalProject_Add(external_expat
URL file://${PACKAGE_DIR}/${EXPAT_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${EXPAT_HASH_TYPE}=${EXPAT_HASH}
PREFIX ${BUILD_DIR}/expat
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/expat ${DEFAULT_CMAKE_FLAGS} ${EXPAT_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/expat
SOURCE_SUBDIR expat
)

View File

@@ -0,0 +1,40 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(FAAD_EXTRA_ARGS)
if(WIN32)
set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
else()
set(FAAD_EXTRA_CONFIGURE echo .)
endif()
ExternalProject_Add(external_faad
URL ${FAAD_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${FAAD_HASH}
PREFIX ${BUILD_DIR}/faad
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
INSTALL_DIR ${LIBDIR}/faad
)
if(MSVC)
set_target_properties(external_faad PROPERTIES FOLDER Mingw)
endif()

View File

@@ -17,8 +17,8 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_ffi
URL file://${PACKAGE_DIR}/${FFI_FILE}
URL_HASH ${FFI_HASH_TYPE}=${FFI_HASH}
URL ${FFI_URI}
URL_HASH SHA256=${FFI_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/ffi
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi

View File

@@ -30,7 +30,6 @@ if(WIN32)
--enable-w32threads
--disable-pthreads
--enable-libopenjpeg
--disable-mediafoundation
)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
set(FFMPEG_EXTRA_FLAGS
@@ -51,19 +50,13 @@ if(APPLE)
set(FFMPEG_EXTRA_FLAGS
${FFMPEG_EXTRA_FLAGS}
--target-os=darwin
--x86asmexe=${LIBDIR}/nasm/bin/nasm
)
elseif(UNIX)
set(FFMPEG_EXTRA_FLAGS
${FFMPEG_EXTRA_FLAGS}
--x86asmexe=${LIBDIR}/nasm/bin/nasm
)
)
endif()
ExternalProject_Add(external_ffmpeg
URL file://${PACKAGE_DIR}/${FFMPEG_FILE}
URL ${FFMPEG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${FFMPEG_HASH_TYPE}=${FFMPEG_HASH}
URL_HASH MD5=${FFMPEG_HASH}
# OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
# want for maximum runtime performance, but due to static nature of that library we
# need to force ffmpeg to link against pthread, otherwise test program used by autoconf
@@ -101,6 +94,8 @@ ExternalProject_Add(external_ffmpeg
--disable-version3
--disable-debug
--enable-optimizations
--disable-sse
--disable-ssse3
--enable-ffplay
--disable-openssl
--disable-securetransport
@@ -132,6 +127,7 @@ endif()
add_dependencies(
external_ffmpeg
external_zlib
external_faad
external_openjpeg
external_xvidcore
external_x264
@@ -148,12 +144,6 @@ if(WIN32)
external_zlib_mingw
)
endif()
if(UNIX)
add_dependencies(
external_ffmpeg
external_nasm
)
endif()
if(BUILD_MODE STREQUAL Release AND WIN32)
ExternalProject_Add_Step(external_ffmpeg after_install

View File

@@ -19,23 +19,19 @@
set(FFTW_EXTRA_ARGS)
if(WIN32)
set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
set(FFTW_EXTRA_ARGS --disable-static --enable-shared)
set(FFTW_INSTALL install-strip)
else()
set(FFTW_EXTRA_ARGS --enable-static)
set(FFTW_INSTALL install)
endif()
ExternalProject_Add(external_fftw3
URL file://${PACKAGE_DIR}/${FFTW_FILE}
URL ${FFTW_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${FFTW_HASH_TYPE}=${FFTW_HASH}
URL_HASH MD5=${FFTW_HASH}
PREFIX ${BUILD_DIR}/fftw3
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} ${FFTW_EXTRA_ARGS} --prefix=${mingw_LIBDIR}/fftw3
CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make ${FFTW_INSTALL}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
INSTALL_DIR ${LIBDIR}/fftw3
)
@@ -43,8 +39,7 @@ if(MSVC)
set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_fftw3 after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.dll.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/bin/libfftw3-3.dll ${HARVEST_TARGET}/fftw3/lib/libfftw3-3.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
DEPENDEES install
)

View File

@@ -17,9 +17,9 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_flac
URL file://${PACKAGE_DIR}/${FLAC_FILE}
URL ${FLAC_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${FLAC_HASH_TYPE}=${FLAC_HASH}
URL_HASH SHA256=${FLAC_HASH}
PREFIX ${BUILD_DIR}/flac
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}

View File

@@ -1,28 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_flex
URL file://${PACKAGE_DIR}/${FLEX_FILE}
URL_HASH ${FLEX_HASH_TYPE}=${FLEX_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/flex
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flex
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make install
INSTALL_DIR ${LIBDIR}/flex
)

View File

@@ -19,9 +19,9 @@
set(FLEXBISON_EXTRA_ARGS)
ExternalProject_Add(external_flexbison
URL file://${PACKAGE_DIR}/${FLEXBISON_FILE}
URL ${FLEXBISON_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${FLEXBISON_HASH_TYPE}=${FLEXBISON_HASH}
URL_HASH MD5=${FLEXBISON_HASH}
PREFIX ${BUILD_DIR}/flexbison
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
CONFIGURE_COMMAND echo .

View File

@@ -24,9 +24,9 @@ if(WIN32)
)
ExternalProject_Add(external_freeglut
URL file://${PACKAGE_DIR}/${FREEGLUT_FILE}
URL ${FREEGLUT_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${FREEGLUT_HASH_TYPE}=${FREEGLUT_HASH}
URL_HASH MD5=${FREEGLUT_HASH}
PREFIX ${BUILD_DIR}/freeglut
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freeglut ${DEFAULT_C_FLAGS} ${DEFAULT_CXX_FLAGS} ${FREEGLUT_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/freeglut

View File

@@ -24,13 +24,12 @@ set(FREETYPE_EXTRA_ARGS
-DFT_WITH_HARFBUZZ=OFF
-DFT_WITH_BZIP2=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE)
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE)
ExternalProject_Add(external_freetype
URL file://${PACKAGE_DIR}/${FREETYPE_FILE}
URL ${FREETYPE_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${FREETYPE_HASH_TYPE}=${FREETYPE_HASH}
URL_HASH MD5=${FREETYPE_HASH}
PREFIX ${BUILD_DIR}/freetype
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/freetype

View File

@@ -22,9 +22,9 @@ set(GLEW_EXTRA_ARGS
)
ExternalProject_Add(external_glew
URL file://${PACKAGE_DIR}/${GLEW_FILE}
URL ${GLEW_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${GLEW_HASH_TYPE}=${GLEW_HASH}
URL_HASH MD5=${GLEW_HASH}
PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt ${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
PREFIX ${BUILD_DIR}/glew
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}

View File

@@ -19,9 +19,9 @@
set(GLFW_EXTRA_ARGS)
ExternalProject_Add(external_glfw
URL file://${PACKAGE_DIR}/${GLFW_FILE}
URL ${GLFW_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${GLFW_HASH_TYPE}=${GLFW_HASH}
URL_HASH MD5=${GLFW_HASH}
PREFIX ${BUILD_DIR}/glfw
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/glfw

View File

@@ -1,108 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(GMP_EXTRA_ARGS -enable-cxx)
if(WIN32)
# Shared for windows because static libs will drag in a libgcc dependency.
set(GMP_OPTIONS --disable-static --enable-shared --enable-fat --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32)
else()
set(GMP_OPTIONS --enable-static --disable-shared )
endif()
if(APPLE AND NOT BLENDER_PLATFORM_ARM)
set(GMP_OPTIONS
${GMP_OPTIONS}
--with-pic
)
elseif(UNIX AND NOT APPLE)
set(GMP_OPTIONS
${GMP_OPTIONS}
--with-pic
--enable-fat
)
endif()
if(BLENDER_PLATFORM_ARM)
set(GMP_OPTIONS
${GMP_OPTIONS}
--disable-assembly
)
endif()
ExternalProject_Add(external_gmp
URL file://${PACKAGE_DIR}/${GMP_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
PREFIX ${BUILD_DIR}/gmp
CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/gmp ${GMP_OPTIONS} ${GMP_EXTRA_ARGS}
BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && make install
INSTALL_DIR ${LIBDIR}/gmp
)
if(MSVC)
set_target_properties(external_gmp PROPERTIES FOLDER Mingw)
endif()
if(BUILD_MODE STREQUAL Release AND WIN32)
ExternalProject_Add_Step(external_gmp after_install
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/libgmp-10.dll ${HARVEST_TARGET}/gmp/lib/libgmp-10.dll
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib ${HARVEST_TARGET}/gmp/lib/libgmp-10.lib
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmp/include ${HARVEST_TARGET}/gmp/include
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug AND WIN32)
ExternalProject_Add_Step(external_gmp after_install
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-3.dll.def ${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def
COMMAND lib /def:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.def /machine:x64 /out:${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib
DEPENDEES install
)
endif()
if(WIN32)
# gmpxx is somewhat special, it builds on top of the C style gmp library but exposes C++ bindings
# given the C++ ABI between MSVC and mingw is not compatible, we need to build the bindings
# with MSVC, while GMP can only be build with mingw.
ExternalProject_Add(external_gmpxx
URL file://${PACKAGE_DIR}/${GMP_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
PREFIX ${BUILD_DIR}/gmpxx
PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_gmpxx.txt ${BUILD_DIR}/gmpxx/src/external_gmpxx/CMakeLists.txt &&
${CMAKE_COMMAND} -E copy ${PATCH_DIR}/config_gmpxx.h ${BUILD_DIR}/gmpxx/src/external_gmpxx/config.h
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmpxx ${DEFAULT_CMAKE_FLAGS} -DGMP_LIBRARY=${BUILD_DIR}/gmp/src/external_gmp/.libs/libgmp-10.lib -DGMP_INCLUDE_DIR=${BUILD_DIR}/gmp/src/external_gmp -DCMAKE_DEBUG_POSTFIX=_d
INSTALL_DIR ${LIBDIR}/gmpxx
)
set_target_properties(external_gmpxx PROPERTIES FOLDER Mingw)
add_dependencies(
external_gmpxx
external_gmp
)
ExternalProject_Add_Step(external_gmpxx after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmpxx/ ${HARVEST_TARGET}/gmp
DEPENDEES install
)
endif()

View File

@@ -1,46 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(HARU_EXTRA_ARGS
-DLIBHPDF_SHARED=OFF
-DLIBHPDF_STATIC=ON
-DLIBHPDF_EXAMPLES=OFF
-DLIBHPDF_ENABLE_EXCEPTIONS=ON
)
ExternalProject_Add(external_haru
URL file://${PACKAGE_DIR}/${HARU_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${HARU_HASH_TYPE}=${HARU_HASH}
PREFIX ${BUILD_DIR}/haru
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/haru/src/external_haru < ${PATCH_DIR}/haru.diff
CMAKE_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/haru
${DEFAULT_CMAKE_FLAGS} ${HARU_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/haru
)
if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_haru after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/haru/include ${HARVEST_TARGET}/haru/include
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/haru/lib/libhpdfs.lib ${HARVEST_TARGET}/haru/lib/libhpdfs.lib
DEPENDEES install
)
endif()
endif()

View File

@@ -26,12 +26,15 @@ endif()
message("HARVEST_TARGET = ${HARVEST_TARGET}")
if(WIN32)
if(BUILD_MODE STREQUAL Release)
add_custom_target(Harvest_Release_Results
COMMAND # jpeg rename libfile + copy include
${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
# OpenImageIO
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
# png
${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
@@ -41,13 +44,30 @@ if(BUILD_MODE STREQUAL Release)
# glew-> opengl
${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
# sndfile
${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
# tiff
${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
# hidapi
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/
DEPENDS
)
endif()
if(BUILD_MODE STREQUAL Debug)
add_custom_target(Harvest_Debug_Results
# OpenImageIO
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
# hdf5
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
DEPENDS Package_Python
)
endif()
else(WIN32)
function(harvest from to)
@@ -90,30 +110,20 @@ harvest(freetype/include freetype/include "*.h")
harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
harvest(glew/include glew/include "*.h")
harvest(glew/lib glew/lib "*.a")
harvest(gmp/include gmp/include "*.h")
harvest(gmp/lib gmp/lib "*.a")
harvest(jemalloc/include jemalloc/include "*.h")
harvest(jemalloc/lib jemalloc/lib "*.a")
harvest(jpg/include jpeg/include "*.h")
harvest(jpg/lib jpeg/lib "libjpeg.a")
harvest(lame/lib ffmpeg/lib "*.a")
harvest(llvm/bin llvm/bin "clang-format")
if(BUILD_CLANG_TOOLS)
harvest(llvm/bin llvm/bin "clang-tidy")
harvest(llvm/share/clang llvm/share "run-clang-tidy.py")
endif()
harvest(clang/bin llvm/bin "clang-format")
harvest(clang/include llvm/include "*")
harvest(llvm/include llvm/include "*")
harvest(llvm/bin llvm/bin "llvm-config")
harvest(llvm/lib llvm/lib "libLLVM*.a")
harvest(llvm/lib llvm/lib "libclang*.a")
harvest(llvm/lib/clang llvm/lib/clang "*.h")
if(APPLE)
harvest(openmp/lib openmp/lib "*")
harvest(openmp/include openmp/include "*.h")
endif()
if(BLENDER_PLATFORM_ARM)
harvest(sse2neon sse2neon "*.h")
endif()
harvest(ogg/lib ffmpeg/lib "*.a")
harvest(openal/include openal/include "*.h")
if(UNIX AND NOT APPLE)
@@ -127,8 +137,6 @@ if(UNIX AND NOT APPLE)
harvest(xml2/include xml2/include "*.h")
harvest(xml2/lib xml2/lib "*.a")
harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
else()
harvest(blosc/lib openvdb/lib "*.a")
harvest(xml2/lib opencollada/lib "*.a")
@@ -147,26 +155,21 @@ harvest(openimageio/include openimageio/include "*")
harvest(openimageio/lib openimageio/lib "*.a")
harvest(openimagedenoise/include openimagedenoise/include "*")
harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
harvest(embree/include embree/include "*.h")
harvest(embree/lib embree/lib "*.a")
harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
harvest(openjpeg/lib openjpeg/lib "*.a")
harvest(opensubdiv/include opensubdiv/include "*.h")
harvest(opensubdiv/lib opensubdiv/lib "*.a")
harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
harvest(openvdb/lib openvdb/lib "*.a")
harvest(nanovdb/nanovdb nanovdb/include/nanovdb "*.h")
harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
harvest(xr_openxr_sdk/lib xr_openxr_sdk/src/loader "*.a")
harvest(osl/bin osl/bin "oslc")
harvest(osl/include osl/include "*.h")
harvest(osl/lib osl/lib "*.a")
harvest(osl/share/OSL/shaders osl/share/OSL/shaders "*.h")
harvest(osl/shaders osl/shaders "*.h")
harvest(png/include png/include "*.h")
harvest(png/lib png/lib "*.a")
harvest(pugixml/include pugixml/include "*.hpp")
harvest(pugixml/lib pugixml/lib "*.a")
harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}")
harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
harvest(python/include python/include "*h")
harvest(python/lib python/lib "*")
harvest(sdl/include/SDL2 sdl/include "*.h")
@@ -186,19 +189,15 @@ harvest(vpx/lib ffmpeg/lib "*.a")
harvest(webp/lib ffmpeg/lib "*.a")
harvest(x264/lib ffmpeg/lib "*.a")
harvest(xvidcore/lib ffmpeg/lib "*.a")
harvest(embree/include embree/include "*.h")
harvest(embree/lib embree/lib "*.a")
harvest(usd/include usd/include "*.h")
harvest(usd/lib/usd usd/lib/usd "*")
harvest(usd/plugin usd/plugin "*")
harvest(potrace/include potrace/include "*.h")
harvest(potrace/lib potrace/lib "*.a")
harvest(haru/include haru/include "*.h")
harvest(haru/lib haru/lib "*.a")
harvest(zstd/include zstd/include "*.h")
harvest(zstd/lib zstd/lib "*.a")
if(UNIX AND NOT APPLE)
harvest(libglu/lib mesa/lib "*.so*")
harvest(mesa/lib64 mesa/lib "*.so*")
harvest(mesa/lib mesa/lib "*.so*")
endif()
endif()

View File

@@ -0,0 +1,42 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(HDF5_EXTRA_ARGS
-DHDF5_ENABLE_THREADSAFE=Off
-DHDF5_BUILD_CPP_LIB=Off
-DBUILD_TESTING=Off
-DHDF5_BUILD_TOOLS=Off
-DHDF5_BUILD_EXAMPLES=Off
-DHDF5_BUILD_HL_LIB=On
-DBUILD_STATIC_CRT_LIBS=On
-DBUILD_SHARED_LIBS=On
)
if(WIN32)
set(HDF5_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/hdf5/src/external_hdf5 < ${PATCH_DIR}/hdf5.diff)
endif()
ExternalProject_Add(external_hdf5
URL ${HDF5_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${HDF5_HASH}
PREFIX ${BUILD_DIR}/hdf5
PATCH_COMMAND ${HDF5_PATCH}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/hdf5
)

View File

@@ -0,0 +1,29 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(HIDAPI_EXTRA_ARGS)
ExternalProject_Add(external_hidapi
URL ${HIDAPI_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${HIDAPI_HASH}
PREFIX ${BUILD_DIR}/hidapi
PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_hidapi.txt ${BUILD_DIR}/hidapi/src/external_hidapi/cmakelists.txt && ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/hidapi/src/external_hidapi < ${PATCH_DIR}/hidapi.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hidapi -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${HIDAPI_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/hidapi
)

View File

@@ -19,9 +19,9 @@
set(ICONV_EXTRA_ARGS)
ExternalProject_Add(external_iconv
URL file://${PACKAGE_DIR}/${ICONV_FILE}
URL ${ICONV_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${ICONV_HASH_TYPE}=${ICONV_HASH}
URL_HASH MD5=${ICONV_HASH}
PREFIX ${BUILD_DIR}/iconv
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}

View File

@@ -1,92 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
if(WIN32)
set(ISPC_EXTRA_ARGS_WIN
-DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe
-DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe
-DM4_EXECUTABLE=${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/m4.exe
-DARM_ENABLED=Off
)
elseif(APPLE)
# Use bison and flex installed via Homebrew.
# The ones that come with Xcode toolset are too old.
if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
set(ISPC_EXTRA_ARGS_APPLE
-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison
-DFLEX_EXECUTABLE=/opt/homebrew/opt/flex/bin/flex
-DARM_ENABLED=On
)
else()
set(ISPC_EXTRA_ARGS_APPLE
-DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
-DFLEX_EXECUTABLE=/usr/local/opt/flex/bin/flex
-DARM_ENABLED=Off
)
endif()
elseif(UNIX)
set(ISPC_EXTRA_ARGS_UNIX
-DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
-DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
-DARM_ENABLED=Off
-DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
)
endif()
set(ISPC_EXTRA_ARGS
-DISPC_NO_DUMPS=On
-DISPC_INCLUDE_EXAMPLES=Off
-DISPC_INCLUDE_TESTS=Off
-DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
-DLLVM_LIBRARY_DIR=${LIBDIR}/llvm/lib
-DCLANG_EXECUTABLE=${LIBDIR}/llvm/bin/clang
-DCLANGPP_EXECUTABLE=${LIBDIR}/llvm/bin/clang++
-DISPC_INCLUDE_TESTS=Off
-DCLANG_LIBRARY_DIR=${LIBDIR}/llvm/lib
-DCLANG_INCLUDE_DIRS=${LIBDIR}/llvm/include
${ISPC_EXTRA_ARGS_WIN}
${ISPC_EXTRA_ARGS_APPLE}
${ISPC_EXTRA_ARGS_UNIX}
)
ExternalProject_Add(external_ispc
URL file://${PACKAGE_DIR}/${ISPC_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${ISPC_HASH_TYPE}=${ISPC_HASH}
PREFIX ${BUILD_DIR}/ispc
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ispc/src/external_ispc < ${PATCH_DIR}/ispc.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ISPC_EXTRA_ARGS} ${BUILD_DIR}/ispc/src/external_ispc
INSTALL_DIR ${LIBDIR}/ispc
)
add_dependencies(
external_ispc
ll
)
if(WIN32)
add_dependencies(
external_ispc
external_flexbison
)
elseif(UNIX AND NOT APPLE)
add_dependencies(
external_ispc
external_flex
)
endif()

View File

@@ -17,9 +17,9 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_jemalloc
URL file://${PACKAGE_DIR}/${JEMALLOC_FILE}
URL ${JEMALLOC_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${JEMALLOC_HASH_TYPE}=${JEMALLOC_HASH}
URL_HASH MD5=${JEMALLOC_HASH}
PREFIX ${BUILD_DIR}/jemalloc
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}

View File

@@ -18,12 +18,12 @@
if(WIN32)
# cmake for windows
set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON -DCMAKE_DEBUG_POSTFIX=d -DWITH_CRT_DLL=On)
set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON -DCMAKE_DEBUG_POSTFIX=d)
ExternalProject_Add(external_jpeg
URL file://${PACKAGE_DIR}/${JPEG_FILE}
URL ${JPEG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
URL_HASH MD5=${JPEG_HASH}
PREFIX ${BUILD_DIR}/jpg
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/jpg
@@ -42,21 +42,24 @@ if(WIN32)
set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
endif()
else(WIN32)
# cmake for unix
set(JPEG_EXTRA_ARGS
-DWITH_JPEG8=ON
-DENABLE_STATIC=ON
-DENABLE_SHARED=OFF
-DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib)
# autoconf for unix
if(APPLE)
set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
else()
set(JPEG_EXTRA_ARGS --with-jpeg8)
endif()
ExternalProject_Add(external_jpeg
URL file://${PACKAGE_DIR}/${JPEG_FILE}
URL ${JPEG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
URL_HASH MD5=${JPEG_HASH}
CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
BUILD_IN_SOURCE 1
BUILD_COMMAND ${CONFIGURE_ENV} && make install
PREFIX ${BUILD_DIR}/jpg
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/jpg
)
set(JPEG_LIBRARY libjpeg${LIBEXT})
endif()
endif(WIN32)

View File

@@ -24,9 +24,9 @@ if(MSVC)
endif()
ExternalProject_Add(external_lame
URL file://${PACKAGE_DIR}/${LAME_FILE}
URL ${LAME_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${LAME_HASH_TYPE}=${LAME_HASH}
URL_HASH MD5=${LAME_HASH}
PREFIX ${BUILD_DIR}/lame
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
--enable-export=full

View File

@@ -0,0 +1,31 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(LCMS_EXTRA_ARGS
)
ExternalProject_Add(external_lcms
URL ${LCMS_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${LCMS_HASH}
PREFIX ${BUILD_DIR}/lcms
# Patch taken from ocio.
PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/lcms
)

View File

@@ -27,9 +27,9 @@ set(LIBGLU_EXTRA_FLAGS
)
ExternalProject_Add(external_libglu
URL file://${PACKAGE_DIR}/${LIBGLU_FILE}
URL ${LIBGLU_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${LIBGLU_HASH_TYPE}=${LIBGLU_HASH}
URL_HASH MD5=${LIBGLU_HASH}
PREFIX ${BUILD_DIR}/libglu
CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
cd ${BUILD_DIR}/libglu/src/external_libglu/ &&

View File

@@ -16,32 +16,15 @@
#
# ***** END GPL LICENSE BLOCK *****
if(BLENDER_PLATFORM_ARM)
set(LLVM_TARGETS AArch64$<SEMICOLON>ARM)
else()
set(LLVM_TARGETS X86)
endif()
if(APPLE)
set(LLVM_XML2_ARGS
-DLIBXML2_LIBRARY=${LIBDIR}/xml2/lib/libxml2.a
)
set(LLVM_BUILD_CLANG_TOOLS_EXTRA ^^clang-tools-extra)
set(BUILD_CLANG_TOOLS ON)
endif()
set(LLVM_EXTRA_ARGS
-DLLVM_USE_CRT_RELEASE=MD
-DLLVM_USE_CRT_DEBUG=MDd
-DLLVM_INCLUDE_TESTS=OFF
-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS}
-DLLVM_TARGETS_TO_BUILD=X86
-DLLVM_INCLUDE_EXAMPLES=OFF
-DLLVM_ENABLE_TERMINFO=OFF
-DLLVM_BUILD_LLVM_C_DYLIB=OFF
-DLLVM_ENABLE_UNWIND_TABLES=OFF
-DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}
${LLVM_XML2_ARGS}
)
if(WIN32)
@@ -52,13 +35,11 @@ endif()
# short project name due to long filename issues on windows
ExternalProject_Add(ll
URL file://${PACKAGE_DIR}/${LLVM_FILE}
URL ${LLVM_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${LLVM_HASH_TYPE}=${LLVM_HASH}
URL_HASH MD5=${LLVM_HASH}
CMAKE_GENERATOR ${LLVM_GENERATOR}
LIST_SEPARATOR ^^
PREFIX ${BUILD_DIR}/ll
SOURCE_SUBDIR llvm
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/llvm
@@ -66,11 +47,7 @@ ExternalProject_Add(ll
if(MSVC)
if(BUILD_MODE STREQUAL Release)
set(LLVM_HARVEST_COMMAND
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib ${HARVEST_TARGET}/llvm/lib &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include ${HARVEST_TARGET}/llvm/include &&
${CMAKE_COMMAND} -E copy ${LIBDIR}/llvm/bin/clang-format.exe ${HARVEST_TARGET}/llvm/bin/clang-format.exe
)
set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
else()
set(LLVM_HARVEST_COMMAND
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
@@ -82,11 +59,3 @@ if(MSVC)
DEPENDEES mkdir update patch download configure build install
)
endif()
# We currently do not build libxml2 on Windows.
if(APPLE)
add_dependencies(
ll
external_xml2
)
endif()

View File

@@ -19,9 +19,9 @@
set(LZMA_PATCH_CMD echo .)
ExternalProject_Add(external_lzma
URL file://${PACKAGE_DIR}/${LZMA_FILE}
URL ${LZMA_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${LZMA_HASH_TYPE}=${LZMA_HASH}
URL_HASH SHA256=${LZMA_HASH}
PREFIX ${BUILD_DIR}/lzma
PATCH_COMMAND ${LZMA_PATCH_CMD}
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma

View File

@@ -20,48 +20,31 @@ set(MESA_CFLAGS "-static-libgcc")
set(MESA_CXXFLAGS "-static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a")
set(MESA_LDFLAGS "-L${LIBDIR}/zlib/lib -pthread -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a -l:libz_pic.a")
# The 'native-file', used for overrides with the meson build system.
# meson does not provide a way to do this using command line arguments.
#
# Note that we can't output to "${BUILD_DIR}/mesa/src/external_mesa" as
# it doesn't exist when CMake first executes.
file(WRITE ${BUILD_DIR}/mesa/tmp/native-file.ini "\
[binaries]
llvm-config = '${LIBDIR}/llvm/bin/llvm-config'"
)
set(MESA_EXTRA_FLAGS
-Dbuildtype=release
-Dc_args=${MESA_CFLAGS}
-Dcpp_args=${MESA_CXXFLAGS}
-Dc_link_args=${MESA_LDFLAGS}
-Dcpp_link_args=${MESA_LDFLAGS}
-Dglx=gallium-xlib
-Dgallium-drivers=swrast
-Ddri-drivers=
-Dvulkan-drivers=
-Dgbm=disabled
-Degl=disabled
-Dgles1=disabled
-Dgles2=disabled
-Dshared-llvm=disabled
# Without this, the build fails when: `wayland-scanner` is not found.
# At some point we will likely want to support Wayland.
# Disable for now since it's not officially supported.
-Dplatforms=x11
--native-file ${BUILD_DIR}/mesa/tmp/native-file.ini
CFLAGS=${MESA_CFLAGS}
CXXFLAGS=${MESA_CXXFLAGS}
LDFLAGS=${MESA_LDFLAGS}
--enable-glx=gallium-xlib
--with-gallium-drivers=swrast
--disable-dri
--disable-gbm
--disable-egl
--disable-gles1
--disable-gles2
--disable-llvm-shared-libs
--with-llvm-prefix=${LIBDIR}/llvm
)
ExternalProject_Add(external_mesa
URL file://${PACKAGE_DIR}/${MESA_FILE}
URL ${MESA_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${MESA_HASH_TYPE}=${MESA_HASH}
URL_HASH MD5=${MESA_HASH}
PREFIX ${BUILD_DIR}/mesa
CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
cd ${BUILD_DIR}/mesa/src/external_mesa/ &&
meson ${BUILD_DIR}/mesa/src/external_mesa-build --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja install
${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa/ && make install
INSTALL_DIR ${LIBDIR}/mesa
)

View File

@@ -1,54 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(NANOVDB_EXTRA_ARGS
# NanoVDB is header-only, so only need the install target
-DNANOVDB_BUILD_UNITTESTS=OFF
-DNANOVDB_BUILD_EXAMPLES=OFF
-DNANOVDB_BUILD_BENCHMARK=OFF
-DNANOVDB_BUILD_DOCS=OFF
-DNANOVDB_BUILD_TOOLS=OFF
-DNANOVDB_CUDA_KEEP_PTX=OFF
# Do not need to include any of the dependencies because of this
-DNANOVDB_USE_OPENVDB=OFF
-DNANOVDB_USE_OPENGL=OFF
-DNANOVDB_USE_OPENCL=OFF
-DNANOVDB_USE_CUDA=OFF
-DNANOVDB_USE_TBB=OFF
-DNANOVDB_USE_BLOSC=OFF
-DNANOVDB_USE_ZLIB=OFF
-DNANOVDB_USE_OPTIX=OFF
-DNANOVDB_ALLOW_FETCHCONTENT=OFF
)
ExternalProject_Add(nanovdb
URL file://${PACKAGE_DIR}/${NANOVDB_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${NANOVDB_HASH_TYPE}=${NANOVDB_HASH}
PREFIX ${BUILD_DIR}/nanovdb
SOURCE_SUBDIR nanovdb
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanovdb ${DEFAULT_CMAKE_FLAGS} ${NANOVDB_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/nanovdb
)
if(WIN32)
ExternalProject_Add_Step(nanovdb after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/nanovdb/nanovdb ${HARVEST_TARGET}/nanovdb/include/nanovdb
DEPENDEES install
)
endif()

View File

@@ -1,38 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_nasm
URL file://${PACKAGE_DIR}/${NASM_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${NASM_HASH_TYPE}=${NASM_HASH}
PREFIX ${BUILD_DIR}/nasm
PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/nasm/src/external_nasm < ${PATCH_DIR}/nasm.diff
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && ./autogen.sh && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/nasm
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make -j${MAKE_THREADS} && make manpages
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make install
INSTALL_DIR ${LIBDIR}/nasm
)
if(UNIX)
# `touch nasm.1 ndisasm.1` helps to create the manual pages files, even when
# local `asciidoc` and `xmlto` packages are not installed.
ExternalProject_Add_Step(external_nasm after_configure
COMMAND ${CMAKE_COMMAND} -E touch ${BUILD_DIR}/nasm/src/external_nasm/nasm.1 ${BUILD_DIR}/nasm/src/external_nasm/ndisasm.1
DEPENDEES configure
)
endif()

View File

@@ -32,13 +32,12 @@ endif()
set(NUMPY_POSTFIX)
ExternalProject_Add(external_numpy
URL file://${PACKAGE_DIR}/${NUMPY_FILE}
URL ${NUMPY_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${NUMPY_HASH_TYPE}=${NUMPY_HASH}
URL_HASH MD5=${NUMPY_HASH}
PREFIX ${BUILD_DIR}/numpy
PATCH_COMMAND ${NUMPY_PATCH}
CONFIGURE_COMMAND ""
PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff
LOG_BUILD 1
BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
INSTALL_COMMAND ""
@@ -47,5 +46,4 @@ ExternalProject_Add(external_numpy
add_dependencies(
external_numpy
external_python
external_python_site_packages
)

View File

@@ -17,11 +17,10 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_ogg
URL file://${PACKAGE_DIR}/${OGG_FILE}
URL ${OGG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OGG_HASH_TYPE}=${OGG_HASH}
URL_HASH SHA256=${OGG_HASH}
PREFIX ${BUILD_DIR}/ogg
PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ogg/src/external_ogg < ${PATCH_DIR}/ogg.diff
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make install

View File

@@ -46,12 +46,13 @@ if(BUILD_MODE STREQUAL Release)
endif()
ExternalProject_Add(external_openal
URL file://${PACKAGE_DIR}/${OPENAL_FILE}
URL ${OPENAL_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENAL_HASH_TYPE}=${OPENAL_HASH}
URL_HASH MD5=${OPENAL_HASH}
PREFIX ${BUILD_DIR}/openal
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/openal
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
)
if(WIN32)

View File

@@ -23,9 +23,9 @@ if(UNIX)
endif()
ExternalProject_Add(external_opencollada
URL file://${PACKAGE_DIR}/${OPENCOLLADA_FILE}
URL ${OPENCOLLADA_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENCOLLADA_HASH_TYPE}=${OPENCOLLADA_HASH}
URL_HASH MD5=${OPENCOLLADA_HASH}
PREFIX ${BUILD_DIR}/opencollada
PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}

View File

@@ -18,84 +18,95 @@
set(OPENCOLORIO_EXTRA_ARGS
-DOCIO_BUILD_APPS=OFF
-DOCIO_BUILD_PYTHON=OFF
-DOCIO_BUILD_PYGLUE=OFF
-DOCIO_BUILD_NUKE=OFF
-DOCIO_BUILD_JAVA=OFF
-DBUILD_SHARED_LIBS=OFF
-DOCIO_USE_BOOST_PTR=OFF
-DOCIO_BUILD_STATIC=ON
-DOCIO_BUILD_SHARED=OFF
-DOCIO_BUILD_TRUELIGHT=OFF
-DOCIO_BUILD_DOCS=OFF
-DOCIO_BUILD_TESTS=OFF
-DOCIO_BUILD_GPU_TESTS=OFF
-DOCIO_USE_SSE=ON
# Manually build ext packages except for pystring, which does not have
# a CMake or autotools build system that we can easily use.
-DOCIO_INSTALL_EXT_PACKAGES=MISSING
-DHalf_ROOT=${LIBDIR}/openexr
-DHalf_STATIC_LIBRARY=ON
-Dexpat_ROOT=${LIBDIR}/expat
-Dyaml-cpp_ROOT=${LIBDIR}/yamlcpp
-DOCIO_BUILD_PYGLUE=OFF
-DOCIO_BUILD_JNIGLUE=OFF
-DOCIO_STATIC_JNIGLUE=OFF
)
if(BLENDER_PLATFORM_ARM)
set(OPENCOLORIO_EXTRA_ARGS
${OPENCOLORIO_EXTRA_ARGS}
-DOCIO_USE_SSE=OFF
)
endif()
if(WIN32)
set(OCIO_PATCH opencolorio_win.diff)
set(OPENCOLORIO_EXTRA_ARGS
${OPENCOLORIO_EXTRA_ARGS}
-DOCIO_BUILD_TESTS=OFF
-DOCIO_USE_SSE=ON
-DOCIO_INLINES_HIDDEN=OFF
-DOCIO_PYGLUE_LINK=OFF
-DOCIO_PYGLUE_RESPECT_ABI=OFF
-DOCIO_PYGLUE_SONAME=OFF
-DOCIO_PYGLUE_LIB_PREFIX=OFF
-DUSE_EXTERNAL_TINYXML=ON
-DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
-DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
-DUSE_EXTERNAL_YAML=ON
-DYAML_CPP_FOUND=ON
-DYAML_CPP_VERSION=${YAMLCPP_VERSION}
-DUSE_EXTERNAL_LCMS=ON
-DINC_1=${LIBDIR}/tinyxml/include
-DINC_2=${LIBDIR}/yamlcpp/include
# Lie because ocio cmake is demanding boost even though it is not needed.
-DYAML_CPP_VERSION=0.5.0
)
else()
set(OCIO_PATCH opencolorio.diff)
set(OPENCOLORIO_EXTRA_ARGS
${OPENCOLORIO_EXTRA_ARGS}
)
endif()
ExternalProject_Add(external_opencolorio
URL file://${PACKAGE_DIR}/${OPENCOLORIO_FILE}
URL ${OPENCOLORIO_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENCOLORIO_HASH_TYPE}=${OPENCOLORIO_HASH}
URL_HASH MD5=${OPENCOLORIO_HASH}
PREFIX ${BUILD_DIR}/opencolorio
PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/${OCIO_PATCH}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/opencolorio
)
if(NOT WIN32)
add_custom_command(
OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
)
add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
endif()
add_dependencies(
external_opencolorio
external_yamlcpp
external_expat
external_openexr
external_boost
)
if(WIN32)
add_dependencies(
external_opencolorio
external_tinyxml
external_yamlcpp
)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_opencolorio after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib ${HARVEST_TARGET}/opencolorio/lib
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/static ${HARVEST_TARGET}/opencolorio/lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatMD.lib
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_opencolorio after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/static/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmdd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/expat/lib/libexpatdMD.lib ${HARVEST_TARGET}/opencolorio/lib/libexpatdMD.lib
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/pystring.lib ${HARVEST_TARGET}/opencolorio/lib/pystring_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml_d.lib
DEPENDEES install
)
endif()
else()
ExternalProject_Add_Step(external_opencolorio after_install
COMMAND cp ${LIBDIR}/yamlcpp/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/
COMMAND cp ${LIBDIR}/expat/lib/libexpat.a ${LIBDIR}/opencolorio/lib/
COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libpystring.a ${LIBDIR}/opencolorio/lib/
DEPENDEES install
)
endif()

View File

@@ -42,9 +42,9 @@ set(OPENEXR_EXTRA_ARGS
)
ExternalProject_Add(external_openexr
URL file://${PACKAGE_DIR}/${OPENEXR_FILE}
URL ${OPENEXR_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENEXR_HASH_TYPE}=${OPENEXR_HASH}
URL_HASH MD5=${OPENEXR_HASH}
PREFIX ${BUILD_DIR}/openexr
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/openexr

View File

@@ -18,41 +18,26 @@
set(OIDN_EXTRA_ARGS
-DOIDN_APPS=OFF
-DWITH_EXAMPLE=OFF
-DWITH_TEST=OFF
-DTBB_ROOT=${LIBDIR}/tbb
-DTBB_STATIC_LIB=${TBB_STATIC_LIBRARY}
-DTBB_STATIC_LIB=ON
-DOIDN_STATIC_LIB=ON
-DOIDN_STATIC_RUNTIME=OFF
-DISPC_EXECUTABLE=${LIBDIR}/ispc/bin/ispc
)
if(WIN32)
set(OIDN_EXTRA_ARGS
${OIDN_EXTRA_ARGS}
-DTBB_DEBUG_LIBRARY=${LIBDIR}/tbb/lib/tbb.lib
-DTBB_DEBUG_LIBRARY_MALLOC=${LIBDIR}/tbb/lib/tbbmalloc.lib
)
else()
set(OIDN_EXTRA_ARGS
${OIDN_EXTRA_ARGS}
-Dtbb_LIBRARY_RELEASE=${LIBDIR}/tbb/lib/tbb_static.a
-Dtbbmalloc_LIBRARY_RELEASE=${LIBDIR}/tbb/lib/tbbmalloc_static.a
)
endif()
ExternalProject_Add(external_openimagedenoise
URL file://${PACKAGE_DIR}/${OIDN_FILE}
URL ${OIDN_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
URL_HASH MD5=${OIDN_HASH}
PREFIX ${BUILD_DIR}/openimagedenoise
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/openimagedenoise.diff
INSTALL_DIR ${LIBDIR}/openimagedenoise
)
add_dependencies(
external_openimagedenoise
external_tbb
external_ispc
)
if(WIN32)
@@ -61,7 +46,7 @@ if(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openimagedenoise/include ${HARVEST_TARGET}/openimagedenoise/include
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/dnnl.lib ${HARVEST_TARGET}/openimagedenoise/lib/dnnl.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn.lib
DEPENDEES install
)
endif()
@@ -69,7 +54,7 @@ if(WIN32)
ExternalProject_Add_Step(external_openimagedenoise after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/dnnl.lib ${HARVEST_TARGET}/openimagedenoise/lib/dnnl_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn_d.lib
DEPENDEES install
)
endif()

View File

@@ -32,7 +32,7 @@ endif()
if(WIN32)
set(PNG_LIBNAME libpng16_static${LIBEXT})
set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2)
set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1)
set(OPENJPEG_POSTFIX _msvc)
else()
set(PNG_LIBNAME libpng${LIBEXT})
@@ -49,17 +49,23 @@ endif()
if(MSVC)
set(OPENJPEG_FLAGS
-DOpenJpeg_ROOT=${LIBDIR}/openjpeg_msvc
-DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
)
else()
set(OPENJPEG_FLAGS
-DOpenJpeg_ROOT=${LIBDIR}/openjpeg
-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
)
endif()
set(OPENIMAGEIO_EXTRA_ARGS
-DBUILD_SHARED_LIBS=OFF
-DBUILDSTATIC=ON
${OPENIMAGEIO_LINKSTATIC}
-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-DBoost_USE_MULTITHREADED=ON
-DBoost_USE_STATIC_LIBS=ON
@@ -67,15 +73,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
-DBOOST_ROOT=${LIBDIR}/boost
-DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-DBoost_NO_SYSTEM_PATHS=ON
-DBoost_NO_BOOST_CMAKE=ON
-DUSE_LIBSQUISH=OFF
-DUSE_QT5=OFF
-DUSE_NUKE=OFF
-DUSE_OPENVDB=OFF
-DUSE_BZIP2=OFF
-DUSE_FREETYPE=OFF
-DUSE_DCMTK=OFF
-DUSE_LIBHEIF=OFF
-OIIO_BUILD_CPP11=ON
-DUSE_OPENGL=OFF
-DUSE_TBB=OFF
-DUSE_FIELD3D=OFF
@@ -83,12 +81,15 @@ set(OPENIMAGEIO_EXTRA_ARGS
-DUSE_PYTHON=OFF
-DUSE_GIF=OFF
-DUSE_OPENCV=OFF
-DUSE_OPENSSL=OFF
-DUSE_OPENJPEG=ON
-DUSE_FFMPEG=OFF
-DUSE_PTEX=OFF
-DUSE_FREETYPE=OFF
-DUSE_LIBRAW=OFF
-DUSE_OPENCOLORIO=OFF
-DUSE_PYTHON=OFF
-DUSE_PYTHON3=OFF
-DUSE_OCIO=OFF
-DUSE_WEBP=${WITH_WEBP}
-DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
-DOIIO_BUILD_TESTS=OFF
@@ -102,60 +103,49 @@ set(OPENIMAGEIO_EXTRA_ARGS
-DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
-DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
${OPENJPEG_FLAGS}
-DOCIO_PATH=${LIBDIR}/opencolorio/
-DOpenEXR_USE_STATIC_LIBS=On
-DOPENEXR_HOME=${LIBDIR}/openexr/
-DILMBASE_INCLUDE_PATH=${LIBDIR}/openexr/
-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/openexr/
-DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DSTOP_ON_WARNING=OFF
-DUSE_EXTERNAL_PUGIXML=ON
-DPUGIXML_LIBRARY=${LIBDIR}/pugixml/lib/${LIBPREFIX}pugixml${LIBEXT}
-DPUGIXML_INCLUDE_DIR=${LIBDIR}/pugixml/include/
${WEBP_FLAGS}
${OIIO_SIMD_FLAGS}
)
ExternalProject_Add(external_openimageio
URL file://${PACKAGE_DIR}/${OPENIMAGEIO_FILE}
URL ${OPENIMAGEIO_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENIMAGEIO_HASH_TYPE}=${OPENIMAGEIO_HASH}
URL_HASH MD5=${OPENIMAGEIO_HASH}
PREFIX ${BUILD_DIR}/openimageio
PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff
PATCH_COMMAND
${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/openimageio
)
add_dependencies(
external_openimageio
external_png
external_zlib
external_png external_zlib
external_openexr
external_jpeg
external_boost
external_tiff
external_pugixml
external_opencolorio
external_openjpeg${OPENJPEG_POSTFIX}
${WEBP_DEP}
)
if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_openimageio after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_openimageio after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
DEPENDEES install
)
endif()
if(NOT WIN32)
add_dependencies(
external_openimageio
external_opencolorio_extra
)
endif()

View File

@@ -28,9 +28,9 @@ else()
endif()
ExternalProject_Add(external_openjpeg
URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
URL ${OPENJPEG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
URL_HASH SHA256=${OPENJPEG_HASH}
PREFIX ${BUILD_DIR}/openjpeg
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
@@ -42,9 +42,9 @@ ExternalProject_Add(external_openjpeg
if(MSVC)
set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
ExternalProject_Add(external_openjpeg_msvc
URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
URL ${OPENJPEG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
URL_HASH SHA256=${OPENJPEG_HASH}
PREFIX ${BUILD_DIR}/openjpeg_msvc
CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
INSTALL_DIR ${LIBDIR}/openjpeg_msvc

View File

@@ -16,24 +16,18 @@
#
# ***** END GPL LICENSE BLOCK *****
if(APPLE)
set(OPENMP_PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff)
else()
set(OPENMP_PATCH_COMMAND)
endif()
ExternalProject_Add(external_openmp
URL file://${PACKAGE_DIR}/${OPENMP_FILE}
URL ${OPENMP_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
URL_HASH MD5=${OPENMP_HASH}
PREFIX ${BUILD_DIR}/openmp
PATCH_COMMAND ${OPENMP_PATCH_COMMAND}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @rpath/libomp.dylib runtime/src/libomp.dylib && make install
INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
INSTALL_DIR ${LIBDIR}/openmp
)
add_dependencies(
external_openmp
ll
external_clang
)

View File

@@ -36,7 +36,7 @@ if(WIN32)
set(OPENSUBDIV_EXTRA_ARGS
${OPENSUBDIV_EXTRA_ARGS}
-DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb.lib
-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
-DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
@@ -65,9 +65,9 @@ else()
endif()
ExternalProject_Add(external_opensubdiv
URL file://${PACKAGE_DIR}/${OPENSUBDIV_FILE}
URL ${OPENSUBDIV_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENSUBDIV_HASH_TYPE}=${OPENSUBDIV_HASH}
URL_HASH MD5=${OPENSUBDIV_Hash}
PREFIX ${BUILD_DIR}/opensubdiv
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/opensubdiv

View File

@@ -20,14 +20,6 @@ if(BUILD_MODE STREQUAL Debug)
set(BLOSC_POST _d)
endif()
if(WIN32)
set(OPENVDB_SHARED ON)
set(OPENVDB_STATIC OFF)
else()
set(OPENVDB_SHARED OFF)
set(OPENVDB_STATIC ON)
endif()
set(OPENVDB_EXTRA_ARGS
-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-DBoost_USE_MULTITHREADED=ON
@@ -35,7 +27,6 @@ set(OPENVDB_EXTRA_ARGS
-DBoost_USE_STATIC_RUNTIME=OFF
-DBOOST_ROOT=${LIBDIR}/boost
-DBoost_NO_SYSTEM_PATHS=ON
-DBoost_NO_BOOST_CMAKE=ON
-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
@@ -50,12 +41,8 @@ set(OPENVDB_EXTRA_ARGS
-DOPENEXR_LIBRARYDIR=${LIBDIR}/openexr/lib
# All libs live in openexr, even the ilmbase ones
-DILMBASE_LIBRARYDIR=${LIBDIR}/openexr/lib
-DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
-DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
-DOPENVDB_CORE_SHARED=Off
-DOPENVDB_BUILD_BINARIES=Off
-DCMAKE_DEBUG_POSTFIX=_d
-DILMBASE_USE_STATIC_LIBS=On
-DOPENEXR_USE_STATIC_LIBS=On
)
if(WIN32)
@@ -77,9 +64,9 @@ else()
endif()
ExternalProject_Add(openvdb
URL file://${PACKAGE_DIR}/${OPENVDB_FILE}
URL ${OPENVDB_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPENVDB_HASH_TYPE}=${OPENVDB_HASH}
URL_HASH MD5=${OPENVDB_HASH}
PREFIX ${BUILD_DIR}/openvdb
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
@@ -98,16 +85,14 @@ add_dependencies(
if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(openvdb after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include/openvdb ${HARVEST_TARGET}/openvdb/include/openvdb
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(openvdb after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb_d.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb_d.dll ${HARVEST_TARGET}/openvdb/bin/openvdb_d.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
DEPENDEES install
)
endif()

View File

@@ -17,12 +17,10 @@
# ***** END GPL LICENSE BLOCK *****
if(WIN32)
option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
endif()
option(WITH_WEBP "Enable building of oiio with webp support" OFF)
option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with")
set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
if(NOT BUILD_MODE)
set(BUILD_MODE "Release")
@@ -36,24 +34,22 @@ else(BUILD_MODE STREQUAL "Debug")
set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
endif()
set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files")
# This path must be hard-coded like this, so that the GNUmakefile knows where it is and can pass it to make_source_archive.py:
set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages")
option(PACKAGE_USE_UPSTREAM_SOURCES "Use soures upstream to download the package sources, when OFF the blender mirror will be used" ON)
option(DOWNLOAD_DIR "Path for downloaded files" ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
file(TO_CMAKE_PATH ${PACKAGE_DIR} PACKAGE_DIR)
set(PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/patches)
set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/build)
message("LIBDIR = ${LIBDIR}")
message("DOWNLOAD_DIR = ${DOWNLOAD_DIR}")
message("PACKAGE_DIR = ${PACKAGE_DIR}")
message("PATCH_DIR = ${PATCH_DIR}")
message("BUILD_DIR = ${BUILD_DIR}")
if(WIN32)
set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
else()
set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/patch.exe)
endif()
set(LIBEXT ".lib")
set(LIBPREFIX "")
@@ -63,7 +59,7 @@ if(WIN32)
if(MSVC_VERSION GREATER 1909)
set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
endif()
string(APPEND COMMON_MSVC_FLAGS " /bigobj")
set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
if(WITH_OPTIMIZED_DEBUG)
set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
else()
@@ -86,10 +82,17 @@ if(WIN32)
set(PLATFORM_CXX_FLAGS)
set(PLATFORM_CMAKE_FLAGS)
set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
set(MINGW_SHELL ming64sh.cmd)
set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
set(MINGW_HOST x86_64-w64-mingw32)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
set(MINGW_SHELL ming64sh.cmd)
set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
set(MINGW_HOST x86_64-w64-mingw32)
else()
set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
set(MINGW_SHELL ming32sh.cmd)
set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
set(MINGW_HOST i686-w64-mingw32)
endif()
set(CONFIGURE_ENV
cd ${MINGW_PATH} &&
@@ -121,44 +124,20 @@ else()
COMMAND xcode-select --print-path
OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process(
COMMAND xcodebuild -version -sdk macosx SDKVersion
OUTPUT_VARIABLE MACOSX_SDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT CMAKE_OSX_ARCHITECTURES)
execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Detected native architecture ${ARCHITECTURE}.")
set(CMAKE_OSX_ARCHITECTURES "${ARCHITECTURE}")
endif()
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
set(OSX_DEPLOYMENT_TARGET 10.13)
else()
set(OSX_DEPLOYMENT_TARGET 11.00)
endif()
set(OSX_ARCHITECTURES x86_64)
set(OSX_DEPLOYMENT_TARGET 10.11)
set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
set(BLENDER_PLATFORM_ARM ON)
endif()
set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin17.0.0) # OS X 10.13
else()
set(PLATFORM_BUILD_TARGET --build=aarch64-apple-darwin20.0.0) # macOS 11.00
endif()
set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin15.0.0) # OS X 10.11
set(PLATFORM_CMAKE_FLAGS
-DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
-DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
)
else()
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
set(BLENDER_PLATFORM_ARM ON)
endif()
set(PLATFORM_CFLAGS "-fPIC")
set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
set(PLATFORM_LDFLAGS)
@@ -187,7 +166,6 @@ else()
set(CONFIGURE_ENV
export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
export MACOSX_SDK_VERSION=${OSX_DEPLOYMENT_TARGET} &&
export CFLAGS=${PLATFORM_CFLAGS} &&
export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
export LDFLAGS=${PLATFORM_LDFLAGS}
@@ -210,6 +188,18 @@ set(DEFAULT_CMAKE_FLAGS
${PLATFORM_CMAKE_FLAGS}
)
if(WIN32)
# We need both flavors to build the thumbnail dlls
if(MSVC12)
set(GENERATOR_32 "Visual Studio 12 2013")
set(GENERATOR_64 "Visual Studio 12 2013 Win64")
elseif(MSVC14)
set(GENERATOR_32 "Visual Studio 14 2015")
set(GENERATOR_64 "Visual Studio 14 2015 Win64")
endif()
endif()
if(WIN32)
if(BUILD_MODE STREQUAL Debug)
set(ZLIB_LIBRARY zlibstaticd${LIBEXT})

View File

@@ -17,9 +17,9 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_opus
URL file://${PACKAGE_DIR}/${OPUS_FILE}
URL ${OPUS_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${OPUS_HASH_TYPE}=${OPUS_HASH}
URL_HASH SHA256=${OPUS_HASH}
PREFIX ${BUILD_DIR}/opus
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/opus
--disable-shared

View File

@@ -19,14 +19,22 @@
if(WIN32)
set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
else()
set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
endif()
SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
else()
set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
set(OSL_FLEX_BISON)
set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
SET(OSL_PLATFORM_FLAGS)
endif()
set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/openexr/lib/Imath${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Half{OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/IlmThread${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Iex${OPENEXR_VERSION_POSTFIX}.lib")
set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipo${LIBEXT}")
set(OSL_EXTRA_ARGS
-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
@@ -36,9 +44,13 @@ set(OSL_EXTRA_ARGS
-DBOOST_ROOT=${LIBDIR}/boost
-DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-DBoost_NO_SYSTEM_PATHS=ON
-DBoost_NO_BOOST_CMAKE=ON
-DOpenEXR_ROOT=${LIBDIR}/openexr/
-DIlmBase_ROOT=${LIBDIR}/openexr/
-DLLVM_DIRECTORY=${LIBDIR}/llvm
-DLLVM_INCLUDES=${LIBDIR}/llvm/include
-DLLVM_LIB_DIR=${LIBDIR}/llvm/lib
-DLLVM_VERSION=3.4
-DLLVM_LIBRARY=${OSL_LLVM_LIBRARY}
-DOPENEXR_HOME=${LIBDIR}/openexr/
-DILMBASE_HOME=${LIBDIR}/openexr/
-DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
-DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
@@ -46,36 +58,45 @@ set(OSL_EXTRA_ARGS
-DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOpenImageIO_ROOT=${LIBDIR}/openimageio/
-DOSL_BUILD_TESTS=OFF
-DOSL_BUILD_MATERIALX=OFF
-DPNG_ROOT=${LIBDIR}/png
-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
-DOPENIMAGEIO_INCLUDE_DIR=${LIBDIR}/openimageio/include
-DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
${OSL_FLEX_BISON}
-DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
-DBUILD_SHARED_LIBS=OFF
-DLINKSTATIC=ON
-DOSL_BUILD_PLUGINS=OFF
-DBUILDSTATIC=ON
${OSL_PLATFORM_FLAGS}
-DOSL_BUILD_PLUGINS=Off
-DSTOP_ON_WARNING=OFF
-DUSE_LLVM_BITCODE=OFF
-DLLVM_ROOT=${LIBDIR}/llvm/
-DLLVM_DIRECTORY=${LIBDIR}/llvm/
-DUSE_PARTIO=OFF
-DUSE_QT=OFF
-DUSE_Qt5=OFF
-DINSTALL_DOCS=OFF
${OSL_SIMD_FLAGS}
-Dpugixml_ROOT=${LIBDIR}/pugixml
-DUSE_PYTHON=OFF
-DCMAKE_CXX_STANDARD=14
-DPARTIO_LIBRARIES=
)
if(WIN32)
set(OSL_EXTRA_ARGS
${OSL_EXTRA_ARGS}
-DPUGIXML_HOME=${LIBDIR}/pugixml
)
elseif(APPLE)
# Make symbol hiding consistent with OIIO which defaults to OFF,
# avoids linker warnings on macOS
set(OSL_EXTRA_ARGS
${OSL_EXTRA_ARGS}
-DHIDE_SYMBOLS=OFF
)
endif()
ExternalProject_Add(external_osl
URL file://${PACKAGE_DIR}/${OSL_FILE}
URL ${OSL_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
LIST_SEPARATOR ^^
URL_HASH ${OSL_HASH_TYPE}=${OSL_HASH}
URL_HASH MD5=${OSL_HASH}
PREFIX ${BUILD_DIR}/osl
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
@@ -86,20 +107,19 @@ add_dependencies(
external_osl
external_boost
ll
external_clang
external_openexr
external_zlib
external_flexbison
external_openimageio
external_pugixml
)
if(WIN32)
if(UNIX)
# Rely on PugiXML compiled with OpenImageIO
else()
add_dependencies(
external_osl
external_flexbison
)
elseif(UNIX AND NOT APPLE)
add_dependencies(
external_osl
external_flex
external_pugixml
)
endif()

View File

@@ -22,14 +22,10 @@ set(PNG_EXTRA_ARGS
-DPNG_STATIC=ON
)
if(BLENDER_PLATFORM_ARM)
set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=on -DCMAKE_SYSTEM_PROCESSOR="aarch64")
endif()
ExternalProject_Add(external_png
URL file://${PACKAGE_DIR}/${PNG_FILE}
URL ${PNG_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${PNG_HASH_TYPE}=${PNG_HASH}
URL_HASH MD5=${PNG_HASH}
PREFIX ${BUILD_DIR}/png
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/png

View File

@@ -1,38 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(POTRACE_EXTRA_ARGS
)
if((WIN32 AND BUILD_MODE STREQUAL Release) OR UNIX)
ExternalProject_Add(external_potrace
URL file://${PACKAGE_DIR}/${POTRACE_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${POTRACE_HASH_TYPE}=${POTRACE_HASH}
PREFIX ${BUILD_DIR}/potrace
PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_potrace.txt ${BUILD_DIR}/potrace/src/external_potrace/CMakeLists.txt
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/potrace ${DEFAULT_CMAKE_FLAGS} ${POTRACE_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/potrace
)
if(WIN32)
ExternalProject_Add_Step(external_potrace after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/potrace ${HARVEST_TARGET}/potrace
DEPENDEES install
)
endif()
endif()

View File

@@ -24,15 +24,14 @@ if(WIN32)
set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ")
endif()
set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS})
set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
ExternalProject_Add(external_pthreads
URL file://${PACKAGE_DIR}/${PTHREADS_FILE}
URL ${PTHREADS_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${PTHREADS_HASH_TYPE}=${PTHREADS_HASH}
URL_HASH MD5=${PTHREADS_HASH}
PREFIX ${BUILD_DIR}/pthreads
CONFIGURE_COMMAND echo .
PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff
BUILD_COMMAND ${PTHREADS_BUILD}
INSTALL_COMMAND COMMAND
${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&

View File

@@ -20,9 +20,9 @@ set(PUGIXML_EXTRA_ARGS
)
ExternalProject_Add(external_pugixml
URL file://${PACKAGE_DIR}/${PUGIXML_FILE}
URL ${PUGIXML_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${PUGIXML_HASH_TYPE}=${PUGIXML_HASH}
URL_HASH MD5=${PUGIXML_HASH}
PREFIX ${BUILD_DIR}/pugixml
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/pugixml
@@ -30,14 +30,14 @@ ExternalProject_Add(external_pugixml
if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_pugixml after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pugixml ${HARVEST_TARGET}/pugixml
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_pugixml after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/pugixml/lib/pugixml_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
DEPENDEES install
)
endif()
endif()
endif()
endif()

View File

@@ -37,23 +37,18 @@ if(WIN32)
cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
ExternalProject_Add(external_python
URL file://${PACKAGE_DIR}/${PYTHON_FILE}
URL ${PYTHON_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
URL_HASH MD5=${PYTHON_HASH}
PREFIX ${BUILD_DIR}/python
CONFIGURE_COMMAND ""
BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p x64 -c ${BUILD_MODE}
INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-underpth --include-stable --include-pip --include-dev --include-launchers --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
)
else()
if(APPLE)
# Disable functions that can be in 10.13 sdk but aren't available on 10.9 target.
#
# Disable libintl (gettext library) as it might come from Homebrew, which makes
# it so test program compiles, but the Python does not. This is because for Python
# we use isysroot, which seems to forbid using libintl.h.
# The gettext functionality seems to come from CoreFoundation, so should be all fine.
# disable functions that can be in 10.13 sdk but aren't available on 10.9 target
set(PYTHON_FUNC_CONFIGS
export ac_cv_func_futimens=no &&
export ac_cv_func_utimensat=no &&
@@ -65,34 +60,28 @@ else()
export ac_cv_func_getentropy=no &&
export ac_cv_func_mkostemp=no &&
export ac_cv_func_mkostemps=no &&
export ac_cv_func_timingsafe_bcmp=no &&
export ac_cv_header_libintl_h=no &&
export ac_cv_lib_intl_textdomain=no
)
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
set(PYTHON_FUNC_CONFIGS ${PYTHON_FUNC_CONFIGS} && export PYTHON_DECIMAL_WITH_MACHINE=ansi64)
endif()
export ac_cv_func_timingsafe_bcmp=no)
set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
else()
set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
endif()
# Link against zlib statically (Unix). Avoid rpath issues (macOS).
set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_unix.diff)
set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include ${PLATFORM_CFLAGS}")
set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib ${PLATFORM_LDFLAGS}")
set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
set(PYTHON_CONFIGURE_EXTRA_ENV
export CFLAGS=${PYTHON_CFLAGS} &&
export CPPFLAGS=${PYTHON_CFLAGS} &&
export LDFLAGS=${PYTHON_LDFLAGS} &&
export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
ExternalProject_Add(external_python
URL file://${PACKAGE_DIR}/${PYTHON_FILE}
URL ${PYTHON_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
URL_HASH MD5=${PYTHON_HASH}
PREFIX ${BUILD_DIR}/python
PATCH_COMMAND ${PYTHON_PATCH}
CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}

View File

@@ -16,27 +16,14 @@
#
# ***** END GPL LICENSE BLOCK *****
if(WIN32 AND BUILD_MODE STREQUAL Debug)
set(SITE_PACKAGES_EXTRA --global-option build --global-option --debug)
endif()
ExternalProject_Add(external_python_site_packages
DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
PREFIX ${BUILD_DIR}/site_packages
INSTALL_COMMAND ${PYTHON_BINARY} -m pip install ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all:
INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all:
)
if(USE_PIP_NUMPY)
# Use only wheel (and not build from source) to stop NumPy from linking against buggy
# Accelerate framework backend on macOS. Official wheels are built with OpenBLAS.
ExternalProject_Add_Step(external_python_site_packages after_install
COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir numpy==${NUMPY_VERSION} --only-binary :all:
DEPENDEES install
)
endif()
add_dependencies(
external_python_site_packages
external_python

View File

@@ -30,9 +30,9 @@ else()
endif()
ExternalProject_Add(external_sdl
URL file://${PACKAGE_DIR}/${SDL_FILE}
URL ${SDL_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SDL_HASH_TYPE}=${SDL_HASH}
URL_HASH MD5=${SDL_HASH}
PREFIX ${BUILD_DIR}/sdl
PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}

View File

@@ -0,0 +1,227 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
####################################################################################################################
# Mingw32 Builds
####################################################################################################################
# This installs mingw32+msys to compile ffmpeg/iconv/libsndfile/lapack/fftw3
####################################################################################################################
message("LIBDIR = ${LIBDIR}")
macro(cmake_to_msys_path MsysPath ResultingPath)
string(REPLACE ":" "" TmpPath "${MsysPath}")
string(SUBSTRING ${TmpPath} 0 1 Drive)
string(SUBSTRING ${TmpPath} 1 255 PathPart)
string(TOLOWER ${Drive} LowerDrive)
string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
endmacro()
cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
message("mingw_LIBDIR = ${mingw_LIBDIR}")
message("Checking for mingw32")
# download mingw32
if(NOT EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
message("Downloading mingw32")
file(DOWNLOAD "https://astuteinternet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.4/threads-win32/sjlj/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
endif()
# make mingw root directory
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
execute_process(
COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
WORKING_DIRECTORY ${DOWNLOAD_DIR}
)
endif()
# extract mingw32
if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z"))
message("Extracting mingw32")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z
WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
)
endif()
message("Checking for pkg-config")
if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
message("Downloading pkg-config")
file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
endif()
# extract pkgconfig
if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
message("Extracting pkg-config")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
WORKING_DIRECTORY ${DOWNLOAD_DIR}/
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
)
endif()
message("Checking for nasm")
if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
message("Downloading nasm")
file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
endif()
# extract nasm
if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"))
message("Extracting nasm")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"
WORKING_DIRECTORY ${DOWNLOAD_DIR}/
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
)
endif()
SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe)
message("Checking for mingwGet")
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
message("Downloading mingw-get")
file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
endif()
# extract mingw_get
if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
message("Extracting mingw-get")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
)
endif()
if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/make.exe"))
message("Installing MSYS")
execute_process(
COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/bin/
)
endif()
if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/mktemp.exe"))
message("Installing mktemp")
execute_process(
COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/bin/
)
endif()
message("Checking for CoreUtils")
# download old core_utils for pr.exe (ffmpeg needs it to build)
if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
message("Downloading CoreUtils 5.97")
file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
endif()
if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"))
message("Installing pr from CoreUtils 5.97")
execute_process(
COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
WORKING_DIRECTORY ${DOWNLOAD_DIR}
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
)
endif()
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd")
message("Installing ming32sh.cmd")
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
)
endif()
message("Checking for perl")
# download perl for libvpx
if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
message("Downloading perl")
file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
endif()
# make perl root directory
if(NOT EXISTS "${DOWNLOAD_DIR}/perl32")
execute_process(
COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
WORKING_DIRECTORY ${DOWNLOAD_DIR}
)
endif()
# extract perl
if((NOT EXISTS "${DOWNLOAD_DIR}/perl32/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip"))
message("Extracting perl")
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
)
endif()
# get yasm for vpx
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
message("Downloading yasm")
file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
endif()
message("checking i686-w64-mingw32-strings")
# copy strings.exe to i686-w64-mingw32-strings for x264
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe")
message("fixing i686-w64-mingw32-strings.exe")
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
)
endif()
message("checking i686-w64-mingw32-ar.exe")
# copy ar.exe to i686-w64-mingw32-ar.exe for x264
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe")
message("fixing i686-w64-mingw32-ar.exe")
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
)
endif()
message("checking i686-w64-mingw32-strip.exe")
# copy strip.exe to i686-w64-mingw32-strip.exe for x264
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe")
message("fixing i686-w64-mingw32-strip.exe")
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
)
endif()
message("checking i686-w64-mingw32-ranlib.exe")
# copy ranlib.exe to i686-w64-mingw32-ranlib.exe for x264
if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe")
message("fixing i686-w64-mingw32-ranlib.exe")
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
)
endif()

View File

@@ -19,7 +19,7 @@
####################################################################################################################
# Mingw64 Builds
####################################################################################################################
# This installs mingw64+msys to compile ffmpeg/iconv/libsndfile/fftw3
# This installs mingw64+msys to compile ffmpeg/iconv/libsndfile/lapack/fftw3
####################################################################################################################
message("LIBDIR = ${LIBDIR}")
@@ -128,14 +128,6 @@ if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "$
)
endif()
if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/m4.exe"))
message("Installing m4")
execute_process(
COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-m4
WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw64/bin/
)
endif()
message("Checking for CoreUtils")
# download old core_utils for pr.exe (ffmpeg needs it to build)
if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")

View File

@@ -34,9 +34,9 @@ else()
endif()
ExternalProject_Add(external_sndfile
URL file://${PACKAGE_DIR}/${SNDFILE_FILE}
URL ${SNDFILE_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SNDFILE_HASH_TYPE}=${SNDFILE_HASH}
URL_HASH MD5=${SNDFILE_HASH}
PREFIX ${BUILD_DIR}/sndfile
PATCH_COMMAND ${SNDFILE_PATCH_CMD}
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
@@ -60,14 +60,3 @@ if(UNIX)
external_flac
)
endif()
if(BUILD_MODE STREQUAL Release AND WIN32)
ExternalProject_Add_Step(external_sndfile after_install
COMMAND lib /def:${BUILD_DIR}/sndfile/src/external_sndfile/src/libsndfile-1.def /machine:x64 /out:${BUILD_DIR}/sndfile/src/external_sndfile/src/libsndfile-1.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/sndfile/src/external_sndfile/src/libsndfile-1.lib ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h
DEPENDEES install
)
endif()

View File

@@ -17,9 +17,9 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_spnav
URL file://${PACKAGE_DIR}/${SPNAV_FILE}
URL ${SPNAV_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SPNAV_HASH_TYPE}=${SPNAV_HASH}
URL_HASH MD5=${SPNAV_HASH}
PREFIX ${BUILD_DIR}/spnav
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}

View File

@@ -42,29 +42,16 @@ if(UNIX)
-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-fPIC")
set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
set(SQLITE_CONFIGURATION_ARGS
${SQLITE_CONFIGURATION_ARGS}
--enable-threadsafe
--enable-load-extension
--enable-json1
--enable-fts4
--enable-fts5
# While building `tcl` is harmless, it causes problems when the install step
# tries to copy the files into the system path.
# Since this isn't required by Python or Blender this can be disabled.
# Note that Debian (for example), splits this off into a separate package,
# so it's safe to turn off.
--disable-tcl
--enable-shared=no
)
set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
--enable-shared=no)
endif()
ExternalProject_Add(external_sqlite
URL file://${PACKAGE_DIR}/${SQLITE_FILE}
URL ${SQLITE_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SQLITE_HASH_TYPE}=${SQLITE_HASH}
URL_HASH SHA1=${SQLITE_HASH}
PREFIX ${BUILD_DIR}/sqlite
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/sqlite/src/external_sqlite < ${PATCH_DIR}/sqlite.diff
PATCH_COMMAND ${SQLITE_PATCH_CMD}
CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install

View File

@@ -1,28 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_sse2neon
GIT_REPOSITORY ${SSE2NEON_GIT}
GIT_TAG ${SSE2NEON_GIT_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/sse2neon
CONFIGURE_COMMAND echo sse2neon - Nothing to configure
BUILD_COMMAND echo sse2neon - nothing to build
INSTALL_COMMAND mkdir -p ${LIBDIR}/sse2neon && cp ${BUILD_DIR}/sse2neon/src/external_sse2neon/sse2neon.h ${LIBDIR}/sse2neon
INSTALL_DIR ${LIBDIR}/sse2neon
)

View File

@@ -20,11 +20,9 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
set(SSL_PATCH_CMD echo .)
if(APPLE)
set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
set(SSL_OS_COMPILER "blender-darwin-x86_64")
else()
if(BLENDER_PLATFORM_ARM)
set(SSL_OS_COMPILER "blender-linux-aarch64")
elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
set(SSL_OS_COMPILER "blender-linux-x86_64")
else()
@@ -33,9 +31,9 @@ else()
endif()
ExternalProject_Add(external_ssl
URL file://${PACKAGE_DIR}/${SSL_FILE}
URL ${SSL_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
URL_HASH SHA256=${SSL_HASH}
PREFIX ${BUILD_DIR}/ssl
PATCH_COMMAND ${SSL_PATCH_CMD}
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl

View File

@@ -1,4 +1,4 @@
my %targets = (
%targets = (
"blender-linux-x86" => {
inherit_from => [ "linux-x86" ],
@@ -8,18 +8,8 @@ my %targets = (
inherit_from => [ "linux-x86_64" ],
cflags => add("-fPIC"),
},
"blender-linux-aarch64" => {
inherit_from => [ "linux-aarch64" ],
cxxflags => add("-fPIC"),
cflags => add("-fPIC"),
},
"blender-darwin-x86_64" => {
inherit_from => [ "darwin64-x86_64-cc" ],
cflags => add("-fPIC"),
},
"blender-darwin-arm64" => {
inherit_from => [ "darwin-common" ],
cxxflags => add("-fPIC -arch arm64"),
cflags => add("-fPIC -arch arm64"),
},
);

View File

@@ -20,33 +20,25 @@ if(WIN32)
-DTBB_BUILD_SHARED=On
-DTBB_BUILD_TBBMALLOC=On
-DTBB_BUILD_TBBMALLOC_PROXY=On
-DTBB_BUILD_STATIC=Off
-DTBB_BUILD_TESTS=Off
-DCMAKE_DEBUG_POSTFIX=_debug
)
set(TBB_LIBRARY tbb)
set(TBB_STATIC_LIBRARY Off)
-DTBB_BUILD_STATIC=On
)
else()
set(TBB_EXTRA_ARGS
-DTBB_BUILD_SHARED=Off
-DTBB_BUILD_TBBMALLOC=On
-DTBB_BUILD_TBBMALLOC_PROXY=Off
-DTBB_BUILD_STATIC=On
-DTBB_BUILD_TESTS=Off
)
set(TBB_LIBRARY tbb_static)
set(TBB_STATIC_LIBRARY On)
endif()
# CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
ExternalProject_Add(external_tbb
URL file://${PACKAGE_DIR}/${TBB_FILE}
URL ${TBB_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${TBB_HASH_TYPE}=${TBB_HASH}
URL_HASH MD5=${TBB_HASH}
PREFIX ${BUILD_DIR}/tbb
PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/build/version_string.ver.in &&
${PATCH_CMD} -p 1 -d ${BUILD_DIR}/tbb/src/external_tbb < ${PATCH_DIR}/tbb.diff
${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/tbb
)
@@ -54,35 +46,21 @@ ExternalProject_Add(external_tbb
if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_tbb after_install
# findtbb.cmake in some deps *NEEDS* to find tbb_debug.lib even if they are not going to use it
# to make that test pass, we place a copy with the right name in the lib folder.
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${LIBDIR}/tbb/lib/tbb_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${LIBDIR}/tbb/bin/tbb_debug.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
# Normal collection of build artifacts
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${HARVEST_TARGET}/tbb/bin/tbb.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.dll
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_tbb after_install
# findtbb.cmake in some deps *NEEDS* to find tbb.lib even if they are not going to use it
# to make that test pass, we place a copy with the right name in the lib folder.
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${LIBDIR}/tbb/lib/tbb.lib
# Normal collection of build artifacts
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb_debug.dll ${HARVEST_TARGET}/tbb/bin/tbb_debug.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy_debug.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_debug.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy_debug.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc.dll
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc_proxy.dll
DEPENDEES install
)
endif()

View File

@@ -23,11 +23,10 @@ else()
endif()
ExternalProject_Add(external_theora
URL file://${PACKAGE_DIR}/${THEORA_FILE}
URL ${THEORA_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${THEORA_HASH_TYPE}=${THEORA_HASH}
URL_HASH SHA256=${THEORA_HASH}
PREFIX ${BUILD_DIR}/theora
PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/theora/src/external_theora < ${PATCH_DIR}/theora.diff
CONFIGURE_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
--disable-shared
--enable-static

View File

@@ -16,12 +16,6 @@
#
# ***** END GPL LICENSE BLOCK *****
if(WITH_WEBP)
set(WITH_TIFF_WEBP ON)
else()
set(WITH_TIFF_WEBP OFF)
endif()
set(TIFF_EXTRA_ARGS
-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
@@ -29,14 +23,12 @@ set(TIFF_EXTRA_ARGS
-DBUILD_SHARED_LIBS=OFF
-Dlzma=OFF
-Djbig=OFF
-Dzstd=OFF
-Dwebp=${WITH_TIFF_WEBP}
)
ExternalProject_Add(external_tiff
URL file://${PACKAGE_DIR}/${TIFF_FILE}
URL ${TIFF_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${TIFF_HASH_TYPE}=${TIFF_HASH}
URL_HASH MD5=${TIFF_HASH}
PREFIX ${BUILD_DIR}/tiff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/tiff

View File

@@ -0,0 +1,31 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(TINYXML_EXTRA_ARGS
)
ExternalProject_Add(external_tinyxml
URL ${TINYXML_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${TINYXML_HASH}
PREFIX ${BUILD_DIR}/tinyxml
# patch taken from ocio
PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/tinyxml
)

View File

@@ -22,14 +22,9 @@ set(USD_EXTRA_ARGS
-DBoost_USE_STATIC_LIBS=ON
-DBoost_USE_STATIC_RUNTIME=OFF
-DBOOST_ROOT=${LIBDIR}/boost
-DBoost_NO_SYSTEM_PATHS=ON
-DBoost_NO_BOOST_CMAKE=ON
-DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
-DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
# USD wants the tbb debug lib set even when you are doing a release build
# Otherwise it will error out during the cmake configure phase.
-DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT}
-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
# This is a preventative measure that avoids possible conflicts when add-ons
# try to load another USD library into the same process space.
@@ -53,9 +48,9 @@ set(USD_EXTRA_ARGS
)
ExternalProject_Add(external_usd
URL file://${PACKAGE_DIR}/${USD_FILE}
URL ${USD_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${USD_HASH_TYPE}=${USD_HASH}
URL_HASH MD5=${USD_HASH}
PREFIX ${BUILD_DIR}/usd
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}
@@ -81,14 +76,14 @@ if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_usd after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/usd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/libusd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_usd after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/usd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/libusd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
DEPENDEES install
)
endif()

View File

@@ -19,54 +19,37 @@
set(ZLIB_VERSION 1.2.11)
set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
set(ZLIB_HASH_TYPE MD5)
set(ZLIB_FILE zlib-${ZLIB_VERSION}.tar.gz)
set(OPENAL_VERSION 1.20.1)
set(OPENAL_VERSION 1.18.2)
set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
set(OPENAL_HASH 556695068ce8375b89986083d810fd35)
set(OPENAL_HASH_TYPE MD5)
set(OPENAL_FILE openal-soft-${OPENAL_VERSION}.tar.bz2)
set(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190)
set(PNG_VERSION 1.6.37)
set(PNG_VERSION 1.6.35)
set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
set(PNG_HASH 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca)
set(PNG_HASH_TYPE SHA256)
set(PNG_FILE libpng-${PNG_VERSION}.tar.xz)
set(PNG_HASH 678b7e696a62a193ed3503b04bf449d6)
set(JPEG_VERSION 2.0.4)
set(JPEG_VERSION 1.5.3)
set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
set(JPEG_HASH 44c43e4a9fb352f47090804529317c88)
set(JPEG_HASH_TYPE MD5)
set(JPEG_FILE libjpeg-turbo-${JPEG_VERSION}.tar.gz)
set(JPEG_HASH 5b7549d440b86c98a517355c102d155e)
set(BOOST_VERSION 1.73.0)
set(BOOST_VERSION_NODOTS 1_73_0)
set(BOOST_VERSION_NODOTS_SHORT 1_73)
set(BOOST_URI https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
set(BOOST_HASH 4036cd27ef7548b8d29c30ea10956196)
set(BOOST_HASH_TYPE MD5)
set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
set(BOOST_VERSION 1.70.0)
set(BOOST_VERSION_NODOTS 1_70_0)
set(BOOST_VERSION_NODOTS_SHORT 1_70)
set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
set(BOOST_HASH fea771fe8176828fabf9c09242ee8c26)
# Using old version as recommended by OpenVDB build documentation.
set(BLOSC_VERSION 1.5.0)
set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
set(BLOSC_HASH 6e4a49c8c06f05aa543f3312cfce3d55)
set(BLOSC_HASH_TYPE MD5)
set(BLOSC_FILE blosc-${BLOSC_VERSION}.tar.gz)
set(PTHREADS_VERSION 3.0.0)
set(PTHREADS_URI http://prdownloads.sourceforge.net/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
set(PTHREADS_HASH_TYPE MD5)
set(PTHREADS_FILE pthreads4w-code-${PTHREADS_VERSION}.zip)
set(OPENEXR_VERSION 2.5.5)
set(OPENEXR_VERSION 2.4.0)
set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
set(OPENEXR_HASH 85e8a979092c9055d10ed103062d31a0)
set(OPENEXR_HASH_TYPE MD5)
set(OPENEXR_FILE openexr-${OPENEXR_VERSION}.tar.gz)
set(OPENEXR_HASH 9e4d69cf2a12c6fb19b98af7c5e0eaee)
if(WIN32)
# Openexr started appending _d on its own so now
# we need to tell the build the postfix is _s while
@@ -83,419 +66,259 @@ else()
set(OPENEXR_VERSION_POSTFIX)
endif()
set(FREETYPE_VERSION 2.10.2)
set(FREETYPE_VERSION 2.10.1)
set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
set(FREETYPE_HASH b1cb620e4c875cd4d1bfa04945400945)
set(FREETYPE_HASH_TYPE MD5)
set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
set(FREETYPE_HASH c50a3c9e5e62bdc938a6e1598a782947)
set(GLEW_VERSION 1.13.0)
set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
set(GLEW_HASH 7cbada3166d2aadfc4169c4283701066)
set(GLEW_HASH_TYPE MD5)
set(GLEW_FILE glew-${GLEW_VERSION}.tgz)
set(FREEGLUT_VERSION 3.0.0)
set(FREEGLUT_URI http://prdownloads.sourceforge.net/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
set(FREEGLUT_URI http://pilotfiber.dl.sourceforge.net/project/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754)
set(FREEGLUT_HASH_TYPE MD5)
set(FREEGLUT_FILE freeglut-${FREEGLUT_VERSION}.tar.gz)
set(ALEMBIC_VERSION 1.7.16)
set(HDF5_VERSION 1.8.17)
set(HDF5_URI https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz)
set(HDF5_HASH 7d572f8f3b798a628b8245af0391a0ca)
set(ALEMBIC_VERSION 1.7.12)
set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
set(ALEMBIC_HASH effcc86e42fe6605588e3de57bde6677)
set(ALEMBIC_HASH_TYPE MD5)
set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)
set(ALEMBIC_MD5 e2b3777f23c5c09481a008cc6f0f8a40)
# hash is for 3.1.2
set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
set(GLFW_URI https://github.com/glfw/glfw/archive/${GLFW_GIT_UID}.zip)
set(GLFW_HASH 20cacb1613da7eeb092f3ac4f6b2b3d0)
set(GLFW_HASH_TYPE MD5)
set(GLFW_FILE glfw-${GLFW_GIT_UID}.zip)
# latest uid in git as of 2016-04-01
set(CLEW_GIT_UID 277db43f6cafe8b27c6f1055f69dc67da4aeb299)
set(CLEW_URI https://github.com/OpenCLWrangler/clew/archive/${CLEW_GIT_UID}.zip)
set(CLEW_HASH 2c699d10ed78362e71f56fae2a4c5f98)
set(CLEW_HASH_TYPE MD5)
set(CLEW_FILE clew-${CLEW_GIT_UID}.zip)
# latest uid in git as of 2016-04-01
set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)
set(CUEW_HASH_TYPE MD5)
set(CUEW_FILE cuew-${CUEW_GIT_UID}.zip)
set(OPENSUBDIV_VERSION v3_4_3)
set(OPENSUBDIV_VERSION v3_4_0_RC2)
set(OPENSUBDIV_Hash f6a10ba9efaa82fde86fe65aad346319)
set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
set(OPENSUBDIV_HASH 7bbfa275d021fb829e521df749160edb)
set(OPENSUBDIV_HASH_TYPE MD5)
set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
set(SDL_VERSION 2.0.12)
set(SDL_VERSION 2.0.8)
set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
set(SDL_HASH 783b6f2df8ff02b19bb5ce492b99c8ff)
set(SDL_HASH_TYPE MD5)
set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz)
set(SDL_HASH 3800d705cef742c6a634f202c37f263f)
set(OPENCOLLADA_VERSION v1.6.68)
set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
set(OPENCOLLADA_HASH_TYPE MD5)
set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
set(OPENCOLORIO_VERSION 2.0.0)
set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
set(OPENCOLORIO_HASH_TYPE MD5)
set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
set(OPENCOLORIO_VERSION 1.1.0)
set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8)
set(LLVM_VERSION 12.0.0)
set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
set(LLVM_HASH 5a4fab4d7fc84aefffb118ac2c8a4fc0)
set(LLVM_HASH_TYPE MD5)
set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
set(LLVM_VERSION 9.0.1)
set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz)
set(LLVM_HASH 31eb9ce73dd2a0f8dcab8319fb03f8fc)
if(APPLE)
# Cloth physics test is crashing due to this bug:
# https://bugs.llvm.org/show_bug.cgi?id=50579
set(OPENMP_VERSION 9.0.1)
set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
else()
set(OPENMP_VERSION ${LLVM_VERSION})
set(OPENMP_HASH ac48ce3e4582ccb82f81ab59eb3fc9dc)
endif()
set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
set(OPENMP_HASH_TYPE MD5)
set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
set(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz)
set(CLANG_HASH 13468e4a44940efef1b75e8641752f90)
set(OPENIMAGEIO_VERSION 2.2.15.1)
set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
set(OPENIMAGEIO_VERSION 1.8.13)
set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
set(OPENIMAGEIO_HASH 3db5c5f0b3dc91597c75e5df09eb9072)
set(OPENIMAGEIO_HASH_TYPE MD5)
set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
set(OPENIMAGEIO_HASH f5526c3c9878029ee900d84856683f93)
set(TIFF_VERSION 4.1.0)
set(TIFF_VERSION 4.0.9)
set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
set(TIFF_HASH_TYPE MD5)
set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79)
set(OSL_VERSION 1.11.14.1)
set(OSL_VERSION 1.10.9)
set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
set(OSL_HASH_TYPE MD5)
set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
set(OSL_HASH a94f1e8506f7e8f5e993653de5c5fa00)
set(PYTHON_VERSION 3.9.2)
set(PYTHON_SHORT_VERSION 3.9)
set(PYTHON_SHORT_VERSION_NO_DOTS 39)
set(PYTHON_VERSION 3.7.4)
set(PYTHON_SHORT_VERSION 3.7)
set(PYTHON_SHORT_VERSION_NO_DOTS 37)
set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
set(PYTHON_HASH f0dc9000312abeb16de4eccce9a870ab)
set(PYTHON_HASH_TYPE MD5)
set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)
set(PYTHON_HASH d33e4aae66097051c2eca45ee3604803)
set(TBB_VERSION 2020_U2)
set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
set(TBB_HASH 1b711ae956524855088df3bbf5ec65dc)
set(TBB_HASH_TYPE MD5)
set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz)
set(TBB_VERSION 2019_U9)
set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
set(TBB_HASH 584edbec127c508f2cd5b6e79ad200fc)
set(OPENVDB_VERSION 8.0.1)
set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
set(OPENVDB_HASH_TYPE MD5)
set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
set(OPENVDB_VERSION 7.0.0)
set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
set(OPENVDB_HASH fd6c4f168282f7e0e494d290cd531fa8)
set(NANOVDB_GIT_UID dc37d8a631922e7bef46712947dc19b755f3e841)
set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
set(NANOVDB_HASH_TYPE MD5)
set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
set(IDNA_VERSION 2.8)
set(CHARDET_VERSION 3.0.4)
set(URLLIB3_VERSION 1.25.3)
set(CERTIFI_VERSION 2019.6.16)
set(REQUESTS_VERSION 2.22.0)
set(IDNA_VERSION 2.10)
set(CHARDET_VERSION 4.0.0)
set(URLLIB3_VERSION 1.26.3)
set(CERTIFI_VERSION 2020.12.5)
set(REQUESTS_VERSION 2.25.1)
set(CYTHON_VERSION 0.29.21)
set(NUMPY_VERSION 1.19.5)
set(NUMPY_SHORT_VERSION 1.19)
set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip)
set(NUMPY_HASH f6a1b48717c552bbc18f1adc3cc1fe0e)
set(NUMPY_HASH_TYPE MD5)
set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip)
set(NUMPY_VERSION v1.17.0)
set(NUMPY_SHORT_VERSION 1.17)
set(NUMPY_URI https://files.pythonhosted.org/packages/da/32/1b8f2bb5fb50e4db68543eb85ce37b9fa6660cd05b58bddfafafa7ed62da/numpy-1.17.0.zip)
set(NUMPY_HASH aed49b31bcb44ec73b8155be78566135)
set(LAME_VERSION 3.100)
set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
set(LAME_HASH_TYPE MD5)
set(LAME_FILE lame-${LAME_VERSION}.tar.gz)
set(OGG_VERSION 1.3.4)
set(OGG_VERSION 1.3.3)
set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
set(OGG_HASH fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e)
set(OGG_HASH_TYPE SHA256)
set(OGG_FILE libogg-${OGG_VERSION}.tar.gz)
set(OGG_HASH c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985)
set(VORBIS_VERSION 1.3.6)
set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
set(VORBIS_HASH_TYPE SHA256)
set(VORBIS_FILE libvorbis-${VORBIS_VERSION}.tar.gz)
set(THEORA_VERSION 1.1.1)
set(THEORA_URI http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2)
set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc)
set(THEORA_HASH_TYPE SHA256)
set(THEORA_FILE libtheora-${THEORA_VERSION}.tar.bz2)
set(FLAC_VERSION 1.3.3)
set(FLAC_VERSION 1.3.2)
set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
set(FLAC_HASH 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748)
set(FLAC_HASH_TYPE SHA256)
set(FLAC_FILE flac-${FLAC_VERSION}.tar.xz)
set(FLAC_HASH 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f)
set(VPX_VERSION 1.8.2)
set(VPX_VERSION 1.7.0)
set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
set(VPX_HASH 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac)
set(VPX_HASH_TYPE SHA256)
set(VPX_FILE libvpx-v${VPX_VERSION}.tar.gz)
set(VPX_HASH 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238)
set(OPUS_VERSION 1.3.1)
set(OPUS_URI https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz)
set(OPUS_HASH 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d)
set(OPUS_HASH_TYPE SHA256)
set(OPUS_FILE opus-${OPUS_VERSION}.tar.gz)
set(X264_VERSION 33f9e1474613f59392be5ab6a7e7abf60fa63622)
set(X264_URI https://code.videolan.org/videolan/x264/-/archive/${X264_VERSION}/x264-${X264_VERSION}.tar.gz)
set(X264_HASH 5456450ee1ae02cd2328be3157367a232a0ab73315e8c8f80dab80469524f525)
set(X264_HASH_TYPE SHA256)
set(X264_FILE x264-${X264_VERSION}.tar.gz)
set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180811-2245-stable.tar.bz2)
set(X264_HASH ae8a868a0e236a348b35d79f3ee80294b169d1195408b689f9851383661ed7aa)
set(XVIDCORE_VERSION 1.3.7)
set(XVIDCORE_URI https://downloads.xvid.com/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
set(XVIDCORE_HASH abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d)
set(XVIDCORE_HASH_TYPE SHA256)
set(XVIDCORE_FILE xvidcore-${XVIDCORE_VERSION}.tar.gz)
set(XVIDCORE_VERSION 1.3.5)
set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
set(XVIDCORE_HASH 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0)
set(OPENJPEG_VERSION 2.3.1)
# This has to be in sync with the version in blenders /extern folder.
set(OPENJPEG_VERSION 2.3.0)
set(OPENJPEG_SHORT_VERSION 2.3)
set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz)
set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9)
set(OPENJPEG_HASH_TYPE SHA256)
set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz)
# Use slightly newer commit after release which includes a cmake fix
set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip)
set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)
set(FFMPEG_VERSION 4.4)
set(FAAD_VERSION 2-2.8.8)
set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.gz)
set(FAAD_HASH 28f6116efdbe9378269f8a6221767d1f)
set(FFMPEG_VERSION 4.0.2)
set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
set(FFMPEG_HASH 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e)
set(FFMPEG_HASH_TYPE SHA256)
set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2)
set(FFMPEG_HASH 5576e8a22f80b6a336db39808f427cfb)
set(FFTW_VERSION 3.3.8)
set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
set(FFTW_HASH_TYPE MD5)
set(FFTW_FILE fftw-${FFTW_VERSION}.tar.gz)
set(ICONV_VERSION 1.16)
set(ICONV_VERSION 1.15)
set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz)
set(ICONV_HASH 7d2a800b952942bb2880efb00cfd524c)
set(ICONV_HASH_TYPE MD5)
set(ICONV_FILE libiconv-${ICONV_VERSION}.tar.gz)
set(ICONV_HASH ace8b5f2db42f7b3b3057585e80d9808)
set(LAPACK_VERSION 3.6.0)
set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz)
set(LAPACK_HASH f2f6c67134e851fe189bb3ca1fbb5101)
set(SNDFILE_VERSION 1.0.28)
set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
set(SNDFILE_HASH_TYPE MD5)
set(SNDFILE_FILE libsndfile-${SNDFILE_VERSION}.tar.gz)
# set(HIDAPI_VERSION 0.8.0-rc1)
# set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
# set(HIDAPI_HASH 069f9dd746edc37b6b6d0e3656f47199)
set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5)
set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip)
set(HIDAPI_HASH b6e22f6b514f8bcf594989f20ffc46fb)
set(WEBP_VERSION 0.6.1)
set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz)
set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
set(WEBP_HASH_TYPE MD5)
set(WEBP_FILE libwebp-${WEBP_VERSION}.tar.gz)
set(SPNAV_VERSION 0.2.3)
set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
set(SPNAV_HASH 44d840540d53326d4a119c0f1aa7bf0a)
set(SPNAV_HASH_TYPE MD5)
set(SPNAV_FILE libspnav-${SPNAV_VERSION}.tar.gz)
set(JEMALLOC_VERSION 5.2.1)
set(JEMALLOC_VERSION 5.0.1)
set(JEMALLOC_URI https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2)
set(JEMALLOC_HASH 3d41fbf006e6ebffd489bdb304d009ae)
set(JEMALLOC_HASH_TYPE MD5)
set(JEMALLOC_FILE jemalloc-${JEMALLOC_VERSION}.tar.bz2)
set(JEMALLOC_HASH 507f7b6b882d868730d644510491d18f)
set(XML2_VERSION 2.9.10)
set(XML2_VERSION 2.9.4)
set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz)
set(XML2_HASH 10942a1dc23137a8aa07f0639cbfece5)
set(XML2_HASH_TYPE MD5)
set(XML2_FILE libxml2-${XML2_VERSION}.tar.gz)
set(XML2_HASH ae249165c173b1ff386ee8ad676815f5)
set(TINYXML_VERSION 2_6_2)
set(TINYXML_VERSION_DOTS 2.6.2)
set(TINYXML_URI https://nchc.dl.sourceforge.net/project/tinyxml/tinyxml/${TINYXML_VERSION_DOTS}/tinyxml_${TINYXML_VERSION}.tar.gz)
set(TINYXML_HASH c1b864c96804a10526540c664ade67f0)
set(TINYXML_HASH_TYPE MD5)
set(TINYXML_FILE tinyxml_${TINYXML_VERSION}.tar.gz)
set(YAMLCPP_VERSION 0.6.3)
set(YAMLCPP_URI https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-${YAMLCPP_VERSION})
set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
set(YAMLCPP_HASH_TYPE MD5)
set(YAMLCPP_FILE yaml-cpp-${YAMLCPP_VERSION}.tar.gz)
set(EXPAT_VERSION 2_2_10)
set(EXPAT_URI https://github.com/libexpat/libexpat/archive/R_${EXPAT_VERSION}.tar.gz)
set(EXPAT_HASH 7ca5f09959fcb9a57618368deb627b9f)
set(EXPAT_HASH_TYPE MD5)
set(EXPAT_FILE libexpat-${EXPAT_VERSION}.tar.gz)
set(LCMS_VERSION 2.9)
set(LCMS_URI https://nchc.dl.sourceforge.net/project/lcms/lcms/${LCMS_VERSION}/lcms2-${LCMS_VERSION}.tar.gz)
set(LCMS_HASH 8de1b7724f578d2995c8fdfa35c3ad0e)
set(PUGIXML_VERSION 1.10)
set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar.gz)
set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
set(PUGIXML_HASH_TYPE MD5)
set(PUGIXML_FILE pugixml-${PUGIXML_VERSION}.tar.gz)
set(PUGIXML_VERSION 1.9)
set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v1.9.tar.gz)
set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714)
set(FLEXBISON_VERSION 2.5.24)
set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-${FLEXBISON_VERSION}.zip)
set(FLEXBISON_HASH 6b549d43e34ece0e8ed05af92daa31c4)
set(FLEXBISON_HASH_TYPE MD5)
set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
set(FLEX_VERSION 2.6.4)
set(FLEX_URI https://github.com/westes/flex/releases/download/v${FLEX_VERSION}/flex-${FLEX_VERSION}.tar.gz)
set(FLEX_HASH 2882e3179748cc9f9c23ec593d6adc8d)
set(FLEX_HASH_TYPE MD5)
set(FLEX_FILE flex-${FLEX_VERSION}.tar.gz)
set(FLEXBISON_VERSION 2.5.5)
set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
# Libraries to keep Python modules static on Linux.
# NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
# sources from Debian packaging.
set(BZIP2_VERSION 1.0.8)
set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERSION}.orig.tar.gz)
set(BZIP2_HASH ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269)
set(BZIP2_HASH_TYPE SHA256)
set(BZIP2_FILE bzip2_${BZIP2_VERSION}.orig.tar.gz)
set(BZIP2_VERSION 1.0.6)
set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERSION}.orig.tar.bz2)
set(BZIP2_HASH d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7)
set(FFI_VERSION 3.3)
set(FFI_VERSION 3.2.1)
set(FFI_URI https://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
set(FFI_HASH 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056)
set(FFI_HASH_TYPE SHA256)
set(FFI_FILE libffi-${FFI_VERSION}.tar.gz)
set(FFI_HASH d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37)
set(LZMA_VERSION 5.2.5)
set(LZMA_VERSION 5.2.4)
set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2)
set(LZMA_HASH 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df)
set(LZMA_HASH_TYPE SHA256)
set(LZMA_FILE xz-${LZMA_VERSION}.tar.bz2)
set(LZMA_HASH 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf)
if(BLENDER_PLATFORM_ARM)
# Need at least 1.1.1i for aarch64 support (https://github.com/openssl/openssl/pull/13218)
set(SSL_VERSION 1.1.1i)
set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
set(SSL_HASH e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242)
set(SSL_HASH_TYPE SHA256)
set(SSL_FILE openssl-${SSL_VERSION}.tar.gz)
else()
set(SSL_VERSION 1.1.1g)
set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
set(SSL_HASH ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46)
set(SSL_HASH_TYPE SHA256)
set(SSL_FILE openssl-${SSL_VERSION}.tar.gz)
endif()
set(SSL_VERSION 1.1.0i)
set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
set(SSL_HASH ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99)
set(SQLITE_VERSION 3.31.1)
set(SQLITE_VERSION 3.24.0)
set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
set(SQLITE_HASH_TYPE SHA1)
set(SQLITE_FILE sqlite-src-3240000.zip)
set(EMBREE_VERSION 3.10.0)
set(EMBREE_VERSION 3.8.0)
set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
set(EMBREE_HASH 4bbe29e7eaa46417efc75fc5f1e8eb87)
set(EMBREE_HASH_TYPE MD5)
set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
set(EMBREE_ARM_GIT https://github.com/brechtvl/embree.git)
set(EMBREE_HASH ac504d5426945fe25dec1267e0c39d52)
set(USD_VERSION 21.02)
set(USD_VERSION 19.11)
set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
set(USD_HASH_TYPE MD5)
set(USD_FILE usd-v${USD_VERSION}.tar.gz)
set(USD_HASH 79ff176167b3fe85f4953abd6cc5e0cc)
set(OIDN_VERSION 1.4.1)
set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
set(OIDN_HASH df4007b0ab93b1c41cdf223b075d01c0)
set(OIDN_HASH_TYPE MD5)
set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
set(OIDN_VERSION 1.0.0)
set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip)
set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60)
set(LIBGLU_VERSION 9.0.1)
set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.xz)
set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
set(LIBGLU_HASH_TYPE MD5)
set(LIBGLU_FILE glu-${LIBGLU_VERSION}.tar.xz)
set(MESA_VERSION 21.1.5)
set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
set(MESA_HASH 022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d)
set(MESA_HASH_TYPE SHA256)
set(MESA_FILE mesa-${MESA_VERSION}.tar.xz)
set(MESA_VERSION 18.3.1)
set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
set(NASM_VERSION 2.15.02)
set(NASM_URI https://github.com/netwide-assembler/nasm/archive/nasm-${NASM_VERSION}.tar.gz)
set(NASM_HASH aded8b796c996a486a56e0515c83e414116decc3b184d88043480b32eb0a8589)
set(NASM_HASH_TYPE SHA256)
set(NASM_FILE nasm-${NASM_VERSION}.tar.gz)
set(XR_OPENXR_SDK_VERSION 1.0.17)
set(XR_OPENXR_SDK_VERSION 1.0.6)
set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
set(XR_OPENXR_SDK_HASH bf0fd8828837edff01047474e90013e1)
set(XR_OPENXR_SDK_HASH_TYPE MD5)
set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)
set(WL_PROTOCOLS_VERSION 1.21)
set(WL_PROTOCOLS_FILE wayland-protocols-${WL_PROTOCOLS_VERSION}.tar.gz)
set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${WL_PROTOCOLS_VERSION}/${WL_PROTOCOLS_FILE})
set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
set(WL_PROTOCOLS_HASH_TYPE MD5)
set(ISPC_VERSION v1.16.0)
set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
set(ISPC_HASH_TYPE MD5)
set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
set(GMP_VERSION 6.2.0)
set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)
set(GMP_HASH a325e3f09e6d91e62101e59f9bda3ec1)
set(GMP_HASH_TYPE MD5)
set(GMP_FILE gmp-${GMP_VERSION}.tar.xz)
set(POTRACE_VERSION 1.16)
set(POTRACE_URI http://potrace.sourceforge.net/download/${POTRACE_VERSION}/potrace-${POTRACE_VERSION}.tar.gz)
set(POTRACE_HASH 5f0bd87ddd9a620b0c4e65652ef93d69)
set(POTRACE_HASH_TYPE MD5)
set(POTRACE_FILE potrace-${POTRACE_VERSION}.tar.gz)
set(HARU_VERSION 2_3_0)
set(HARU_URI https://github.com/libharu/libharu/archive/RELEASE_${HARU_VERSION}.tar.gz)
set(HARU_HASH 4f916aa49c3069b3a10850013c507460)
set(HARU_HASH_TYPE MD5)
set(HARU_FILE libharu-${HARU_VERSION}.tar.gz)
set(ZSTD_VERSION 1.5.0)
set(ZSTD_URI https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz)
set(ZSTD_HASH 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94)
set(ZSTD_HASH_TYPE SHA256)
set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
set(XR_OPENXR_SDK_HASH 21daea7c3bfec365298d779a0e19caa1)

View File

@@ -17,9 +17,9 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_vorbis
URL file://${PACKAGE_DIR}/${VORBIS_FILE}
URL ${VORBIS_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${VORBIS_HASH_TYPE}=${VORBIS_HASH}
URL_HASH SHA256=${VORBIS_HASH}
PREFIX ${BUILD_DIR}/vorbis
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
--disable-shared

View File

@@ -24,20 +24,16 @@ if(WIN32)
endif()
else()
if(APPLE)
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
set(VPX_EXTRA_FLAGS --target=generic-gnu)
else()
set(VPX_EXTRA_FLAGS --target=x86_64-darwin17-gcc)
endif()
set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
else()
set(VPX_EXTRA_FLAGS --target=generic-gnu)
endif()
endif()
ExternalProject_Add(external_vpx
URL file://${PACKAGE_DIR}/${VPX_FILE}
URL ${VPX_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${VPX_HASH_TYPE}=${VPX_HASH}
URL_HASH SHA256=${VPX_HASH}
PREFIX ${BUILD_DIR}/vpx
CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
cd ${BUILD_DIR}/vpx/src/external_vpx/ &&

View File

@@ -1,27 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_wayland_protocols
URL file://${PACKAGE_DIR}/${WL_PROTOCOLS_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
PREFIX ${BUILD_DIR}/wayland-protocols
CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
BUILD_COMMAND ninja
INSTALL_COMMAND ninja install
)

View File

@@ -32,9 +32,9 @@ else()
endif()
ExternalProject_Add(external_webp
URL file://${PACKAGE_DIR}/${WEBP_FILE}
URL ${WEBP_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${WEBP_HASH_TYPE}=${WEBP_HASH}
URL_HASH MD5=${WEBP_HASH}
PREFIX ${BUILD_DIR}/webp
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/webp

View File

@@ -18,27 +18,19 @@
if(WIN32)
set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
endif()
if(BLENDER_PLATFORM_ARM)
set(X264_EXTRA_ARGS ${X264_EXTRA_ARGS} "--disable-asm")
endif()
if((APPLE AND NOT BLENDER_PLATFORM_ARM) OR (UNIX AND NOT APPLE))
set(X264_CONFIGURE_ENV
export AS=${LIBDIR}/nasm/bin/nasm
)
set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
else()
set(X264_CONFIGURE_ENV echo .)
set(X264_PATCH_CMD echo .)
endif()
ExternalProject_Add(external_x264
URL file://${PACKAGE_DIR}/${X264_FILE}
URL ${X264_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${X264_HASH_TYPE}=${X264_HASH}
URL_HASH SHA256=${X264_HASH}
PREFIX ${BUILD_DIR}/x264
CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${X264_CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ &&
${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
PATCH_COMMAND ${X264_PATCH_CMD}
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
--enable-static
--enable-pic
--disable-lavf
@@ -51,10 +43,3 @@ ExternalProject_Add(external_x264
if(MSVC)
set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
endif()
if(UNIX)
add_dependencies(
external_x264
external_nasm
)
endif()

View File

@@ -17,9 +17,9 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_xml2
URL file://${PACKAGE_DIR}/${XML2_FILE}
URL ${XML2_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
URL_HASH MD5=${XML2_HASH}
PREFIX ${BUILD_DIR}/xml2
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
--prefix=${LIBDIR}/xml2

View File

@@ -29,15 +29,13 @@ if(UNIX AND NOT APPLE)
-DBUILD_WITH_WAYLAND_HEADERS=OFF
-DBUILD_WITH_XCB_HEADERS=OFF
-DBUILD_WITH_XLIB_HEADERS=ON
-DBUILD_WITH_SYSTEM_JSONCPP=OFF
-DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1
)
endif()
ExternalProject_Add(external_xr_openxr_sdk
URL file://${PACKAGE_DIR}/${XR_OPENXR_SDK_FILE}
URL ${XR_OPENXR_SDK_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${XR_OPENXR_SDK_HASH_TYPE}=${XR_OPENXR_SDK_HASH}
URL_HASH MD5=${XR_OPENXR_SDK_HASH}
PREFIX ${BUILD_DIR}/xr_openxr_sdk
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xr_openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${XR_OPENXR_SDK_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/xr_openxr_sdk
@@ -53,7 +51,7 @@ if(WIN32)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_xr_openxr_sdk after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xr_openxr_sdk/lib/openxr_loaderd.lib ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loaderd.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xr_openxr_sdk/lib/openxr_loader.lib ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loader_d.lib
DEPENDEES install
)
endif()

View File

@@ -21,9 +21,9 @@ if(WIN32)
endif()
ExternalProject_Add(external_xvidcore
URL file://${PACKAGE_DIR}/${XVIDCORE_FILE}
URL ${XVIDCORE_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${XVIDCORE_HASH_TYPE}=${XVIDCORE_HASH}
URL_HASH SHA256=${XVIDCORE_HASH}
PREFIX ${BUILD_DIR}/xvidcore
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/xvidcore ${XVIDCORE_EXTRA_ARGS}
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make -j${MAKE_THREADS}

View File

@@ -17,22 +17,17 @@
# ***** END GPL LICENSE BLOCK *****
set(YAMLCPP_EXTRA_ARGS
-DBUILD_GMOCK=OFF
-DYAML_CPP_BUILD_TESTS=OFF
-DYAML_CPP_BUILD_TOOLS=OFF
-DYAML_CPP_BUILD_CONTRIB=OFF
-DYAML_MSVC_SHARED_RT=ON
)
if(WIN32)
set(YAMLCPP_EXTRA_ARGS
${YAMLCPP_EXTRA_ARGS}
-DBUILD_GMOCK=OFF
-DYAML_MSVC_SHARED_RT=ON)
endif()
ExternalProject_Add(external_yamlcpp
URL file://${PACKAGE_DIR}/${YAMLCPP_FILE}
URL ${YAMLCPP_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${YAMLCPP_HASH_TYPE}=${YAMLCPP_HASH}
URL_HASH MD5=${YAMLCPP_HASH}
PREFIX ${BUILD_DIR}/yamlcpp
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/yamlcpp

View File

@@ -17,8 +17,9 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_zlib
URL file://${PACKAGE_DIR}/${ZLIB_FILE}
URL_HASH ${ZLIB_HASH_TYPE}=${ZLIB_HASH}
URL ${ZLIB_URI}
URL_HASH MD5=${ZLIB_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/zlib
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
INSTALL_DIR ${LIBDIR}/zlib

View File

@@ -17,8 +17,8 @@
# ***** END GPL LICENSE BLOCK *****
ExternalProject_Add(external_zlib_mingw
URL file://${PACKAGE_DIR}/${ZLIB_FILE}
URL_HASH ${ZLIB_HASH_TYPE}=${ZLIB_HASH}
URL ${ZLIB_URI}
URL_HASH MD5=${ZLIB_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/zlib_mingw
CONFIGURE_COMMAND echo .

View File

@@ -1,51 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(ZSTD_EXTRA_ARGS
-DZSTD_BUILD_PROGRAMS=OFF
-DZSTD_BUILD_SHARED=OFF
-DZSTD_BUILD_STATIC=ON
-DZSTD_BUILD_TESTS=OFF
-DZSTD_LEGACY_SUPPORT=OFF
-DZSTD_LZ4_SUPPORT=OFF
-DZSTD_LZMA_SUPPORT=OFF
-DZSTD_MULTITHREAD_SUPPORT=ON
-DZSTD_PROGRAMS_LINK_SHARED=OFF
-DZSTD_USE_STATIC_RUNTIME=OFF
-DZSTD_ZLIB_SUPPORT=OFF
)
ExternalProject_Add(external_zstd
URL file://${PACKAGE_DIR}/${ZSTD_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${ZSTD_HASH_TYPE}=${ZSTD_HASH}
PREFIX ${BUILD_DIR}/zstd
SOURCE_SUBDIR build/cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zstd ${DEFAULT_CMAKE_FLAGS} ${ZSTD_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/zstd
)
if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_zstd after_install
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${HARVEST_TARGET}/zstd/lib/zstd_static${LIBEXT}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/
DEPENDEES install
)
endif()
endif()

File diff suppressed because it is too large Load Diff

View File

@@ -91,41 +91,3 @@ diff -Naur external_blosc.orig/blosc/blosc.c external_blosc/blosc/blosc.c
/* Some useful units */
diff --git a/blosc/shuffle.c b/blosc/shuffle.c
index 84b5095..23053b4 100644
--- a/blosc/shuffle.c
+++ b/blosc/shuffle.c
@@ -490,12 +490,12 @@ void unshuffle(size_t bytesoftype, size_t blocksize,
#else /* no __SSE2__ available */
void shuffle(size_t bytesoftype, size_t blocksize,
- uint8_t* _src, uint8_t* _dest) {
+ const uint8_t* _src, uint8_t* _dest) {
_shuffle(bytesoftype, blocksize, _src, _dest);
}
void unshuffle(size_t bytesoftype, size_t blocksize,
- uint8_t* _src, uint8_t* _dest) {
+ const uint8_t* _src, uint8_t* _dest) {
_unshuffle(bytesoftype, blocksize, _src, _dest);
}
--- a/cmake/FindSSE.cmake
+++ b/cmake/FindSSE.cmake
@@ -49,6 +49,17 @@
set(AVX_FOUND false CACHE BOOL "AVX available on host")
ENDIF (AVX_TRUE)
ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "Detected architecture ${ARCHITECTURE}")
+ IF("${ARCHITECTURE}" STREQUAL "arm64")
+ set(SSE2_FOUND false CACHE BOOL "SSE2 available on host")
+ set(SSE3_FOUND false CACHE BOOL "SSE3 available on host")
+ set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
+ set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
+ set(AVX_FOUND false CACHE BOOL "AVX available on host")
+ return()
+ ENDIF()
+
EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE
CPUINFO)

View File

@@ -1,4 +0,0 @@
using python : @PYTHON_SHORT_VERSION@ : @PYTHON_BINARY@
: @LIBDIR@/python/include @LIBDIR@/python/include/python@PYTHON_SHORT_VERSION@m/
: @LIBDIR@/python/libs
;

View File

@@ -20,7 +20,7 @@
# ILMBASE_LIBRARIES - list of libraries to link against when using IlmBase.
# ILMBASE_FOUND - True if IlmBase was found.
# Other standard issue macros
# Other standarnd issue macros
include(FindPackageHandleStandardArgs)
include(FindPackageMessage)
include(SelectLibraryConfigurations)

View File

@@ -22,7 +22,7 @@
# These are defined by the FindIlmBase module.
# OPENEXR_FOUND - True if OpenEXR was found.
# Other standard issue macros
# Other standarnd issue macros
include(SelectLibraryConfigurations)
include(FindPackageHandleStandardArgs)
include(FindPackageMessage)

View File

@@ -1,22 +0,0 @@
cmake_minimum_required(VERSION 3.1)
project(libgmpxx)
include_directories(. cxx ${GMP_INCLUDE_DIR})
add_definitions(-D__GMP_WITHIN_GMPXX)
add_library(libgmpxx SHARED
cxx/dummy.cc
cxx/isfuns.cc
cxx/ismpf.cc
cxx/ismpq.cc
cxx/ismpz.cc
cxx/ismpznw.cc
cxx/limits.cc
cxx/osdoprnti.cc
cxx/osfuns.cc
cxx/osmpf.cc
cxx/osmpq.cc
cxx/osmpz.cc
)
target_link_libraries(libgmpxx ${GMP_LIBRARY})
install(TARGETS libgmpxx DESTINATION lib)

Some files were not shown because too many files have changed in this diff Show More