BigC
/
ArchitectureColoredPainting
4
2
Fork 0
Code Issues 6 Pull Requests Projects Releases 5 Wiki Activity
280 Commits
6 Branches
5 Tags
133 MiB
Commit Graph

272 Commits (769effe49cd819435d7506f04ba46e00521e4929)

Author SHA1 Message Date
ArgonarioD 073f68e360 初步实现了编辑器中的StrokeStyle 
[style/stroke] 实现了行删除
[style/stroke] 基本稳定了strokeStyle的修改
[paint] 令drawElement时会应用style
[style] 修改了LayerStyle
[editor] 新增了ColorPicker类和StrokeStyleListView类
 2023-03-15 11:43:16 +08:00
yang.yongquan 73e63f3817 merge 2023-03-15 11:25:14 +08:00
yang.yongquan d47d94d044 增加了对于Painting的转换，没有考虑线宽的情况 2023-03-15 11:23:26 +08:00
wuyize 57d6de47f8 Fix: painting.comp bug 2023-03-15 11:23:21 +08:00
wuyize c6a4d79888 补充了StrokeEndType 2023-03-15 00:09:30 +08:00
wuyize 4ec58dbb8b FIX: 多样式不生效 2023-03-14 23:39:56 +08:00
wuyize cf3dd43a4a Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-14 22:44:43 +08:00
wuyize 62b9c2b026 FIX: style的bug 2023-03-14 22:44:23 +08:00
karlis 97097fcc3a 修改旋转判定，添加style渲染接口 2023-03-14 15:36:19 +08:00
karlis eab8d7aeec Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-14 15:14:25 +08:00
karlis 684c28dafd bug fix 2023-03-14 15:02:49 +08:00
karlis 72f0f78e64 bug fix 2023-03-14 14:53:36 +08:00
karlis 3f1421a1bd bug:黑屏 2023-03-14 00:20:31 +08:00
karlis 4c9fe168a9 bug: pixmap溢出 2023-03-13 23:36:31 +08:00
karlis de9d7143b6 添加【可能存在问题的】拖拽和旋转 2023-03-13 21:06:05 +08:00
karlis ed4c3c0064 实现【位置错误的】LayerBounding虚线框 2023-03-13 20:47:35 +08:00
wuyize 0d42af9200 实现彩绘纹理部分替换 2023-03-13 13:48:20 +08:00
ArgonarioD acd25b4964 temp fix: 编译不通过的问题 
为PaintingUtil中的transformToPainting函数临时添加了返回值，需要在后续修改
 2023-03-11 23:34:13 +08:00
karlis e3217aa134 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-11 22:58:31 +08:00
karlis 2cb25b8607 添加Layer的组合元素创建 2023-03-11 22:57:23 +08:00
yang.yongquan 631f0f8af7 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-11 19:52:39 +08:00
yang.yongquan 50acb3b625 转换为Painting类，（z轴、线宽、测试） 2023-03-11 19:52:36 +08:00
karlis c92a3553ce 修改getReferencedBy为动态 2023-03-11 18:33:56 +08:00
wuyize 4bfdb0d9f6 Fix: 模型包围盒计算错误 2023-03-10 23:24:19 +08:00
karlis ca8d68fe93 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-10 19:44:34 +08:00
karlis 3dd7fd7c0f bug fix 2023-03-10 19:44:18 +08:00
wuyize 6508f54333 MaterialStyle加入深拷贝方法clone 2023-03-10 19:41:06 +08:00
ArgonarioD b981056674 将LayerStyleDialog改为了修改拷贝对象 
MaterialStyle的拷贝有问题，导致编译报错
 2023-03-10 17:00:52 +08:00
ArgonarioD 293c1f3096 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-10 16:07:54 +08:00
ArgonarioD 65e03ed3ba 修改了MaterialStyle的属性访问权限 2023-03-10 16:07:21 +08:00
ArgonarioD 94b16ac536 修改了LayerStyle的materialStyles的类型，添加了深拷贝构造函数 2023-03-10 16:07:07 +08:00
ArgonarioD 7c7cd02d71 移动了LayerStyleDialog所在的文件夹 2023-03-10 16:06:33 +08:00
wuyize 520597e288 添加MaterialStyleStroke的拷贝构造 2023-03-10 16:04:29 +08:00
ArgonarioD 15e2522591 让图层功能暂时能用了 2023-03-10 14:08:40 +08:00
ArgonarioD 14a1502a22 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-10 13:58:11 +08:00
ArgonarioD 846f334d54 完成style的基本构架 2023-03-10 13:57:57 +08:00
karlis fedb147dd3 FIX: Crash U 2023-03-09 23:31:55 +08:00
wuyize d0cbdd65ec 解决ElementRenderer线程无法退出的问题 2023-03-09 22:54:33 +08:00
wuyize f504480050 解决线程无法析构的问题 2023-03-09 21:39:32 +08:00
ArgonarioD 52734adda8 修正了merge 2023-03-09 20:04:01 +08:00
ArgonarioD e7bce3f93e Merge 2023-03-09 19:54:07 +08:00
karlis 25eec60e5c 初步完成Layer新建 2023-03-09 19:04:33 +08:00
ArgonarioD 652fa483ba 完成了LayerStyle的基本构架 2023-03-09 16:35:04 +08:00
karlis 6f8bfa1558 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-09 16:32:17 +08:00
karlis ef990cd4b4 重置了LayerTree的右键菜单 2023-03-09 16:32:00 +08:00
wuyize c2dd8271e3 ElementRender改为单例 2023-03-09 16:21:55 +08:00
wuyize 6412d9c865 模型添加彩绘配置文件 2023-03-09 15:44:14 +08:00
yang.yongquan 11c9ccc3a9 修改了ElementPool的样式 2023-03-08 19:15:42 +08:00
wuyize 08e54cfc30 ElementRenderer初始化移至构造函数 2023-03-08 16:40:04 +08:00
wuyize f4f1547d21 ElementRenderer改用独立Context 2023-03-08 12:43:19 +08:00
yang.yongquan 7d4a191f02 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-08 12:40:09 +08:00
yang.yongquan 1118dc819a 修改了ElementPool 2023-03-08 12:40:05 +08:00
karlis 477517d919 优化ui，剔除不必要部分 2023-03-08 12:16:15 +08:00
karlis 368eaa6c89 添加了ElementPoolWidget 2023-03-07 22:36:39 +08:00
karlis edb7e37b91 更改了按钮位置 2023-03-07 21:12:48 +08:00
karlis 06c96144e4 Merge 2023-03-07 20:55:29 +08:00
wuyize 526f33ceba 主导航改用StackedWidget 2023-03-07 20:27:58 +08:00
karlis 1031ba5808 实现另存为和打开的路径选取 2023-03-07 19:36:07 +08:00
karlis 33475f6f57 实现保存流程 2023-03-07 17:56:18 +08:00
karlis 8ca036fafb 一系列修改 2023-03-07 17:06:26 +08:00
yang.yongquan 53025b93e4 完成了元素池的窗口 2023-03-07 16:53:03 +08:00
yang.yongquan a28e484cb2 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-03-07 16:24:50 +08:00
yang.yongquan f578fe6184 完成元素池，待测试 2023-03-07 16:24:38 +08:00
wuyize 56f64f00f0 清理了一些无用代码 2023-03-07 16:22:44 +08:00
karlis c1ad6a61f0 添加了序列化的接口和基本实现 2023-03-06 19:43:01 +08:00
wuyize 6188d6a413 加入qt-material-widgets控件库 2023-03-06 12:38:25 +08:00
wuyize 4c623dd5b3 重构了Painting等 2023-03-03 20:51:01 +08:00
karlis 50bc51a8a6 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-02-28 16:48:48 +08:00
karlis 9028ecdca0 添加了删除功能（请先删除引用后删除实例） 2023-02-28 16:48:41 +08:00
wuyize 723c0a9760 优化虚拟纹理加载 2023-02-26 13:57:53 +08:00
wuyize f798ea410d 解决了处理svg平移的问题 2023-02-25 19:38:35 +08:00
yang.yongquan de0f8f6009 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-02-25 17:08:50 +08:00
yang.yongquan 4d9fe01fe9 修改了ShortCutTree部分的线部分索引 2023-02-25 17:08:45 +08:00
wuyize a4a1b2984e 修改painitng.comp以适应编码修改 2023-02-25 17:00:38 +08:00
wuyize 28c30a6172 Merge branch 'dev-VirtualTexture' 2023-02-25 16:40:35 +08:00
wuyize 8920dc39ad 实现虚拟纹理的异步加载 2023-02-25 13:34:24 +08:00
yang.yongquan b2803f777a Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-02-25 10:47:33 +08:00
yang.yongquan ab391ed0ec 增加分割点在原线的比例关系与Svg处理变换问题 2023-02-25 10:47:27 +08:00
karlis 28ea0dd394 窗口缩放 2023-02-24 20:07:56 +08:00
karlis ab402955cd 添加了修改 2023-02-23 22:57:01 +08:00
wuyize b23d55e876 初步完成page的按需加载卸载 2023-02-23 22:18:52 +08:00
karlis abe1ee02c1 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-02-23 22:13:32 +08:00
wuyize 063be364c2 采样最接近的可用mipmap 2023-02-22 12:49:46 +08:00
wuyize 6a02f68514 Merge branch 'main' into dev-VirtualTexture 2023-02-21 20:15:19 +08:00
wuyize 57b537b66b 初步改用虚拟纹理 2023-02-21 20:13:07 +08:00
wuyize ff848b1443 qDebug等输出显示来源 2023-02-20 22:26:29 +08:00
wuyize f0ab4115c3 Merge branch 'dev-VirtualTexture' 2023-02-20 22:10:22 +08:00
karlis 21a973babd 添加InfoDisplay窗口自我刷新 2023-02-20 20:09:00 +08:00
karlis fef7668351 style dialog 2023-02-20 13:48:39 +08:00
wuyize 3221d18563 重构了Model和Mesh等，RendererGLWidget改用glad 2023-02-18 13:19:21 +08:00
wuyize 41080b1c1e 修改了项目配置 2023-02-15 17:50:02 +08:00
wuyize dfd9ef38e4 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-02-15 15:38:04 +08:00
wuyize 3fe7bab969 实现线的平头样式 2023-02-15 15:37:30 +08:00
karlis 883fac3211 Merge branch 'main' of http://101.34.228.45:3000/BigC/ArchitectureColoredPainting 2023-02-14 21:34:12 +08:00
karlis 7d0ca047c1 添加了右侧栏的StyleList样例 2023-02-14 21:33:57 +08:00
yang.yongquan 315083cd52 增加了QPainterPath的单调化 2023-02-14 18:10:08 +08:00
wuyize ef88c4a39e 修复了计算BrdfLut的错误 2023-02-13 23:14:45 +08:00
wuyize 2a78bb4be8 实现IBL 2023-02-13 17:12:04 +08:00
wuyize f3559d133d 加入天空盒 2023-02-12 12:16:33 +08:00
wuyize d15e3baa69 调整了项目结构 2023-02-11 16:16:37 +08:00