-
Notifications
You must be signed in to change notification settings - Fork 325
NEW: MouseEvents for InputSystem Samples & Tests #2207
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ritamerkl
wants to merge
10
commits into
develop
Choose a base branch
from
mouseevents-samles-tests
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
857e304
added a very basic mouse events sample
ritamerkl 3cc804f
added MouseEventScript
ritamerkl dcf359a
added mouse events test for pen and mouse
ritamerkl b1cf800
add changelog
ritamerkl b0201e1
added defines and outsourced code duplication
ritamerkl bab6e35
mention editor version in changelog
ritamerkl c3e5dc3
remove enhanced touch enable
ritamerkl 8f2c237
Merge branch 'develop' into mouseevents-samles-tests
ritamerkl 167eb0f
added touch test
ritamerkl ff22909
added more touch tests
ritamerkl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
using System; | ||
using UnityEngine; | ||
using UnityEngine.InputSystem; | ||
using UnityEngine.InputSystem.EnhancedTouch; | ||
using Touch = UnityEngine.InputSystem.EnhancedTouch.Touch; | ||
|
||
public class OnMouseEventsTest : MonoBehaviour | ||
{ | ||
private Vector3 screenPoint; | ||
private Vector3 offset; | ||
|
||
void OnMouseDown() | ||
{ | ||
screenPoint = Camera.main.WorldToScreenPoint(gameObject.transform.position); | ||
float x; | ||
float y; | ||
if (Pointer.current != null) | ||
{ | ||
x = Pointer.current.position.x.value; | ||
y = Pointer.current.position.y.value; | ||
} | ||
else // Fallback to InputManager if InputSystem is not available | ||
{ | ||
x = Input.mousePosition.x; | ||
y = Input.mousePosition.y; | ||
} | ||
offset = gameObject.transform.position - Camera.main.ScreenToWorldPoint(new Vector3(x, y, screenPoint.z)); | ||
} | ||
|
||
void OnMouseDrag() | ||
{ | ||
Vector3 curScreenPoint; | ||
if (Pointer.current != null) | ||
curScreenPoint = new Vector3(Pointer.current.position.x.value, Pointer.current.position.y.value, screenPoint.z); | ||
else // Fallback to InputManager if InputSystem is not available | ||
curScreenPoint = new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z); | ||
|
||
Vector3 curPosition = Camera.main.ScreenToWorldPoint(curScreenPoint) + offset; | ||
transform.position = curPosition; | ||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to support InputManager on this tests? I would assume they are covered by their original tests in trunk...