Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
N
Neos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
deft
Neos
Commits
8e4708ae
Commit
8e4708ae
authored
Jan 01, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rerange hands.tsx
parent
53b3a0bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
28 deletions
+46
-28
src/ui/Duel/hands.tsx
src/ui/Duel/hands.tsx
+33
-28
src/ui/Duel/util.ts
src/ui/Duel/util.ts
+13
-0
No files found.
src/ui/Duel/hands.tsx
View file @
8e4708ae
...
@@ -14,22 +14,27 @@ import { useHover } from "react-babylonjs";
...
@@ -14,22 +14,27 @@ import { useHover } from "react-babylonjs";
import
{
useClick
}
from
"
./hook
"
;
import
{
useClick
}
from
"
./hook
"
;
import
{
useState
,
useRef
,
useEffect
}
from
"
react
"
;
import
{
useState
,
useRef
,
useEffect
}
from
"
react
"
;
import
{
useSpring
,
animated
}
from
"
./spring
"
;
import
{
useSpring
,
animated
}
from
"
./spring
"
;
import
{
zip
}
from
"
./util
"
;
const
groundShape
=
CONFIG
.
GroundShape
();
const
groundShape
=
CONFIG
.
GroundShape
();
const
left
=
-
(
groundShape
.
width
/
2
);
const
left
=
-
(
groundShape
.
width
/
2
);
const
handShape
=
CONFIG
.
HandShape
();
const
handRotation
=
CONFIG
.
HandRotation
();
const
Hands
=
()
=>
{
const
Hands
=
()
=>
{
const
hands
=
useAppSelector
(
selectMeHands
).
cards
;
const
meHands
=
useAppSelector
(
selectMeHands
).
cards
;
const
meHandPositions
=
handPositons
(
0
,
meHands
);
return
(
return
(
<>
<>
{
hands
.
map
((
hand
,
idx
)
=>
{
{
zip
(
meHands
,
meHandPositions
).
map
(([
hand
,
position
]
,
idx
)
=>
{
return
(
return
(
<
CHand
<
CHand
state=
{
hand
}
idx=
{
idx
}
key=
{
idx
}
key=
{
idx
}
gap=
{
groundShape
.
width
/
(
hands
.
length
-
1
)
}
state=
{
hand
}
sequence=
{
idx
}
position=
{
position
}
rotation=
{
handRotation
}
/>
/>
);
);
})
}
})
}
...
@@ -37,25 +42,22 @@ const Hands = () => {
...
@@ -37,25 +42,22 @@ const Hands = () => {
);
);
};
};
const
CHand
=
(
props
:
{
state
:
Hand
;
idx
:
number
;
gap
:
number
})
=>
{
const
CHand
=
(
props
:
{
const
handShape
=
CONFIG
.
HandShape
();
state
:
Hand
;
const
rotation
=
CONFIG
.
HandRotation
();
sequence
:
number
;
position
:
BABYLON
.
Vector3
;
rotation
:
BABYLON
.
Vector3
;
})
=>
{
const
hoverScale
=
CONFIG
.
HandHoverScaling
();
const
hoverScale
=
CONFIG
.
HandHoverScaling
();
const
defaultScale
=
new
BABYLON
.
Vector3
(
1
,
1
,
1
);
const
defaultScale
=
new
BABYLON
.
Vector3
(
1
,
1
,
1
);
const
edgesWidth
=
2.0
;
const
edgesWidth
=
2.0
;
const
edgesColor
=
BABYLON
.
Color4
.
FromColor3
(
BABYLON
.
Color3
.
Yellow
());
const
edgesColor
=
BABYLON
.
Color4
.
FromColor3
(
BABYLON
.
Color3
.
Yellow
());
const
planeRef
=
useRef
(
null
);
const
planeRef
=
useRef
(
null
);
const
[
state
,
idx
]
=
[
props
.
state
,
props
.
idx
]
;
const
state
=
props
.
state
;
const
[
hovered
,
setHovered
]
=
useState
(
false
);
const
[
hovered
,
setHovered
]
=
useState
(
false
);
const
dispatch
=
store
.
dispatch
;
const
dispatch
=
store
.
dispatch
;
const
[
position
,
setPosition
]
=
useState
(
const
[
position
,
setPosition
]
=
useState
(
props
.
position
);
new
BABYLON
.
Vector3
(
left
+
props
.
gap
*
props
.
idx
,
handShape
.
height
/
2
,
-
(
groundShape
.
height
/
2
)
-
1
)
);
const
[
spring
,
api
]
=
useSpring
(
const
[
spring
,
api
]
=
useSpring
(
()
=>
({
()
=>
({
...
@@ -76,18 +78,12 @@ const CHand = (props: { state: Hand; idx: number; gap: number }) => {
...
@@ -76,18 +78,12 @@ const CHand = (props: { state: Hand; idx: number; gap: number }) => {
);
);
useEffect
(()
=>
{
useEffect
(()
=>
{
const
newPosition
=
new
BABYLON
.
Vector3
(
left
+
props
.
gap
*
props
.
idx
,
handShape
.
height
/
2
,
-
(
groundShape
.
height
/
2
)
-
1
);
api
.
start
({
api
.
start
({
position
:
newPosition
,
position
,
});
});
setPosition
(
newP
osition
);
setPosition
(
p
osition
);
},
[
p
rops
.
idx
,
props
.
gap
]);
},
[
p
osition
]);
useHover
(
useHover
(
()
=>
setHovered
(
true
),
()
=>
setHovered
(
true
),
...
@@ -122,19 +118,19 @@ const CHand = (props: { state: Hand; idx: number; gap: number }) => {
...
@@ -122,19 +118,19 @@ const CHand = (props: { state: Hand; idx: number; gap: number }) => {
// @ts-ignore
// @ts-ignore
<
animated
.
transformNode
name=
""
>
<
animated
.
transformNode
name=
""
>
<
animated
.
plane
<
animated
.
plane
name=
{
`hand-${
idx
}`
}
name=
{
`hand-${
props.sequence
}`
}
ref=
{
planeRef
}
ref=
{
planeRef
}
width=
{
handShape
.
width
}
width=
{
handShape
.
width
}
height=
{
handShape
.
height
}
height=
{
handShape
.
height
}
scaling=
{
hovered
?
hoverScale
:
defaultScale
}
scaling=
{
hovered
?
hoverScale
:
defaultScale
}
position=
{
spring
.
position
}
position=
{
spring
.
position
}
rotation=
{
rotation
}
rotation=
{
props
.
rotation
}
enableEdgesRendering
enableEdgesRendering
edgesWidth=
{
state
.
interactivities
.
length
==
0
?
0
:
edgesWidth
}
edgesWidth=
{
state
.
interactivities
.
length
==
0
?
0
:
edgesWidth
}
edgesColor=
{
edgesColor
}
edgesColor=
{
edgesColor
}
>
>
<
animated
.
standardMaterial
<
animated
.
standardMaterial
name=
{
`hand-mat-${
idx
}`
}
name=
{
`hand-mat-${
props.sequence
}`
}
diffuseTexture=
{
diffuseTexture=
{
new
BABYLON
.
Texture
(
new
BABYLON
.
Texture
(
`https://cdn02.moecube.com:444/images/ygopro-images-zh-CN/${state.meta.id}.jpg`
`https://cdn02.moecube.com:444/images/ygopro-images-zh-CN/${state.meta.id}.jpg`
...
@@ -172,4 +168,13 @@ function interactTypeToString(t: InteractType): string {
...
@@ -172,4 +168,13 @@ function interactTypeToString(t: InteractType): string {
}
}
}
}
const
handPositons
=
(
player
:
number
,
hands
:
Hand
[])
=>
{
const
gap
=
groundShape
.
width
/
(
hands
.
length
-
1
);
const
y
=
handShape
.
height
/
2
;
const
z
=
player
==
0
?
-
(
groundShape
.
height
/
2
)
-
1
:
groundShape
.
height
/
2
+
1
;
return
hands
.
map
((
_
,
idx
)
=>
new
BABYLON
.
Vector3
(
left
+
gap
*
idx
,
y
,
z
));
};
export
default
Hands
;
export
default
Hands
;
src/ui/Duel/util.ts
0 → 100644
View file @
8e4708ae
export
function
zip
<
S1
,
S2
>
(
firstCollection
:
Array
<
S1
>
,
lastCollection
:
Array
<
S2
>
):
Array
<
[
S1
,
S2
]
>
{
const
length
=
Math
.
min
(
firstCollection
.
length
,
lastCollection
.
length
);
const
zipped
:
Array
<
[
S1
,
S2
]
>
=
[];
for
(
let
index
=
0
;
index
<
length
;
index
++
)
{
zipped
.
push
([
firstCollection
[
index
],
lastCollection
[
index
]]);
}
return
zipped
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment