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.

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

Chore update engine line(finished) #2130

Merged
merged 30 commits into from
Dec 11, 2023
Merged

Chore update engine line(finished) #2130

merged 30 commits into from
Dec 11, 2023

Conversation

lzxue
Copy link
Contributor

@lzxue lzxue commented Dec 7, 2023

[English Template / 英文模板]

🤔 这个变动的性质是?

  • 新特性提交
  • 日常 bug 修复
  • 站点、文档改进
  • 演示代码改进
  • 组件样式/交互改进
  • TypeScript 定义更新
  • 包体积优化
  • 性能优化
  • 功能增强
  • 国际化改进
  • 重构
  • 代码风格优化
  • 测试用例
  • 分支合并
  • 工作流程
  • 版本更新
  • 其他改动(是关于什么的改动?)

🔗 相关 Issue

💡 需求背景和解决方案

📝 更新日志

语言 更新描述
🇺🇸 英文
🇨🇳 中文

☑️ 请求合并前的自查清单

⚠️ 请自检并全部勾选全部选项⚠️

  • 文档已补充或无须补充
  • 代码演示已提供或无须提供
  • TypeScript 定义已补充或无须补充
  • Changelog 已提供或无须提供

taiyuanhy and others added 17 commits December 1, 2023 10:50
* feat: 切换fillImage到G引擎

* feat: 补充上体提交代码

* feat: radar和fillImage支持G引擎(有bug)

* fix: 调整radar中uniform块中对象的顺序(遍历时一般按照unicode排序)

* fix: 修改radar shader中的拼写错误

---------

Co-authored-by: huyang <[email protected]>
chore: 升级线图层到G-Device引擎
# Conflicts:
#	dev-demos/features/point/pointFillImage.md
#	packages/layers/src/core/CommonStyleAttribute.ts
#	packages/layers/src/point/models/fillImage.ts
#	packages/layers/src/point/models/radar.ts
#	packages/layers/src/point/shaders/image/fillImage_frag.glsl
#	packages/layers/src/point/shaders/image/fillImage_vert.glsl
#	packages/renderer/src/regl/ReglModel.ts
@taiyuanhy
Copy link
Contributor

todo:greateCircle和flow有uniformBlock长度错乱的问题

@taiyuanhy
Copy link
Contributor

arc_3d.ts功能貌似完全覆盖了earthArc_3d.ts,后者没有升级

@xiaoiver
Copy link
Contributor

xiaoiver commented Dec 8, 2023

原因是 Shader 中 UniformBlock 少了一个空格,导致解析时没匹配上正则(稍后我会在底层修改下兼容):

// before
layout(std140) uniform commonUniforms{

// after
layout(std140) uniform commonUniforms {

另外在 Buffer 上新增了 label 便于 debug:

this.commonUnifoms = this.rendererService.createBuffer({
  data: new Float32Array(
    MultipleOfFourNumber(commonUniforms.uniformsLength),
  ).fill(0),
  isUBO: true,
  label: 'commonUniforms', // 添加一个标签
});

这样在使用 Spector.js 时可以查看 metadata:

ECCEDC7A-F4FB-4B68-9281-BC586178FBB3

@xiaoiver
Copy link
Contributor

xiaoiver commented Dec 8, 2023

更新到 @antv/[email protected] 即可

huyang added 4 commits December 8, 2023 16:45
…into chore_updateEngine_line

# Conflicts:
#	packages/layers/src/line/shaders/line_arc_great_circle_frag.glsl
#	packages/layers/src/line/shaders/line_arc_great_circle_vert.glsl
@taiyuanhy
Copy link
Contributor

目前基本完成所有线的迁移
发现一个bug:在device引擎下,如果添加两个线图层,第二个线图层的位置会有问题,simplelines.tsx示例可以复现,而使用regl则没这个问题。不确定是否是迁移导致的。

@taiyuanhy taiyuanhy changed the title [wip]Chore update engine line Chore update engine line(finished) Dec 8, 2023
@taiyuanhy taiyuanhy changed the title Chore update engine line(finished) Chore update engine line(finished) Dec 8, 2023
@lzxue
Copy link
Contributor Author

lzxue commented Dec 8, 2023

目前基本完成所有线的迁移 发现一个bug:在device引擎下,如果添加两个线图层,第二个线图层的位置会有问题,simplelines.tsx示例可以复现,而使用regl则没这个问题。不确定是否是迁移导致的。

这个应该是渲染流程的问题,估计之前绘制的被清除了

@lzxue lzxue merged commit 2eecf81 into master Dec 11, 2023
6 checks passed
@lzxue lzxue deleted the chore_updateEngine_line branch December 11, 2023 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

L7 3.0 引擎升级-线图层-多人认领
3 participants