Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(scene4-scen5): add scatter chart to scene4 & add scene5 #1

Merged
merged 3 commits into from
May 30, 2024
Merged

feat(scene4-scen5): add scatter chart to scene4 & add scene5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5586005
feat(scene4): add scatter chart
xiaoluoHe May 28, 2024
38d2644
feat(scene5): add scene5
xiaoluoHe May 29, 2024
af391fc
fix: add comment
xiaoluoHe May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/vstory/demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</head>

<body>
<!-- 视频 1920*1080, 等比例缩小 0.75 -->
<div id="root" style="width: 1440px; height: 810px"></div>
<div id="root"></div>
</body>
<script type="module" src="/src/App.tsx"></script>
</html>
Binary file added packages/vstory/demo/src/assets/scene5/atom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene5/bg-decoration.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene5/chart.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene5/text-en.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene5/text-zh.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene5/title-image.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 12 additions & 9 deletions packages/vstory/demo/src/demos/VChartSite/VChartSite.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { scene1, scene1Characters } from './scene1';
import { scene2, scene2Characters } from './scene2';
import { scene3, scene3Characters } from './scene3';
import { scene4, scene4Characters } from './scene4';
import { scene5, scene5Characters } from './scene5';

export const VChartSiteDemo = () => {
const id = 'storyBar';
Expand All @@ -13,24 +14,26 @@ export const VChartSiteDemo = () => {
// 准备一个图表
const tempSpec: IStorySpec = {
characters: [
...scene1Characters, //
...scene2Characters,
...scene3Characters,
...scene4Characters
// ...scene1Characters, //
// ...scene2Characters,
// ...scene3Characters,
// ...scene4Characters,
...scene5Characters
],
acts: [
{
id: 'default-chapter',
scenes: [
// scene1, //
// scene2,
scene3,
scene4
// scene3,
// scene4,
scene5
]
}
]
};
console.log(111, tempSpec);
console.log('dsl', tempSpec);
const story = new Story(tempSpec, { dom: id });
window.story = story;
story.play();
Expand Down Expand Up @@ -67,6 +70,6 @@ export const VChartSiteDemo = () => {
// story.getPlayer().tickTo(300 * i++);
// }, 300);
}, []);

return <div style={{ width: '100%', height: '100%' }} id={id}></div>;
/** 视频 1920*1080, 等比例缩小 0.75 */
return <div style={{ width: '1440px', height: '810px' }} id={id}></div>;
};
2 changes: 1 addition & 1 deletion packages/vstory/demo/src/demos/VChartSite/scene3.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ export const scene3: ISceneSpec = {
characterActions: [
{
action: 'disappear',
startTime: 3500,
startTime: 6500,
duration: 700,
payload: {
animation: {
Expand Down
234 changes: 234 additions & 0 deletions packages/vstory/demo/src/demos/VChartSite/scene4.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import RectTexture from '../../assets/scene4/matrix.png';
import DecorationImage from '../../assets/scene4/decoration.png';
import BgDecorationImage from '../../assets/scene4/bg-decoration.png';

const getCurve = (x: number) => {
return 0.0694 * x * x - 9.3056 * x + 321.1111; // 回归方程
};
export const scene4Characters: ICharacterSpec[] = [
{
type: 'ImageComponent',
Expand Down Expand Up @@ -116,6 +119,93 @@ export const scene4Characters: ICharacterSpec[] = [
}
}
},
{
type: 'ScatterChart',
id: 'scatter',
zIndex: 1,
position: {
left: 200,
top: 320,
width: 500,
height: 120
},
options: {
panel: {
fill: '#ffffff',
stroke: 'black',
lineWidth: 1
},
data: [
{
id: 'data',
values: [
{ x: 104, y: 10, type: 'A' },
{ x: 98, y: 10, type: 'A' },
{ x: 93, y: 10, type: 'A' },
{ x: 90, y: 10, type: 'A' },
{ x: 76, y: 10, type: 'A' },
{ x: 70, y: 10, type: 'A' },
{ x: 63, y: 10, type: 'A' }
]
}
],
seriesSpec: [
{
matchInfo: { specIndex: 'all' },
spec: {
background: 'white',
xField: 'x',
yField: 'y',
seriesField: 'type',
point: {
style: {
size: 8,
fill: `#E05F38`
}
},
axes: [
{
orient: 'bottom',
bandPadding: 0
}
],
animationUpdate: {
easing: 'cubicInOut',
duration: 1000
}
}
}
],
componentSpec: [
{
specKey: 'axes',
matchInfo: { orient: 'bottom', bandPadding: 0, paddingInner: 0, paddingOuter: 0 },
spec: {
bandPadding: 0,
paddingInner: 0,
paddingOuter: 0,
min: 0,
max: 110,
type: 'linear',
tick: { visible: false },
label: { visible: false },
grid: { visible: false },
domainLine: { visible: true, style: { stroke: 'black', lineWidth: 4 } }
}
},
{
specKey: 'axes',
matchInfo: { orient: 'left' },
spec: {
visible: false,
min: 0,
max: 100
}
}
],
attribute: {}
}
},
{
type: 'LineComponent',
id: 'scene4-text-zh-line',
Expand Down Expand Up @@ -219,6 +309,22 @@ export const scene4Characters: ICharacterSpec[] = [
}
}
},
{
type: 'ImageComponent',
id: 'scene4-bg-decoration',
zIndex: 1,
position: {
left: 180,
top: 680,
width: 1200,
height: 140
},
options: {
graphic: {
image: BgDecorationImage
}
}
},
{
type: 'ImageComponent',
id: 'scene4-bg-decoration',
Expand Down Expand Up @@ -374,6 +480,33 @@ export const scene4: ISceneSpec = {
easing: 'easeInOutQuad'
}
}
},
{
// TODO: startOffset
startTime: 2500,
duration: 700,
action: 'disappear',
payload: {
graphic: {
width: 500,
height: 120
},
animation: {
duration: 700
}
}
},
{
// TODO: startOffset
startTime: 5000,
duration: 500,
action: 'appear',
payload: {
animation: {
duration: 500,
effect: 'fade'
}
}
}
]
},
Expand Down Expand Up @@ -546,6 +679,107 @@ export const scene4: ISceneSpec = {
}
}
]
},
{
characterId: 'scatter',
characterActions: [
{
action: 'appear',
startTime: 2500,
duration: 500,
payload: {
animation: {
duration: 500,
easing: 'cubicOut',
fade: {
opacity: 1,
isBaseOpacity: true,
easing: 'linear'
}
}
}
},
{
action: 'update',
startTime: 3500,
duration: 1000,
payload: {
id: 'data',
data: [
{ x: 104, y: 10, type: 'A' },
{ x: 98, y: 10, type: 'A' },
{ x: 93, y: 10, type: 'A' },
{ x: 90, y: 10, type: 'A' },
{ x: 76, y: 10, type: 'A' },
{ x: 70, y: 10, type: 'A' },
{ x: 63, y: 10, type: 'A' }
].map(v => {
return {
sourceValue: v,
targetValue: {
...v,
y: getCurve(v.x)
}
};
})
}
},
{
action: 'disappear',
startTime: 5000,
duration: 500,
payload: {
animation: {
duration: 500,
effect: 'fade'
}
}
}
]
}
]
};

scene4.actions.forEach(({ characterActions }) => {
characterActions.push({
action: 'disappear',
startTime: 6000,
duration: 500,
payload: {
animation: {
duration: 500,
effect: 'fade'
}
}
});
});

scene4.actions.push({
characterId: 'scene3-background',
characterActions: [
{
action: 'style',
startTime: 6000,
duration: 500,
payload: {
graphic: {
scaleY: 0
},
animation: {
duration: 500
}
}
},
{
action: 'disappear',
startTime: 6000,
duration: 500,
payload: {
animation: {
duration: 500,
effect: 'fade'
}
}
}
]
});
Loading
Loading