Pen tool #524
Merged
Pen tool #524
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…up and reorganized code; light optimization pass
…erial for the drawing looks
# Conflicts: # src/hub.html # src/network-schemas.js
Added activatable component, which allows a button to cause secondary activations to occur while an object is grabbed. Also made the pen "sticky" so it stays attached to your hand when you grab it. It can then only be dropped by using the "primary" grab button (e.g. grip buttons). The triggers now are "secondary_action" buttons, which work like normal except in the case that you are holding a sticky object, in which case they will not cause the object to be dropped.
… odd segments. Added timed delete per line. Fixed networking bug where line data could be sent before remote clients were fully initialized. Adding drawing manager that prevents multiple pens from drawing on the same drawing at the same time.
…hen using standard shader
…; disable space-bubble as default
…en-hover icon; enable spawning pen from in-world-hud; re-enable personal space bubble as default
…e media loader objects loaded for the first time lose their physics shape
… other; various enhancements
# Conflicts: # package-lock.json # src/components/super-spawner.js # src/hub.js # src/react-components/2d-hud.js
|
…onnections when that is not always true (client B can't assume it can message client A even if it has received a message from client A already)
…ce, especially when first loading into a room that has existing drawings.
gfodor
reviewed
Sep 7, 2018
| @@ -1,5 +1,6 @@ | |||
| import "./components/gltf-model-plus"; | |||
|
|
|||
| AFRAME.GLTFModelPlus.registerComponent("duck", "duck"); | |||
| AFRAME.GLTFModelPlus.registerComponent("quack", "quack"); | |||
There was a problem hiding this comment.
most important part of this PR
gfodor
reviewed
Sep 7, 2018
src/components/tools/pen.js
Outdated
| "#FF6600", | ||
| "#FFFFFF", | ||
| "#AAAAAA", | ||
| "#777777", |
There was a problem hiding this comment.
probably due to the unlit shader but to actually get a gradient of greys I bet it has to be something like #000000, #111111, #222222 or something
also we need brown so i can draw a proper goomba
There was a problem hiding this comment.
oh, we might want to include one or more flesh tones too
|
truly amazing work! having it be a workable sculpting tool was a great surprise too. media tools + pen tool = something magical is happening |
… fix issue where media-loader wasn't setting the bounding box corrrectly in certain cases
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a pen interactable that allows for 3d spatial drawing.
Generates procedural geometry using (modified) @fernandojsg's
sharedbuffergeometry.jsandsharedbuffergeometrymanager.jsfrom A-Painter.Adds a concept of "toggleable" for interactables. Objects that have a "toggle" class defined will not be dropped from your hand/cursor after initial grab. Only subsequent releases using the "primary" button will cause the object to be dropped. E.g. if grip is considered primary and trigger is secondary, grip or trigger will pick up the object, but after initial release, only the grip can cause the object to be dropped. (
grabbable-togglewas added which is 90% the same assuper-handsgrabbablebut has some additional logic to handle this concept.)Relies on a new component
activatableinsuper-hands: c-frame/aframe-super-hands-component#148 which allows secondary activations on grabbed/hovered objects.TODO:
super-spawnerto have hard-coded duck src (maybe part of a different PR)