Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
Hubs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ar-noc
Hubs
Commits
fff303ae
Commit
fff303ae
authored
6 years ago
by
Kevin Lee
Browse files
Options
Downloads
Patches
Plain Diff
lint fixes
parent
1505caec
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/super-spawner.js
+1
-1
1 addition, 1 deletion
src/components/super-spawner.js
src/react-components/2d-hud.js
+2
-11
2 additions, 11 deletions
src/react-components/2d-hud.js
with
3 additions
and
12 deletions
src/components/super-spawner.js
+
1
−
1
View file @
fff303ae
...
@@ -103,7 +103,7 @@ AFRAME.registerComponent("super-spawner", {
...
@@ -103,7 +103,7 @@ AFRAME.registerComponent("super-spawner", {
this
.
heldEntities
.
clear
();
this
.
heldEntities
.
clear
();
},
},
async
onSpawnEvent
(
e
)
{
async
onSpawnEvent
()
{
const
hand
=
this
.
data
.
defaultHand
;
const
hand
=
this
.
data
.
defaultHand
;
if
(
this
.
cooldownTimeout
||
!
hand
)
{
if
(
this
.
cooldownTimeout
||
!
hand
)
{
...
...
This diff is collapsed.
Click to expand it.
src/react-components/2d-hud.js
+
2
−
11
View file @
fff303ae
...
@@ -4,7 +4,7 @@ import cx from "classnames";
...
@@ -4,7 +4,7 @@ import cx from "classnames";
import
styles
from
"
../assets/stylesheets/2d-hud.scss
"
;
import
styles
from
"
../assets/stylesheets/2d-hud.scss
"
;
const
TopHUD
=
({
muted
,
frozen
,
spacebubble
,
onToggleMute
,
onToggleFreeze
,
onToggleSpaceBubble
,
onSpawnPen
})
=>
(
const
TopHUD
=
({
muted
,
frozen
,
onToggleMute
,
onToggleFreeze
,
onSpawnPen
})
=>
(
<
div
className
=
{
cx
(
styles
.
container
,
styles
.
top
)}
>
<
div
className
=
{
cx
(
styles
.
container
,
styles
.
top
)}
>
<
div
className
=
{
cx
(
"
ui-interactive
"
,
styles
.
panel
,
styles
.
left
)}
>
<
div
className
=
{
cx
(
"
ui-interactive
"
,
styles
.
panel
,
styles
.
left
)}
>
<
div
<
div
...
@@ -19,14 +19,7 @@ const TopHUD = ({ muted, frozen, spacebubble, onToggleMute, onToggleFreeze, onTo
...
@@ -19,14 +19,7 @@ const TopHUD = ({ muted, frozen, spacebubble, onToggleMute, onToggleFreeze, onTo
onClick
=
{
onToggleFreeze
}
onClick
=
{
onToggleFreeze
}
/
>
/
>
<
div
className
=
{
cx
(
"
ui-interactive
"
,
styles
.
panel
,
styles
.
right
)}
>
<
div
className
=
{
cx
(
"
ui-interactive
"
,
styles
.
panel
,
styles
.
right
)}
>
<
div
<
div
className
=
{
cx
(
styles
.
iconButton
,
styles
.
spawn_pen
)}
title
=
{
"
Drawing Pen
"
}
onClick
=
{
onSpawnPen
}
/
>
// className={cx(styles.iconButton, styles.bubble, { [styles.active]: spacebubble })}
// title={spacebubble ? "Disable Bubble" : "Enable Bubble"}
// onClick={onToggleSpaceBubble}
className
=
{
cx
(
styles
.
iconButton
,
styles
.
spawn_pen
)}
title
=
{
"
Drawing Pen
"
}
onClick
=
{
onSpawnPen
}
/
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
);
);
...
@@ -34,10 +27,8 @@ const TopHUD = ({ muted, frozen, spacebubble, onToggleMute, onToggleFreeze, onTo
...
@@ -34,10 +27,8 @@ const TopHUD = ({ muted, frozen, spacebubble, onToggleMute, onToggleFreeze, onTo
TopHUD
.
propTypes
=
{
TopHUD
.
propTypes
=
{
muted
:
PropTypes
.
bool
,
muted
:
PropTypes
.
bool
,
frozen
:
PropTypes
.
bool
,
frozen
:
PropTypes
.
bool
,
spacebubble
:
PropTypes
.
bool
,
onToggleMute
:
PropTypes
.
func
,
onToggleMute
:
PropTypes
.
func
,
onToggleFreeze
:
PropTypes
.
func
,
onToggleFreeze
:
PropTypes
.
func
,
onToggleSpaceBubble
:
PropTypes
.
func
,
onSpawnPen
:
PropTypes
.
func
onSpawnPen
:
PropTypes
.
func
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment