Commit graph

158 commits

Author SHA1 Message Date
4af251d1c8 Revert "[Metaballs] Remove all the menus"
This reverts commit e994708218.
2017-08-09 08:57:39 -07:00
f95ddd4f5c [app] Fix up the alpha feathering 2017-08-09 08:55:51 -07:00
99fe2147ad [app] Copy the rawValue of the colorStyle enum into the buffer 2017-08-09 08:52:05 -07:00
17e91b13b6 [app] Move a bunch of the shader code around
Move blending and color picking methods into separate functions.
Switch based on color style
2017-08-08 12:39:31 -07:00
97d5424fed [app] Create the Field in the initializer so we can pass in some default parameters 2017-08-08 12:38:21 -07:00
a7a1cc244b [kit] Fix the build fallout of the previous commit
Oops.
2017-08-08 12:37:35 -07:00
aa7b1ffe9d [kit] Make a bunch of data structures public 2017-08-08 12:36:33 -07:00
c84681559e [app,fw] Pass color information into the shader 2017-08-08 11:52:48 -07:00
48748f53e7 [Metaballs] Emoji are important 2017-08-08 11:32:24 -07:00
861c8a149b [Metaballs] Alpha blend~ 2017-08-06 12:12:07 -07:00
1f2469f686 [Metaballs] Fallout from changes to MetaballsKit 2017-08-06 11:40:35 -07:00
48365abee3 [MetaballsKit] Add parameters field to get ready for colors 2017-08-06 11:40:13 -07:00
cceb00dfe0 [MetaballsKit] Add Memory file 2017-08-06 11:39:18 -07:00
aa48b29e21 [Metaballs] Blend between a blue and purple 2017-08-06 10:00:53 -07:00
ebbaee4efa [Metaballs] Remove a TODO 2017-08-06 10:00:26 -07:00
fdcf62db74 [MetaballsKit] Just replace balls when size changes 2017-08-06 08:25:13 -07:00
357db9a248 [all] Add a ball on click; regenerate the field on right click 2017-08-06 08:24:50 -07:00
9297302a75 [Metaballs] Name the window 2017-08-06 08:24:01 -07:00
a49c370ceb [all] Remove old compute shader code 2017-08-06 07:55:53 -07:00
ddc0938ae4 [MetaballsKit] Comment out the "Populated ball [x]" logging for now... 2017-08-06 07:54:25 -07:00
bb4bdd1568 [MetaballsKit] In order to modify the actual Ball instance, you have to reference it by index each time (I think) 2017-08-06 07:54:15 -07:00
515218a66e [Metaballs] Update the field before rendering 2017-08-06 07:54:07 -07:00
79236d805b [Metaballs] Randomly position and give velocity to balls when they are added
Add 10 balls to the field on start!
2017-08-06 07:48:26 -07:00
8dcd0910f1 [all] It works! 2017-08-05 13:38:46 -07:00
dfa603012f [Metaballs] Do all the texture generation in the fragment shader 2017-08-05 11:10:30 -07:00
8b4f2d8cc2 [MetaballsKit] Do not compute a texture, just provide buffers for balls and parameter data 2017-08-05 11:10:06 -07:00
2441bd0b76 [MetaballsKit] Add Geometry file 2017-08-05 11:09:03 -07:00
d8c319bd9b [Metaballs] Do not commit too early 2017-08-05 09:32:02 -07:00
0875028e48 [Metaballs] Renderer requires a delegate 2017-08-05 09:31:51 -07:00
fd2f2251bf [Metaballs] Clean up declaration of Vertex data 2017-08-05 09:30:55 -07:00
5c37010229 [MetaballsKit] Reset the parametersBuffer as needed 2017-08-05 09:30:09 -07:00
d08f4a7e23 [MetaballsKit] Better error handling 2017-08-05 09:29:50 -07:00
0c175acc79 [MetaballsKit] Center balls added to the field 2017-08-05 09:29:13 -07:00
eff20b8b93 [Metaballs] A few misc changes to the ViewController's field property
Also set the delegate of the renderer.
2017-08-05 09:05:27 -07:00
463246df36 [Metaballs] A Metal graphics pipeline that builds and runs but crashes 2017-08-05 09:04:43 -07:00
b52e16debe [MetaballsKit] sampleTexture is public 2017-08-05 09:03:55 -07:00
b7a30c46ae [MetaballsKit] Sort out runtime errors 2017-08-04 22:24:15 -07:00
e971d0dbca [Metaballs] The ViewController is the bridge between the Field and the Renderer 2017-08-04 21:16:07 -07:00
ea3638d12c [Metaballs] Remove all AppDelegate code
It all went to the ViewController
2017-08-04 21:12:35 -07:00
22fbaed88c [MetaballsKit] Fix up didSet responder for Field.size 2017-08-04 21:10:52 -07:00
da5c664ee6 [MetaballsKit] Finish off Metal compute stuff for the simulation 2017-08-04 08:06:33 -07:00
467f9d4123 [MetaballsKit] Get the Metal setup stuff straightened out 2017-08-02 08:08:56 -07:00
0aab90b693 [MetaballsKit] Implement sampling kernel 2017-08-01 19:13:20 -07:00
cacdba4555 [Metaballs] Remove sampling kernel from Metal file 2017-08-01 19:01:43 -07:00
2b409afc2d [MetaballsKit] Add a metal file to the framework 2017-08-01 19:01:20 -07:00
3ddc484037 [MetaballsKit] Put a bunch of Metal stuff in the Field class 2017-08-01 19:01:03 -07:00
2e70c76fb0 [MetaballsKit] Make Field a class 2017-08-01 07:54:29 -07:00
fda6890669 Link MetaballsKit with MetalKit 2017-08-01 07:54:04 -07:00
99739a5d63 [Metaballs] Fragment shader, stubs for vertex and sample shaders 2017-07-30 20:40:10 -07:00
fc57f865f2 [MetaballsKit] Make Field.size public and filter balls that lie outside the size when it changed 2017-07-30 15:53:10 -07:00