Wykres commitów

205 Commity (f16f6ff5763f646f141e0a5247792cc98636ddcb)

Autor SHA1 Wiadomość Data
Atul Varma 7fc210f671
Add randomizer widget. (#87)
This replaces the "randomize colors" and "randomize" buttons on the creature and mandala pages with a single randomizer widget that allows the user to choose whether they want to randomize the colors, symbols, or both.

By default, both colors and symbols are randomized.

Note that this is really only a temporary solution, though: ideally we'll want to provide a more powerful UI that allows users to mark _any_ parameter for randomization, e.g. via "pinning" values or somesuch.
2021-04-08 20:13:54 -04:00
Atul Varma 25b708da47
Add random color sampling to debug page. (#86)
This adds a "random color sampling" section to the right side of the debug page.

I'm hoping this will make it easier for @mittimithai to work on his random color code, since it shows a bunch of random colors (100 right now) side-by-side, rather than requiring the developer to constantly click "randomize colors" on mandala/creature to get an idea of what the color spectrum looks like, 3 colors at a time.
2021-04-07 20:08:55 -04:00
Atul Varma db7d186234
Run prettier during CI. (#85)
Fixes #83.
2021-04-07 19:39:55 -04:00
mittimithai 558fa0aa6a
random colors now being sampled from hsluv (#80)
This samples colors from the HSLUV color space instead of the RGB color space, which should result in better randomized colors.
2021-04-06 20:33:08 -04:00
Atul Varma 1fb7be9f95 Make 'padding' in AutoSizingSvg optional. 2021-04-04 16:40:48 -04:00
Atul Varma 24eead10f8 Disable 'invert every other symbol' if needed. 2021-04-04 08:46:09 -04:00
Atul Varma dc13207b4d
Make animation duration changeable (#77)
This adds a slider that allows the duration of the mandala animation to be changed (for #71).

In so doing, it also decouples the animation speed from the display's refresh rate.
2021-04-04 08:34:29 -04:00
Atul Varma 2ce4f8a602 Factor out mandala-circle.tsx. 2021-04-03 18:47:43 -04:00
Atul Varma 6136253cd6
Add basic animation support to the mandala page (#75)
This addresses part of #71 by adding some basic animation support to the mandala page.
2021-04-03 17:01:13 -04:00
Atul Varma a13f989ab3 Use history.pushState() for internal links. 2021-04-02 21:17:44 -04:00
Atul Varma 8be5792838 Make mandala the default page. 2021-04-02 19:02:40 -04:00
Atul Varma 1cbe2b6d22
Improve layout (#74)
This improves the layout of all our pages to look more like the mandala page.

Additionally, some form widgets now have better layout, and the header takes up less vertical space.

At an implementation level, the component hierarchy of pages has been inverted to make this kind of layout easier.  Now fully laid-out pages are contained within `<Page>` components that are at the top of the component hierarchy, and which are defined by each specific page (mandala, creature, vocabulary, etc).

I had to do a few architectural things to avoid circular imports, though; most notably, this involved the creation of a new React context called a `PageContext`.

It uses CSS grid, which should be pretty well-supported amongst recent browsers.
2021-04-02 19:00:29 -04:00
Atul Varma e48b5f9bae
Factor out a SvgCompositionContext. (#72)
This fixes #67 by making the background color selection/randomization code more DRY via the addition of a new `SvgCompositionContext` and a `CompositionContextWidget`.

It also documents the `SvgSymbolContext` type, and moves the "randomize colors" button closer to the actual colors.
2021-04-02 16:33:07 -04:00
Atul Varma 7c05f78fd9 Only allow 20 max symbols in mandala. Fixes #69. 2021-04-02 15:37:58 -04:00
Atul Varma 2c53e5caab
Add a 'randomize colors' button to mandala and creature pages. (#68)
The random colors are currently terrible!  Maneesh will help us make them better. :)

Also, there is some annoying code duplication going on here between the creature and mandala pages, but I really wanted to add the button to both and also want to eat dinner soon, so I am filing #67 and saving the refactoring for later.
2021-03-30 20:59:45 -04:00
Atul Varma 5e74ce34ea
In mandala, add checkbox to invert every other symbol. (#66)
Fixes #64.
2021-03-29 15:23:37 -04:00
Atul Varma 63e9101d42
Make mandala UI layout a bit less terrible (#65)
The key phrase here is **less terrible**, as opposed to **good**.

Right now if the mandala gets too big for the page, it will just overflow and the remainder won't be visible (not even via scrolling).  This is intentional, though, as per @ninapaley's suggestion:

> I'm hoping you can change the way the image keeps resizing its canvas, and keeps justifying left.
> Maybe have an oversize canvas with the ring pinned to the center, and all the adjustment sliders
> on the right? Then they won't disappear if the canvas is too big. Also! I have an idea for an
> animated cycle that would require the symbols to eventually outgrow the canvas area and disappear.

I'm not super happy with this CSS, it doesn't feel terribly maintainable.  Ah well, maybe we can improve it later.
2021-03-29 13:03:54 -04:00
Atul Varma f6c95f1ffb Don't fill if showing specs on mandala. 2021-03-29 08:23:53 -04:00
Atul Varma 9aa0c6118f Add a search field in vocabulary page. 2021-03-29 07:58:50 -04:00
Atul Varma a917f40da9 Move page list to header for easier navigation. 2021-03-29 07:48:56 -04:00
Atul Varma 3090d9fd89
Add an 'Export PNG' button (#63)
This fixes #62.
2021-03-29 07:22:09 -04:00
Atul Varma 85533fa111 Use an eye w/ radius 300 for default mandala. 2021-03-29 06:54:36 -04:00
Atul Varma a70b4dfab3 Add a 'place behind first circle' checkbox. 2021-03-28 16:49:38 -04:00
Atul Varma d45cb3fb5c Add docs to AttachmentTransform. 2021-03-28 16:32:20 -04:00
Atul Varma b70ec50e3a Add symbol scaling/rotation options. 2021-03-28 16:22:36 -04:00
Atul Varma 05c44eeb51 Make scaling and rotation adjustable on both circles. 2021-03-28 09:14:54 -04:00
Atul Varma a5c4bd737b Put first mandala symbol at front of z-order. 2021-03-28 08:50:04 -04:00
Atul Varma 50eeb9a25b Always have a symbol pointing up in mandala. Allow negative radius. 2021-03-28 08:48:36 -04:00
Atul Varma d742f4156a Add an optional second mandala circle (#24). 2021-03-28 08:27:57 -04:00
Atul Varma c76bcc2d5a Factor out checkbox.tsx. 2021-03-28 07:38:32 -04:00
Atul Varma 131c1f31cb
Orient mandala symbols around their anchor point. (#60)
This orients the mandala symbols around their anchor point, rather than the center of their bounding box (#24).
2021-03-28 07:24:16 -04:00
Atul Varma 6fa6e0ba8a Simplify getDownloadFilename(). 2021-03-28 06:48:29 -04:00
Atul Varma 3f366c112a Rename SvgTransforms to SvgTransform, allow it to take a single transform. 2021-03-28 06:39:06 -04:00
Atul Varma d73116509c
Move SVG vocabulary from JSON to TS. (#59)
Ugh, we need to write out a TypeScript file instead of importing the JSON directly because otherwise the TS compiler will spend an inordinate amount of time doing type inference, which massively slows down type-checking (especially in IDEs and such).

The TS file actually uses `JSON.parse` on a stringified version of the JSON instead of just inlining the JSON itself because [apparently it's much faster][1].

[1]: https://www.bram.us/2019/11/25/faster-javascript-apps-with-json-parse/
2021-03-27 16:00:20 -04:00
Atul Varma 3095e5b16a Add randomize button to mandala page. 2021-03-27 15:19:36 -04:00
Atul Varma 9ce2d8df80 Factor out NumericRange type, inclusiveRange(). 2021-03-27 15:01:58 -04:00
Atul Varma 7cb4c3242d get rid of ValidateDOMNesting warnings 2021-03-27 08:34:22 -04:00
Atul Varma 51f68656ad Factor out vocabulary.ts. 2021-03-27 08:29:42 -04:00
Atul Varma a19a560b8f Auto-generate id attributes by default. 2021-03-27 08:11:07 -04:00
Atul Varma 4bd30bb2a5 Add SVG symbol widget picker to mandala page. 2021-03-27 08:04:40 -04:00
Atul Varma 249e5df219 Add more sliders, export svg btn to mandala page. 2021-03-27 07:39:21 -04:00
Atul Varma fbca3b65ba Factor out numeric-slider.tsx. 2021-03-27 07:24:15 -04:00
Atul Varma c7d1092cda Factor out ColorWidget component. 2021-03-27 07:14:42 -04:00
Atul Varma 8a54b62bdb
Move eye creature to a separate debug page. (#58)
Really the eye creature is only useful for me as a debugging tool, so this moves it over to a separate debug page.

It also removes the whole concept of randomizing the eye creature, mainly because it ignores all the rules set forth in the normal creature randomizer, so it's not terribly useful.

This simplifies the code for `creature-page.tsx` a bunch and hopefully makes it easier to understand.
2021-03-26 20:47:22 -04:00
Atul Varma 13907a7851 Use SvgTransforms in creature page. 2021-03-26 20:09:17 -04:00
Atul Varma f790838b06
Add a very basic Mandala page. (#57)
This adds an extremely simple Mandala page (for #24) with a single circle Mandala comprised of several eyes.  The symbol style is configurable, but parameters for the actual Mandala are not (yet).

Doing this also involved factoring out a `<SvgTransforms>` component, which makes setting up SVG transforms a bit easier.

Also moved `getSymbol` of `creature-page.tsx` and into `svg-vocabulary.tsx`, with the new name `getSvgSymbol`.
2021-03-26 18:07:01 -04:00
Atul Varma e69ce202da Oops, rename 'data' to 'assets' (#47). 2021-03-22 23:00:04 -04:00
Atul Varma 059c0528c7
Default complexity level to 2. (#55)
This fixes #53.  Note that this means the eye creature isn't observable from the UI, as moving the slider to "bonkers" shows the eye with parts randomly replaced.  The "pristine" eye creature can still be shown for debugging purposes by adding `&eye=on` to the end of the URL.
2021-03-22 20:54:01 -04:00
Atul Varma 233dbc379d
Move SVGs into data/symbols. (#54)
This fixes #47 by moving the SVGs into `data/symbols`.
2021-03-22 20:30:36 -04:00
Atul Varma 612195e2f2
Add attach_to metadata. (#52)
This fixes #49 by implementing the `attach_to` metadata property.
2021-03-18 19:32:05 -04:00
Atul Varma cb55b12243 Maintain inversion of nested symbols. Fixes #39. 2021-03-07 19:40:30 -05:00
Atul Varma 1405810526
Add checkbox for randomly inverting some symbols. (#43)
This fixes #39 by adding a "Randomly invert symbols" checkbox.

If the inversion is undesirable, disabling it will keep the existing creature but remove the inversion.

Note that this checkbox is only displayed when the creature complexity isn't bonkers.
2021-03-06 20:35:58 -05:00
Atul Varma ecf98deedb Add support for invert_nested (#17). 2021-03-05 19:38:25 -05:00
Atul Varma 5cf9408f55 Ignore empty groups in SVGs. Fixes #42. 2021-03-03 20:08:43 -05:00
Atul Varma 6ce30b15f6 Ignore spec colors we don't recognize. 2021-03-03 19:50:23 -05:00
Atul Varma 1824d7249b Add stroke/fill swap button. 2021-02-28 20:11:50 -05:00
Atul Varma 82f8972662 Always try to nest symbol in the center. Fixes #38. 2021-02-28 19:49:41 -05:00
Atul Varma b1b0176e4a Add support for never_be_nested metadata. 2021-02-28 19:10:53 -05:00
Atul Varma c62214186b Only log warnings for unrecognized metadata properties. 2021-02-28 18:57:51 -05:00
Atul Varma 80d8f5f72a
Massively refactor and simplify creature-symbol.tsx. (#37)
This refactors `creature-symbol.tsx` so that it doesn't have to rely on awkwardly introspecting `JSX.Element` instances to do its job.  Now all of that mumbo-jumbo, which is only really useful for when we want to manually construct symbols like the eye creature, is encapsulated in `creature-symbol-factory.tsx`.
2021-02-27 18:55:14 -05:00
Atul Varma 6aba6b665f
Add mouseover tooltips with debugging information (#35)
This adds a bit of debugging information on mouseover.

For example, a tooltip with the text `bird@tail.arm[0]` can be interpreted as "a bird symbol attached to the tail symbol's first arm attachment point."

The implementation is a bit funky: we basically annotate the SVG DOM with various `data` attributes, and on mouseover we traverse the DOM from the element the mouse is over all the way up to the SVG root element, picking out relevant `data` attributes and building a tooltip out of it.  This ended up being easier than e.g. passing a bunch of props down the whole tree in React.
2021-02-27 13:28:44 -05:00
Atul Varma c803c41bd0
Add support for nesting in random creature generation. (#34)
This builds upon #30 and #33 by adding support for randomly nested symbols in complexity levels 0-4 of the creature page.

Currently, we don't _recursively_ nest symbols, so e.g. we won't make an eye containing an eye containing a cube.  And for now we'll only add a nested symbol if the parent symbol has the `always_nest` metadata property defined.
2021-02-27 10:02:07 -05:00
Atul Varma 40d6120d5b Reorder code to make more sense. 2021-02-27 09:22:07 -05:00
Atul Varma 3ad6dd290f Add some doc comments. 2021-02-27 09:21:11 -05:00
Atul Varma 5a5030ceb6 Make creature error messages easier to read. 2021-02-27 09:00:18 -05:00
Atul Varma 87affa0a4c Move constant to top of file. 2021-02-27 08:51:42 -05:00
Atul Varma 4098a23482 Factor out creature-symbol.tsx. 2021-02-27 08:50:06 -05:00
Atul Varma 9a014dba56 Factor out export-svg.tsx. 2021-02-27 08:43:31 -05:00
Atul Varma 327f99fdae Factor out auto-sizing-svg.tsx. 2021-02-27 08:35:34 -05:00
Atul Varma 3e1b66a984
Add support for TOML symbol metadata. (#33)
This fixes #20 by adding support for TOML-based metadata for symbols.

There's now a template TOML file in `svg/_template.toml` that documents all the different metadata properties.  The file can be copied to match the name of an SVG file (but with a `.toml` extension) and it will be processed by the vocabulary builder when the site is generated.

Currently there are only two properties documented, `always_nest` and `always_be_nested` (as per the needs outlined in https://github.com/toolness/mystic-symbolic/issues/17#issuecomment-786696966), but they don't actually do anything yet (actual support for _using_ the metadata will come in another file).

Right now the TOML files are validated quite stringently: if a file contains the name of a property it doesn't understand, or the type of the property is wrong, it will raise an error. We can revisit this if it becomes burdensome.
2021-02-26 21:30:38 -05:00
Atul Varma 520ea6aff4
Add basic support for nesting. (#30)
This adds basic support for nesting (#17).  It does not swap fill/stroke colors based on the position of the nesting box, though. It also only nests a symbol in the eye creature and "bonkers" complexity setting for now--support for nesting in complexity levels 1-4 is forthcoming.

The nested symbol is essentially uniformly scaled as much as possible without extending outside the boundaries of its parent's nesting box.
2021-02-25 21:57:10 -05:00
Atul Varma 524288db91 Set default background color to #858585. Fixes #12. 2021-02-25 19:40:18 -05:00
Atul Varma f1bfc59c79 Don't attach things to anchor points. Fixes #29. 2021-02-23 11:46:00 -05:00
Atul Varma 154f1fe61a
Add multiple complexity levels for creature generation. (#28)
Fixes #18 by adding a random creature complexity slider. Currently slider values are 0, 1, 2, 3, 4, and bonkers.
2021-02-22 21:50:14 -05:00
Atul Varma 0125710064
Add anchor attachment point type. (#23)
This fixes #21 by changing the existing "tail" attachment point (`#ff0000`) to be called the "anchor" attachment point, since that's primarily what we're using it for.  It also adds a brand-new "tail" attachment point with color `#be0027`, which is expected to be oriented in the direction the tail should point (not the _opposite_ direction of the tail, which is how the old tail attachment point was oriented).

Note that this change means, for now, that no symbols have tail attachment points.  An error will be logged in the console when viewing the "Creature!" page for now because of this (since the default composition attaches a symbol to the tail), but as soon as Nina updates the SVGs, this should go away.
2021-02-21 21:13:14 -05:00
Atul Varma 7322740b14 Factor out convertSvgMarkupToSymbolData(), add test. 2021-02-21 20:54:36 -05:00
Atul Varma 5c903c0794 Allow stroke width to go to 0. Fixes #14. 2021-02-20 11:41:41 -05:00
Atul Varma 6f71305dd2
Add configurable bg color to creature page. (#19)
This fixes #12 by adding a background color picker to the creature page.

The default background color is `#cccccc`, which I _think_ is mid-gray.
2021-02-20 11:38:04 -05:00
Atul Varma 5c97a0e646 Set keyboard shortcut for randomize button (#13). 2021-02-20 11:07:57 -05:00
Atul Varma 19ead8b833 Deal gracefully w/ symbols that lack attachment points. 2021-02-18 22:25:11 -05:00
Atul Varma e89d613b38 Add a stroke width slider. 2021-02-18 22:13:01 -05:00
Nina Paley 4dafa463ec
Change "muscle arm" to "muscle_arm" in creature-page.tsx (#9) 2021-02-18 20:06:41 -05:00
Atul Varma f79214dfbb Work around unsupported transform-origin on Safari. 2021-02-17 12:37:24 -05:00
Atul Varma 3d04bdcd82 Group 'Export SVG' button with other buttons. 2021-02-17 09:14:06 -05:00
Atul Varma 68f5339e5f Add 'Export SVG' button. 2021-02-17 08:46:30 -05:00
Atul Varma 9d47ddf1b2 Add reset button. 2021-02-17 08:10:20 -05:00
Atul Varma b81f11fe76 Factor out SymbolContextWidget, use it on creature page. 2021-02-17 08:07:04 -05:00
Atul Varma 93225e9b6c Add more docs to readme, link to github repo in website. 2021-02-17 07:41:26 -05:00
Atul Varma 75c68bb1fb Use uniform, non-scaling-stroke. 2021-02-17 07:29:56 -05:00
Atul Varma f64c600825 Factor out <AutoSizingSvg>. 2021-02-16 20:54:05 -05:00
Atul Varma 6502d09177 Auto-resize SVG as needed. 2021-02-16 20:47:12 -05:00
Atul Varma 10341598ea Randomly replace creature parts. 2021-02-16 17:42:19 -05:00
Atul Varma 7db7c74516 Add left/right booleans to CreatureSymbolProps. 2021-02-16 17:11:41 -05:00
Atul Varma b2c073fa7c Factor out AttachmentTransform component. 2021-02-16 16:43:47 -05:00
Atul Varma d663915f0e
Make creature strokes non-scaling. (#6)
This attempts to manually scale the strokes on creatures so they aren't affected by scale.

The weird thing here is that applying `vector-effect="non-scaling-stroke"` does not appear to do the trick--rather, it makes all the strokes look _super heavy_.  So in this PR we scale the stroke by the inverse of whatever we're cumulatively scaling by when we're drawing something.
2021-02-16 13:36:14 -05:00
Atul Varma 2b27ae02a4
Fix math-related bugs in attachment code. (#5)
This fixes a bunch of bugs in our attachment-related code, and in so doing refactors things to make more sense, adds more tests, and also adds documentation.
2021-02-16 11:52:52 -05:00
Atul Varma 9ac1243249 Oops, fix type error. 2021-02-16 07:17:40 -05:00
Atul Varma aa87e3b77e Sort attachment points top to bottom, left to right. 2021-02-16 07:04:16 -05:00
Atul Varma cbf57f7fef Add more tests. 2021-02-16 06:49:45 -05:00
Atul Varma 6dfa738548 Add test suite. 2021-02-16 06:21:51 -05:00