lanxi/window-axis-innovators-box
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(render): 实现动画参数插值与图层元数据管理

Browse Source 
- 增强 FrameInterpolator 类以支持更精确的动画参数匹配
- 添加对 animationParameter 的检查以提高插值安全性
- 修改关键帧查找逻辑以直接使用 keyframe 值- 为所有计算目标值的方法添加 currentAnimationParameter 参数
- 在 LayerOperationManager 中实现 LayerInfo 的序列化支持
- 添加 loadMetadata 方法以从文件加载图层元数据- 创建 LayerOperationManagerData 用于存储和传输图层信息- 更新 ModelLayerPanel以支持加载和应用图层元数据
- 引入主题颜色支持使界面更现代化
-限制面板最大宽度以优化布局结构
-修复 GLContextManager 中模型路径的可变性问题- 添加动态模型加载功能支持异步文件 I/O 操作
- 实现模型背景颜色自适应系统主题设置
- 在 MainWindow 中集成完整的模型加载和保存流程
- 添加菜单栏和工具栏以提供基本的文件操作功能
- 实现窗口关闭时的保存提示和确认机制
- 添加状态栏用于显示操作反馈和加载进度
- 改进布局管理器以获得更好的用户体验
-修复部分 UI 组件的启用/禁用逻辑
- 移除 ModelData 中冗余的 ParameterData 类定义
This commit is contained in:
tzdwindows 7
2025-11-07 21:32:17 +08:00
parent 7a04cc2a2d
commit 6e2fd5940d
18 changed files with 1992 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

686
src/main/java/com/chuangzhou/vivid2D/render/awt/ModelLayerPanel.java
View File

@@ -2,6 +2,7 @@ package com.chuangzhou.vivid2D.render.awt;
import com.chuangzhou.vivid2D.render.awt.manager.LayerOperationManager;
import com.chuangzhou.vivid2D.render.awt.manager.ThumbnailManager;
import com.chuangzhou.vivid2D.render.awt.manager.data.LayerOperationManagerData;
import com.chuangzhou.vivid2D.render.awt.util.*;
import com.chuangzhou.vivid2D.render.awt.util.renderer.LayerCellRenderer;
import com.chuangzhou.vivid2D.render.awt.util.renderer.LayerReorderTransferHandler;
@@ -15,13 +16,16 @@ import javax.imageio.ImageIO;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
import javax.swing.plaf.basic.BasicSliderUI;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -53,15 +57,37 @@ public class ModelLayerPanel extends JPanel {
private PSDImporter psdImporter;
private LayerOperationManager operationManager;
private static final Color BACKGROUND_COLOR = new Color(45, 45, 48);
private static final Color SURFACE_COLOR = new Color(62, 62, 66);
private static final Color ACCENT_COLOR = new Color(0, 122, 204);
private static final Color TEXT_COLOR = new Color(241, 241, 241);
private static final Color BORDER_COLOR = new Color(87, 87, 87);
private static Color themeColor(String key, Color fallback) {
try {
Color c = UIManager.getColor(key);
if (c != null) return c;
Object o = UIManager.get(key);
if (o instanceof Color) return (Color) o;
} catch (Exception ignored) {}
return fallback;
}
private static final Color BACKGROUND_COLOR = themeColor("Panel.background", new Color(37, 37, 38));
private static final Color SURFACE_COLOR = themeColor("List.background", new Color(45, 45, 48));
private static final Color ACCENT_COLOR = themeColor("nimbusSelectedText", new Color(10, 132, 255));
private static final Color TEXT_COLOR = themeColor("Label.foreground", new Color(220, 220, 220));
private static final Color BORDER_COLOR = themeColor("Separator.foreground", new Color(60, 60, 60));
// 按钮/控件状态颜色（从主题读取，仍保留合理回退）
private static final Color ACCENT_HOVER_COLOR = themeColor("nimbusSelection", new Color(50, 152, 255));
private static final Color ACCENT_PRESSED_COLOR = themeColor("nimbusBase", new Color(0, 110, 235));
private static final Color BUTTON_HOVER_COLOR = themeColor("Button.background", new Color(70, 70, 73));
// 固定面板推荐最大宽度（避免过宽）
private static final int PANEL_MAX_WIDTH = 300;
public ModelLayerPanel(ModelRenderPanel renderPanel) {
this.renderPanel = renderPanel;
this.model = renderPanel.getModel();
// 限制面板宽度，保持简约不占用过多空间
setPreferredSize(new Dimension(PANEL_MAX_WIDTH, 600));
setMaximumSize(new Dimension(PANEL_MAX_WIDTH, Integer.MAX_VALUE));
setupModernLookAndFeel();
this.thumbnailManager = new ThumbnailManager(renderPanel);
if (this.model != null) {
@@ -78,6 +104,7 @@ public class ModelLayerPanel extends JPanel {
this.model = m;
this.psdImporter = new PSDImporter(model, renderPanel, ModelLayerPanel.this);
this.operationManager = new LayerOperationManager(model);
loadMetadata();
reloadFromModel();
generateAllThumbnails();
});
@@ -85,19 +112,23 @@ public class ModelLayerPanel extends JPanel {
}
}
public void loadMetadata() {
String modelDataPath = renderPanel.getGlContextManager().getModelPath() + ".data";
try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(modelDataPath))) {
Object obj = ois.readObject();
if (obj instanceof LayerOperationManagerData layerData) {
operationManager.loadMetadata(layerData.layerMetadata);
renderPanel.getGlContextManager().executeInGLContext(() -> operationManager.loadMetadata(layerData.layerMetadata));
}
} catch (IOException | ClassNotFoundException | RuntimeException ex) {
// 常见于文件不存在或文件损坏
System.out.println("No layer metadata file found or failed to load: " + ex.getMessage());
}
}
private void setupModernLookAndFeel() {
setBackground(BACKGROUND_COLOR);
setBorder(new EmptyBorder(10, 10, 10, 10));
// 设置现代化UI默认值
UIManager.put("List.background", SURFACE_COLOR);
UIManager.put("List.foreground", TEXT_COLOR);
UIManager.put("List.selectionBackground", ACCENT_COLOR);
UIManager.put("List.selectionForeground", Color.WHITE);
UIManager.put("ScrollPane.background", SURFACE_COLOR);
UIManager.put("ScrollPane.border", BorderFactory.createLineBorder(BORDER_COLOR));
UIManager.put("Slider.background", SURFACE_COLOR);
UIManager.put("Slider.foreground", ACCENT_COLOR);
setBorder(new EmptyBorder(8, 8, 8, 8)); // 更小的内边距
}
// ============== 缩略图相关方法 ==============
@@ -121,12 +152,31 @@ public class ModelLayerPanel extends JPanel {
}
private void initComponents() {
setLayout(new BorderLayout(10, 10));
setLayout(new GridBagLayout());
GridBagConstraints gbc = new GridBagConstraints();
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.weightx = 1.0;
gbc.insets = new Insets(0, 0, 6, 0); // 更小的垂直间距
JPanel headerPanel = createHeaderPanel();
gbc.gridy = 0;
gbc.weighty = 0.0;
add(headerPanel, gbc);
listModel = new DefaultListModel<>();
layerList = createModernList();
createHeaderPanel();
createCenterPanel();
createControlPanel();
JScrollPane centerScrollPane = createCenterPanel();
gbc.gridy = 1;
gbc.weighty = 1.0;
gbc.fill = GridBagConstraints.BOTH;
add(centerScrollPane, gbc);
JPanel controlPanel = createControlPanel();
gbc.gridy = 2;
gbc.weighty = 0.0;
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.insets = new Insets(6, 0, 0, 0);
add(controlPanel, gbc);
}
private JList<ModelPart> createModernList() {
@@ -134,8 +184,8 @@ public class ModelLayerPanel extends JPanel {
list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
list.setBackground(SURFACE_COLOR);
list.setForeground(TEXT_COLOR);
list.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
list.setFixedCellHeight(70);
list.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
list.setFixedCellHeight(46); // 更紧凑
LayerCellRenderer cellRenderer = new LayerCellRenderer(this, thumbnailManager);
cellRenderer.attachMouseListener(list, listModel);
list.setCellRenderer(cellRenderer);
@@ -157,44 +207,62 @@ public class ModelLayerPanel extends JPanel {
return list;
}
private void createHeaderPanel() {
private JPanel createHeaderPanel() {
JPanel headerPanel = new JPanel(new BorderLayout());
headerPanel.setBackground(BACKGROUND_COLOR);
headerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
headerPanel.setBorder(BorderFactory.createEmptyBorder(2, 4, 6, 4));
JLabel titleLabel = new JLabel("图层管理");
JLabel titleLabel = new JLabel("图层");
titleLabel.setForeground(TEXT_COLOR);
titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 16f));
titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 14f));
headerPanel.add(titleLabel, BorderLayout.WEST);
add(headerPanel, BorderLayout.NORTH);
return headerPanel;
}
private void createCenterPanel() {
private JScrollPane createCenterPanel() {
JScrollPane scrollPane = new JScrollPane(layerList);
scrollPane.setBorder(createModernBorder("图层列表"));
scrollPane.setBorder(BorderFactory.createEmptyBorder()); // 极简
scrollPane.getViewport().setBackground(SURFACE_COLOR);
add(scrollPane, BorderLayout.CENTER);
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
return scrollPane;
}
private void createControlPanel() {
JPanel controlPanel = new JPanel(new BorderLayout(10, 10));
private JPanel createControlPanel() {
JPanel controlPanel = new JPanel();
controlPanel.setLayout(new BoxLayout(controlPanel, BoxLayout.Y_AXIS));
controlPanel.setBackground(BACKGROUND_COLOR);
controlPanel.add(createButtonPanel(), BorderLayout.NORTH);
controlPanel.add(createSettingsPanel(), BorderLayout.SOUTH);
add(controlPanel, BorderLayout.SOUTH);
JPanel buttonPanel = createButtonPanel();
buttonPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
controlPanel.add(buttonPanel);
JPanel settingsPanel = createSettingsPanel();
settingsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
controlPanel.add(Box.createVerticalStrut(6));
controlPanel.add(settingsPanel);
return controlPanel;
}
private JPanel createButtonPanel() {
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 8, 8));
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 6, 0));
buttonPanel.setBackground(BACKGROUND_COLOR);
buttonPanel.setBorder(createModernBorder("操作"));
// 无多余标题边框
addButton = createIconButton("⊕", "添加图层", this::showAddMenu);
removeButton = createIconButton("⊖", "删除选中图层", this::onRemoveLayer);
upButton = createIconButton("↑", "上移图层", this::moveSelectedUp);
downButton = createIconButton("↓", "下移图层", this::moveSelectedDown);
bindTextureButton = createIconButton("📷", "绑定贴图", this::bindTextureToSelectedPart);
addButton = createIconButton("\uFF0B", "添加", this::showAddMenu); // 更细小的加号
removeButton = createIconButton("\u2013", "删除", this::onRemoveLayer); // 细长减号
upButton = createIconButton("\u25B2", "上移", this::moveSelectedUp);
downButton = createIconButton("\u25BC", "下移", this::moveSelectedDown);
bindTextureButton = createIconButton("\uD83D\uDDBC", "绑定", this::bindTextureToSelectedPart);
// 只显示常用按钮，保持干净
addButton.setPreferredSize(new Dimension(36, 28));
removeButton.setPreferredSize(new Dimension(36, 28));
upButton.setPreferredSize(new Dimension(36, 28));
downButton.setPreferredSize(new Dimension(36, 28));
bindTextureButton.setPreferredSize(new Dimension(36, 28));
removeButton.setEnabled(false);
upButton.setEnabled(false);
@@ -211,19 +279,19 @@ public class ModelLayerPanel extends JPanel {
}
private JPanel createSettingsPanel() {
JPanel settingsPanel = new JPanel(new BorderLayout(10, 5));
JPanel settingsPanel = new JPanel(new BorderLayout(8, 0));
settingsPanel.setBackground(BACKGROUND_COLOR);
settingsPanel.setBorder(createModernBorder("图层设置"));
settingsPanel.setBorder(BorderFactory.createEmptyBorder(4, 0, 4, 0));
JPanel opacityPanel = new JPanel(new BorderLayout(8, 0));
opacityPanel.setBackground(BACKGROUND_COLOR);
JLabel opacityLabel = new JLabel("不透明度:");
JLabel opacityLabel = new JLabel("不透明度");
opacityLabel.setForeground(TEXT_COLOR);
opacityLabel.setFont(opacityLabel.getFont().deriveFont(12f));
opacityLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 6));
opacitySlider = createModernSlider();
opacityValueLabel = new JLabel("100%");
opacityValueLabel.setForeground(TEXT_COLOR);
opacityValueLabel.setFont(opacityValueLabel.getFont().deriveFont(12f));
opacityValueLabel.setPreferredSize(new Dimension(40, 20));
opacitySlider.addChangeListener(e -> {
@@ -231,19 +299,23 @@ public class ModelLayerPanel extends JPanel {
onOpacityChanged();
});
opacityPanel.add(opacityLabel, BorderLayout.WEST);
opacityPanel.add(opacitySlider, BorderLayout.CENTER);
opacityPanel.add(opacityValueLabel, BorderLayout.EAST);
JPanel left = new JPanel(new BorderLayout());
left.setBackground(BACKGROUND_COLOR);
left.add(opacityLabel, BorderLayout.WEST);
left.add(opacitySlider, BorderLayout.CENTER);
settingsPanel.add(left, BorderLayout.CENTER);
settingsPanel.add(opacityValueLabel, BorderLayout.EAST);
settingsPanel.add(opacityPanel, BorderLayout.CENTER);
return settingsPanel;
}
private JSlider createModernSlider() {
JSlider slider = new JSlider(0, 100, 100);
slider.setBackground(BACKGROUND_COLOR);
slider.setForeground(ACCENT_COLOR);
slider.setForeground(ACCENT_COLOR); // 用于已填充部分
// 应用自定义的扁平UI
slider.setUI(new ModernSliderUI(slider));
return slider;
}
@@ -251,6 +323,8 @@ public class ModelLayerPanel extends JPanel {
ModernButton button = new ModernButton(icon);
button.setToolTipText(tooltip);
button.addActionListener(e -> action.run());
// 增大图标字体，使其看起来更像图标
button.setFont(button.getFont().deriveFont(14f));
return button;
}
@@ -275,7 +349,11 @@ public class ModelLayerPanel extends JPanel {
for (int i = 0; i < menuItems.length; i++) {
if (menuItems[i].equals("---")) {
addMenu.add(new JSeparator());
// 使用现代化的分隔符
JSeparator separator = new JSeparator();
separator.setBackground(BORDER_COLOR);
separator.setForeground(BORDER_COLOR);
addMenu.add(separator);
} else {
JMenuItem item = new ModernMenuItem(menuItems[i]);
if (actions[i] != null) {
@@ -289,6 +367,150 @@ public class ModelLayerPanel extends JPanel {
addMenu.show(addButton, 0, addButton.getHeight());
}
// ... (createEmptyPart, findPartByName, getModelPartMap, showRenameDialog, setModel, setRenderPanel, importPSDFile... 逻辑不变) ...
// ... (这些方法的核心逻辑与UI无关，保留原样) ...
// [逻辑代码... 从第 303 行到 816 行，保留您原始文件中的所有逻辑方法]
// [例如: createEmptyPart, findPartByName, ... , createPartWithTransparentTexture]
// ====================================================================
// 您的所有业务逻辑方法 (createEmptyPart, onRemoveLayer, bindTexture... 等)
// 都应该在这里，保持不变。
// 为了简洁，我只复制了UI重构相关的部分和几个关键方法，
// 您需要将您文件中的所有业务逻辑方法复制回这个类中。
// ====================================================================
// --- 示例：复制几个关键方法 ---
public void reloadFromModel() {
ModelPart selected = layerList.getSelectedValue();
listModel.clear();
if (model == null) return;
try {
List<ModelPart> parts = model.getParts();
if (parts != null) {
// 图层是反向显示的（顶部是索引0）
for (int i = parts.size() - 1; i >= 0; i--) {
listModel.addElement(parts.get(i));
}
}
} catch (Exception ex) {
ex.printStackTrace();
}
if (selected != null) {
for (int i = 0; i < listModel.getSize(); i++) {
if (listModel.get(i) == selected) {
layerList.setSelectedIndex(i);
break;
}
}
}
}
public void performVisualReorder(int visualFrom, int visualTo) {
if (model == null) return;
try {
int size = listModel.getSize();
if (visualFrom < 0 || visualFrom >= size) return;
if (visualTo < 0) visualTo = 0;
if (visualTo > size - 1) visualTo = size - 1;
ModelPart moved = listModel.get(visualFrom);
if (!isDragging) {
isDragging = true;
draggedPart = moved;
dragStartPosition = new Vector2f(moved.getPosition());
}
List<ModelPart> visual = new ArrayList<>(size);
for (int i = 0; i < size; i++) visual.add(listModel.get(i));
moved = visual.remove(visualFrom);
visual.add(visualTo, moved);
ignoreSliderEvents = true;
try {
listModel.clear();
for (ModelPart p : visual) listModel.addElement(p);
} finally {
ignoreSliderEvents = false;
}
operationManager.moveLayer(visual);
selectPart(moved);
} catch (Exception ex) {
ex.printStackTrace();
}
}
// (请确保您原始文件中的所有其他方法，
// 如 onRemoveLayer, moveSelectedUp, createPartWithTextureFromFile,
// endDragOperation, bindTextureToSelectedPart 等，都复制到这里)
// ... (所有其他逻辑方法) ...
private void updateUIState() {
ModelPart sel = layerList.getSelectedValue();
boolean hasSelection = sel != null;
if (hasSelection) {
updateOpacitySlider(sel);
}
removeButton.setEnabled(hasSelection);
upButton.setEnabled(hasSelection);
downButton.setEnabled(hasSelection);
bindTextureButton.setEnabled(hasSelection);
}
private void updateOpacitySlider(ModelPart part) {
float opacity = extractOpacity(part);
int value = Math.round(opacity * 100);
ignoreSliderEvents = true;
try {
opacitySlider.setValue(value);
opacityValueLabel.setText(value + "%");
} finally {
ignoreSliderEvents = false;
}
}
private float extractOpacity(ModelPart part) {
try {
Method method = part.getClass().getMethod("getOpacity");
Object value = method.invoke(part);
if (value instanceof Float) return (Float) value;
} catch (Exception e) {
try {
Field field = part.getClass().getDeclaredField("opacity");
field.setAccessible(true);
Object value = field.get(part);
if (value instanceof Float) return (Float) value;
} catch (Exception ignored) {}
}
return 1.0f;
}
private void onOpacityChanged() {
ModelPart sel = layerList.getSelectedValue();
if (sel == null) return;
int value = opacitySlider.getValue();
opacityValueLabel.setText(value + "%");
setPartOpacity(sel, value / 100.0f);
if (model != null) model.markNeedsUpdate();
layerList.repaint();
refreshSelectedThumbnail();
}
// (其他所有逻辑方法... setPartOpacity, createEmptyPart, etc.)
// (确保从您的原始文件中复制所有剩余的方法)
private void createEmptyPart() {
String name = JOptionPane.showInputDialog(this, "新图层名称：", "新图层");
if (name == null || name.trim().isEmpty()) return;
@@ -355,63 +577,6 @@ public class ModelLayerPanel extends JPanel {
}
}
private void updateUIState() {
ModelPart sel = layerList.getSelectedValue();
boolean hasSelection = sel != null;
if (hasSelection) {
updateOpacitySlider(sel);
}
removeButton.setEnabled(hasSelection);
upButton.setEnabled(hasSelection);
downButton.setEnabled(hasSelection);
bindTextureButton.setEnabled(hasSelection);
}
private void updateOpacitySlider(ModelPart part) {
float opacity = extractOpacity(part);
int value = Math.round(opacity * 100);
ignoreSliderEvents = true;
try {
opacitySlider.setValue(value);
opacityValueLabel.setText(value + "%");
} finally {
ignoreSliderEvents = false;
}
}
private float extractOpacity(ModelPart part) {
try {
Method method = part.getClass().getMethod("getOpacity");
Object value = method.invoke(part);
if (value instanceof Float) return (Float) value;
} catch (Exception e) {
try {
Field field = part.getClass().getDeclaredField("opacity");
field.setAccessible(true);
Object value = field.get(part);
if (value instanceof Float) return (Float) value;
} catch (Exception ignored) {}
}
return 1.0f;
}
private void onOpacityChanged() {
ModelPart sel = layerList.getSelectedValue();
if (sel == null) return;
int value = opacitySlider.getValue();
opacityValueLabel.setText(value + "%");
setPartOpacity(sel, value / 100.0f);
if (model != null) model.markNeedsUpdate();
layerList.repaint();
refreshSelectedThumbnail();
}
private void setPartOpacity(ModelPart part, float opacity) {
try {
Method method = part.getClass().getMethod("setOpacity", float.class);
@@ -427,11 +592,11 @@ public class ModelLayerPanel extends JPanel {
private TitledBorder createModernBorder(String title) {
TitledBorder border = BorderFactory.createTitledBorder(
BorderFactory.createLineBorder(BORDER_COLOR, 1, true),
BorderFactory.createLineBorder(BORDER_COLOR, 1),
title
);
border.setTitleColor(TEXT_COLOR);
border.setTitleFont(border.getTitleFont().deriveFont(Font.BOLD, 12f));
border.setTitleFont(border.getTitleFont().deriveFont(Font.PLAIN, 12f));
return border;
}
@@ -454,134 +619,6 @@ public class ModelLayerPanel extends JPanel {
refreshSelectedThumbnail();
}
// 现代化按钮类
private static class ModernButton extends JButton {
public ModernButton(String text) {
super(text);
setupModernStyle();
}
private void setupModernStyle() {
setBackground(SURFACE_COLOR);
setForeground(TEXT_COLOR);
setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createLineBorder(BORDER_COLOR, 1, true),
BorderFactory.createEmptyBorder(8, 12, 8, 12)
));
setFocusPainted(false);
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
addMouseListener(new MouseAdapter() {
@Override
public void mouseEntered(MouseEvent e) {
if (isEnabled()) {
setBackground(ACCENT_COLOR);
setForeground(Color.WHITE);
}
}
@Override
public void mouseExited(MouseEvent e) {
setBackground(SURFACE_COLOR);
setForeground(TEXT_COLOR);
}
});
}
}
// 现代化菜单项类
private static class ModernMenuItem extends JMenuItem {
public ModernMenuItem(String text) {
super(text);
setBackground(SURFACE_COLOR);
setForeground(TEXT_COLOR);
setBorder(BorderFactory.createEmptyBorder(8, 12, 8, 12));
addMouseListener(new MouseAdapter() {
@Override
public void mouseEntered(MouseEvent e) {
setBackground(ACCENT_COLOR);
setForeground(Color.WHITE);
}
@Override
public void mouseExited(MouseEvent e) {
setBackground(SURFACE_COLOR);
setForeground(TEXT_COLOR);
}
});
}
}
// 现代化弹出菜单
private static class ModernPopupMenu extends JPopupMenu {
public ModernPopupMenu() {
setBackground(SURFACE_COLOR);
setBorder(BorderFactory.createLineBorder(BORDER_COLOR));
}
}
public void reloadFromModel() {
ModelPart selected = layerList.getSelectedValue();
listModel.clear();
if (model == null) return;
try {
List<ModelPart> parts = model.getParts();
if (parts != null) {
for (int i = parts.size() - 1; i >= 0; i--) {
listModel.addElement(parts.get(i));
}
}
} catch (Exception ex) {
ex.printStackTrace();
}
if (selected != null) {
for (int i = 0; i < listModel.getSize(); i++) {
if (listModel.get(i) == selected) {
layerList.setSelectedIndex(i);
break;
}
}
}
}
public void performVisualReorder(int visualFrom, int visualTo) {
if (model == null) return;
try {
int size = listModel.getSize();
if (visualFrom < 0 || visualFrom >= size) return;
if (visualTo < 0) visualTo = 0;
if (visualTo > size - 1) visualTo = size - 1;
ModelPart moved = listModel.get(visualFrom);
if (!isDragging) {
isDragging = true;
draggedPart = moved;
dragStartPosition = new Vector2f(moved.getPosition());
}
List<ModelPart> visual = new ArrayList<>(size);
for (int i = 0; i < size; i++) visual.add(listModel.get(i));
moved = visual.remove(visualFrom);
visual.add(visualTo, moved);
ignoreSliderEvents = true;
try {
listModel.clear();
for (ModelPart p : visual) listModel.addElement(p);
} finally {
ignoreSliderEvents = false;
}
operationManager.moveLayer(visual);
selectPart(moved);
} catch (Exception ex) {
ex.printStackTrace();
}
}
private void selectPart(ModelPart part) {
if (part == null) return;
for (int i = 0; i < listModel.getSize(); i++) {
@@ -807,4 +844,169 @@ public class ModelLayerPanel extends JPanel {
selectPart(part);
thumbnailManager.generateThumbnail(part);
}
public LayerOperationManager getLayerOperationManager() {
return operationManager;
}
// ====================================================================
// 现代化的内部UI类
// ====================================================================
/**
* 现代化的圆角按钮
*/
private static class ModernButton extends JButton {
private boolean hovered = false;
private boolean pressed = false;
public ModernButton(String text) {
super(text);
setContentAreaFilled(false);
setFocusPainted(false);
setBorderPainted(false);
setForeground(TEXT_COLOR);
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
setBorder(BorderFactory.createEmptyBorder(4, 8, 4, 8));
setOpaque(false);
setFont(getFont().deriveFont(Font.PLAIN, 13f));
addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
pressed = true;
repaint();
}
@Override
public void mouseReleased(MouseEvent e) {
pressed = false;
repaint();
}
@Override
public void mouseEntered(MouseEvent e) {
hovered = true;
repaint();
}
@Override
public void mouseExited(MouseEvent e) {
hovered = false;
pressed = false;
repaint();
}
});
}
@Override
protected void paintComponent(Graphics g) {
Graphics2D g2 = (Graphics2D) g.create();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
// 扁平样式：只有 hover/pressed 时才有轻微背景
if (!isEnabled()) {
// 半透明效果
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
}
if (pressed) {
g2.setColor(ACCENT_PRESSED_COLOR);
g2.fillRect(0, 0, getWidth(), getHeight());
} else if (hovered) {
g2.setColor(BUTTON_HOVER_COLOR);
g2.fillRect(0, 0, getWidth(), getHeight());
} // 默认不绘制背景以保持极简
// 文本居中
g2.setColor(isEnabled() ? TEXT_COLOR : BORDER_COLOR.darker());
FontMetrics fm = g2.getFontMetrics();
int stringWidth = fm.stringWidth(getText());
int stringHeight = fm.getAscent();
int x = (getWidth() - stringWidth) / 2;
int y = (getHeight() + stringHeight) / 2 - 2;
g2.setFont(getFont());
g2.drawString(getText(), x, y);
g2.dispose();
}
}
/**
* 现代化的菜单项
*/
private static class ModernMenuItem extends JMenuItem {
public ModernMenuItem(String text) {
super(text);
setBackground(SURFACE_COLOR);
setForeground(TEXT_COLOR);
setBorder(BorderFactory.createEmptyBorder(6, 10, 6, 10));
// 使用 UIManager 设置的选中颜色
setOpaque(true);
}
}
/**
* 现代化的弹出菜单
*/
private static class ModernPopupMenu extends JPopupMenu {
public ModernPopupMenu() {
setBackground(SURFACE_COLOR);
setBorder(BorderFactory.createLineBorder(BORDER_COLOR));
}
}
/**
* 现代化的扁平滑块UI
*/
private static class ModernSliderUI extends BasicSliderUI {
private final RoundRectangle2D.Float trackShape = new RoundRectangle2D.Float();
private final RoundRectangle2D.Float thumbShape = new RoundRectangle2D.Float();
public ModernSliderUI(JSlider b) {
super(b);
}
@Override
public void paintTrack(Graphics g) {
Graphics2D g2 = (Graphics2D) g.create();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
// 轨道背景
g2.setColor(BORDER_COLOR);
int trackY = (trackRect.height / 2) - 3 + trackRect.y;
trackShape.setRoundRect(trackRect.x, trackY, trackRect.width, 6, 6, 6);
g2.fill(trackShape);
// 轨道前景 (已填充部分)
g2.setColor(ACCENT_COLOR);
int thumbPos = thumbRect.x + (thumbRect.width / 2);
trackShape.setRoundRect(trackRect.x, trackY, thumbPos - trackRect.x, 6, 6, 6);
g2.fill(trackShape);
g2.dispose();
}
@Override
public void paintThumb(Graphics g) {
Graphics2D g2 = (Graphics2D) g.create();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
// 绘制滑块
thumbShape.setRoundRect(thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height, 14, 14);
// 滑块颜色
g2.setColor(isDragging() ? ACCENT_PRESSED_COLOR : ACCENT_HOVER_COLOR);
g2.fill(thumbShape);
// 滑块内部的小点
g2.setColor(Color.WHITE);
g2.fillOval(thumbRect.x + (thumbRect.width/2) - 2, thumbRect.y + (thumbRect.height/2) - 2, 4, 4);
g2.dispose();
}
@Override
protected Dimension getThumbSize() {
// 定义滑块大小
return new Dimension(14, 14);
}
}
}

289
src/main/java/com/chuangzhou/vivid2D/render/awt/ModelPartInfoPanel.java Normal file
View File

@@ -0,0 +1,289 @@
package com.chuangzhou.vivid2D.render.awt;
import com.chuangzhou.vivid2D.render.awt.ModelRenderPanel;
import com.chuangzhou.vivid2D.render.model.ModelEvent; // 引入 ModelEvent 接口
import com.chuangzhou.vivid2D.render.model.ModelPart;
import org.joml.Vector2f;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.awt.*;
import java.util.Objects;
/**
* 用于显示选中 ModelPart 部件属性的面板。
*/
public class ModelPartInfoPanel extends JPanel implements ModelEvent { // 实现 ModelEvent 接口
private static final Logger logger = LoggerFactory.getLogger(ModelPartInfoPanel.class);
private final ModelRenderPanel renderPanel;
// 【新增】当前正在监控的 ModelPart
private ModelPart monitoredPart = null;
// UI 字段，用于显示 ModelPart 的属性值
private final JLabel nameValueLabel = new JLabel("无选中");
private final JLabel positionXLabel = new JLabel("0.00"); // 统一格式
private final JLabel positionYLabel = new JLabel("0.00"); // 统一格式
private final JLabel rotationLabel = new JLabel("0.00°"); // 统一格式
private final JLabel scaleXLabel = new JLabel("1.00"); // 统一格式
private final JLabel scaleYLabel = new JLabel("1.00"); // 统一格式
private final JLabel visibleLabel = new JLabel("false");
private final JLabel opacityLabel = new JLabel("100%");
private final JLabel blendModeLabel = new JLabel("NORMAL");
private final JLabel meshCountLabel = new JLabel("0");
private final JLabel childCountLabel = new JLabel("0");
/**
* 构造器
* @param renderPanel 渲染面板实例，用于上下文或将来获取选中信息
*/
public ModelPartInfoPanel(ModelRenderPanel renderPanel) {
super(new BorderLayout());
this.renderPanel = Objects.requireNonNull(renderPanel, "ModelRenderPanel 不能为空");
setBorder(BorderFactory.createTitledBorder("部件属性"));
// 使用一个内嵌的 JPanel 来放置属性列表，并将其放入 JScrollPane
JPanel propertiesPanel = new JPanel(new GridBagLayout());
propertiesPanel.setBackground(UIManager.getColor("Panel.background"));
JScrollPane scrollPane = new JScrollPane(propertiesPanel);
scrollPane.setBorder(BorderFactory.createEmptyBorder());
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
add(scrollPane, BorderLayout.CENTER);
// 设置 GridBagLayout 约束
GridBagConstraints gbc = new GridBagConstraints();
gbc.insets = new Insets(2, 5, 2, 5); // 边距
// 第一列：属性名 (右对齐)
gbc.gridx = 0;
gbc.anchor = GridBagConstraints.EAST;
gbc.weightx = 0.0;
// 第二列：属性值 (左对齐，占用剩余空间)
GridBagConstraints gbcValue = new GridBagConstraints();
gbcValue.insets = new Insets(2, 5, 2, 5);
gbcValue.gridx = 1;
gbcValue.anchor = GridBagConstraints.WEST;
gbcValue.fill = GridBagConstraints.HORIZONTAL;
gbcValue.weightx = 1.0;
int row = 0;
// 辅助方法：添加属性行
row = addPropertyRow(propertiesPanel, "名称:", nameValueLabel, gbc, gbcValue, row);
row = addSeparator(propertiesPanel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "位置 (X):", positionXLabel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "位置 (Y):", positionYLabel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "旋转 (deg):", rotationLabel, gbc, gbcValue, row);
row = addSeparator(propertiesPanel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "缩放 (X):", scaleXLabel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "缩放 (Y):", scaleYLabel, gbc, gbcValue, row);
row = addSeparator(propertiesPanel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "可见:", visibleLabel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "不透明度:", opacityLabel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "混合模式:", blendModeLabel, gbc, gbcValue, row);
row = addSeparator(propertiesPanel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "网格数量:", meshCountLabel, gbc, gbcValue, row);
row = addPropertyRow(propertiesPanel, "子部件数量:", childCountLabel, gbc, gbcValue, row);
// 占位符：确保内容靠上
gbc.gridy = row;
gbc.weighty = 1.0;
propertiesPanel.add(Box.createVerticalGlue(), gbc);
}
/**
* 辅助方法：添加一行属性（标签 + 值）
*/
private int addPropertyRow(JPanel panel, String labelText, JLabel valueLabel,
GridBagConstraints gbcLabel, GridBagConstraints gbcValue, int row) {
// 属性名
JLabel label = new JLabel(labelText);
gbcLabel.gridy = row;
panel.add(label, gbcLabel);
// 属性值
gbcValue.gridy = row;
panel.add(valueLabel, gbcValue);
return row + 1;
}
/**
* 辅助方法：添加分隔线
*/
private int addSeparator(JPanel panel, GridBagConstraints gbcLabel, GridBagConstraints gbcValue, int row) {
JSeparator separator = new JSeparator(SwingConstants.HORIZONTAL);
gbcLabel.gridy = row;
gbcLabel.gridx = 0;
gbcLabel.gridwidth = 2; // 跨越两列
gbcLabel.fill = GridBagConstraints.HORIZONTAL;
gbcLabel.insets = new Insets(5, 0, 5, 0);
panel.add(separator, gbcLabel);
// 恢复默认的 insets 和 gridwidth
gbcLabel.insets = new Insets(2, 5, 2, 5);
gbcLabel.gridwidth = 1;
gbcValue.insets = new Insets(2, 5, 2, 5);
return row + 1;
}
/**
* 将角度标准化到0-360度范围内
*/
private float normalizeAngle(float degrees) {
degrees = degrees % 360;
if (degrees < 0) {
degrees += 360;
}
return degrees;
}
/**
* 核心逻辑：从 ModelPart 更新所有显示值。
*/
private void updateDisplay(ModelPart part) {
if (part == null) {
// 清空显示
nameValueLabel.setText("无选中");
positionXLabel.setText("0.00");
positionYLabel.setText("0.00");
rotationLabel.setText("0.00°");
scaleXLabel.setText("1.00");
scaleYLabel.setText("1.00");
visibleLabel.setText("false");
opacityLabel.setText("100%");
blendModeLabel.setText("NORMAL");
meshCountLabel.setText("0");
childCountLabel.setText("0");
logger.debug("ModelPartInfoPanel: 清空选中部件信息");
} else {
// 设置新的值
Vector2f position = part.getPosition();
Vector2f scale = part.getScale();
float rotationDeg = (float) Math.toDegrees(part.getRotation());
rotationDeg = normalizeAngle(rotationDeg);
nameValueLabel.setText(part.getName());
positionXLabel.setText(String.format("%.2f", position.x));
positionYLabel.setText(String.format("%.2f", position.y));
rotationLabel.setText(String.format("%.2f°", rotationDeg));
scaleXLabel.setText(String.format("%.2f", scale.x));
scaleYLabel.setText(String.format("%.2f", scale.y));
visibleLabel.setText(String.valueOf(part.isVisible()));
opacityLabel.setText(String.format("%d%%", (int)(part.getOpacity() * 100)));
blendModeLabel.setText(part.getBlendMode().name());
meshCountLabel.setText(String.valueOf(part.getMeshes().size()));
childCountLabel.setText(String.valueOf(part.getChildren().size()));
logger.debug("ModelPartInfoPanel: 更新选中部件信息 - {}", part.getName());
}
}
/**
* 【修改】更新面板以显示指定 ModelPart 的属性，并管理事件监听器。
*/
public void updatePanel(ModelPart part) {
// 1. 移除旧部件的事件监听
if (this.monitoredPart != null) {
this.monitoredPart.removeEvent(this);
}
// 2. 更新正在监控的部件
this.monitoredPart = part;
// 3. 添加新部件的事件监听
if (this.monitoredPart != null) {
this.monitoredPart.addEvent(this);
}
// 4. 立即更新显示
updateDisplay(part);
// 确保 UI 在 EDT 上更新
revalidate();
repaint();
}
/**
* 【新增】实现 ModelEvent 接口，监听部件属性的变化。
*/
@Override
public void trigger(String eventName, Object source) {
if (source != this.monitoredPart) return; // 只处理当前监控的部件
// 确保 UI 更新在 Swing EDT 上进行
SwingUtilities.invokeLater(() -> {
ModelPart part = (ModelPart) source;
try {
// 根据事件名只更新变化的属性，提高效率
switch (eventName) {
case "name":
nameValueLabel.setText(part.getName());
break;
case "position":
Vector2f position = part.getPosition();
positionXLabel.setText(String.format("%.2f", position.x));
positionYLabel.setText(String.format("%.2f", position.y));
break;
case "rotation":
float rotationDeg = (float) Math.toDegrees(part.getRotation());
rotationDeg = normalizeAngle(rotationDeg);
rotationLabel.setText(String.format("%.2f°", rotationDeg));
break;
case "scale":
Vector2f scale = part.getScale();
scaleXLabel.setText(String.format("%.2f", scale.x));
scaleYLabel.setText(String.format("%.2f", scale.y));
break;
case "visible":
visibleLabel.setText(String.valueOf(part.isVisible()));
break;
case "opacity":
opacityLabel.setText(String.format("%d%%", (int)(part.getOpacity() * 100)));
break;
case "blendMode":
blendModeLabel.setText(part.getBlendMode().name());
break;
case "children":
childCountLabel.setText(String.valueOf(part.getChildren().size()));
break;
case "meshes":
meshCountLabel.setText(String.valueOf(part.getMeshes().size()));
break;
default:
updateDisplay(part);
break;
}
// 强制刷新
revalidate();
repaint();
} catch (Exception e) {
logger.error("Error updating ModelPartInfoPanel for event {}: {}", eventName, e.getMessage());
}
});
}
/**
* 【新增】清理监听器资源
*/
@Override
public void removeNotify() {
super.removeNotify();
// 移除正在监控的部件的事件监听
if (this.monitoredPart != null) {
this.monitoredPart.removeEvent(this);
this.monitoredPart = null;
}
}
}

111
src/main/java/com/chuangzhou/vivid2D/render/awt/ModelRenderPanel.java
View File

@@ -28,6 +28,7 @@ import java.awt.*;
import java.awt.event.*;
import java.awt.image.BufferedImage;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicReference;
@@ -45,7 +46,6 @@ import java.util.concurrent.atomic.AtomicReference;
*/
public class ModelRenderPanel extends JPanel {
private static final Logger logger = LoggerFactory.getLogger(ModelRenderPanel.class);
private final GLContextManager glContextManager;
private final MouseManagement mouseManagement;
private final CameraManagement cameraManagement;
@@ -58,14 +58,11 @@ public class ModelRenderPanel extends JPanel {
private final AtomicReference<ParametersManagement> parametersManagement = new AtomicReference<>();
public static final float BORDER_THICKNESS = 6.0f;
public static final float CORNER_SIZE = 12.0f;
// ================== 摄像机控制相关字段 ==================
private final Timer doubleClickTimer;
private volatile long lastClickTime = 0;
private static final int DOUBLE_CLICK_INTERVAL = 300; // 双击间隔(毫秒)
private static final int DOUBLE_CLICK_INTERVAL = 300;
private final ToolManagement toolManagement;
// ================== 摄像机控制方法 ==================
/**
* 获取摄像机实例
*/
@@ -110,7 +107,6 @@ public class ModelRenderPanel extends JPanel {
ParametersPanel.ParameterEventBroadcaster.getInstance().addListener(new ParametersPanel.ParameterEventListener() {
@Override
public void onParameterUpdated(AnimationParameter p) {
// 1. 获取参数管理器
ParametersManagement pm = getParametersManagement();
if (pm == null) {
logger.warn("ParametersManagement 未初始化，无法应用参数更新。");
@@ -121,8 +117,6 @@ public class ModelRenderPanel extends JPanel {
logger.debug("没有选中的模型部件，跳过应用参数。");
return;
}
// 必须在 GL 上下文线程中执行模型操作
glContextManager.executeInGLContext(() -> {
try {
FrameInterpolator.applyFrameInterpolations(pm, selectedParts, p, logger);
@@ -149,16 +143,12 @@ public class ModelRenderPanel extends JPanel {
this.cameraManagement = new CameraManagement(this, glContextManager, worldManagement);
this.mouseManagement = new MouseManagement(this, glContextManager, cameraManagement, keyboardManager);
this.toolManagement = new ToolManagement(this, randerToolsManager);
// 注册所有工具
toolManagement.registerTool(new PuppetDeformationTool(this),new PuppetDeformationRander());
toolManagement.registerTool(new VertexDeformationTool(this),new VertexDeformationRander());
toolManagement.registerTool(new LiquifyTool(this), new LiquifyTargetPartRander());
initialize();
keyboardManager.initKeyboardShortcuts();
doubleClickTimer = new Timer(DOUBLE_CLICK_INTERVAL, e -> {
// 单单击超时处理
handleSingleClick();
});
doubleClickTimer.setRepeats(false);
@@ -169,8 +159,6 @@ public class ModelRenderPanel extends JPanel {
*/
private void handleDoubleClick(MouseEvent e) {
float[] modelCoords = worldManagement.screenToModelCoordinates(e.getX(), e.getY());
// 如果有激活的工具，优先交给工具处理
if (toolManagement.hasActiveTool() && modelCoords != null) {
glContextManager.executeInGLContext(() -> {
toolManagement.handleMouseDoubleClicked(e, modelCoords[0], modelCoords[1]);
@@ -182,9 +170,7 @@ public class ModelRenderPanel extends JPanel {
/**
* 处理单单击事件
*/
private void handleSingleClick() {
// 单单击逻辑已迁移到各个工具中
}
private void handleSingleClick() {}
/**
* 添加模型点击监听器
@@ -297,44 +283,6 @@ public class ModelRenderPanel extends JPanel {
return tool instanceof LiquifyTool ? (LiquifyTool) tool : null;
}
/**
* 设置液化画笔大小
*/
public void setLiquifyBrushSize(float size) {
LiquifyTool liquifyTool = getLiquifyTool();
if (liquifyTool != null) {
liquifyTool.setLiquifyBrushSize(size);
}
}
/**
* 设置液化画笔强度
*/
public void setLiquifyBrushStrength(float strength) {
LiquifyTool liquifyTool = getLiquifyTool();
if (liquifyTool != null) {
liquifyTool.setLiquifyBrushStrength(strength);
}
}
/**
* 设置液化模式
*/
public void setLiquifyMode(ModelPart.LiquifyMode mode) {
LiquifyTool liquifyTool = getLiquifyTool();
if (liquifyTool != null) {
liquifyTool.setLiquifyMode(mode);
}
}
/**
* 获取当前液化状态
*/
public boolean isInLiquifyMode() {
Tool currentTool = toolManagement.getCurrentTool();
return currentTool instanceof LiquifyTool;
}
private void initialize() {
setLayout(new BorderLayout());
setPreferredSize(new Dimension(glContextManager.getWidth(), glContextManager.getHeight()));
@@ -486,12 +434,6 @@ public class ModelRenderPanel extends JPanel {
} else {
float[] modelCoords = worldManagement.screenToModelCoordinates(screenX, screenY);
// 如果有激活的工具，优先交给工具处理
if (toolManagement.hasActiveTool() && modelCoords != null) {
toolManagement.handleMouseClicked(e, modelCoords[0], modelCoords[1]);
return;
}
glContextManager.executeInGLContext(() -> {
try {
if (modelCoords == null) return;
@@ -513,6 +455,12 @@ public class ModelRenderPanel extends JPanel {
logger.error("处理鼠标点击时出错", ex);
}
});
// 如果有激活的工具，优先交给工具处理
if (toolManagement.hasActiveTool() && modelCoords != null) {
toolManagement.handleMouseClicked(e, modelCoords[0], modelCoords[1]);
doubleClickTimer.restart();
}
doubleClickTimer.restart();
}
}
@@ -598,12 +546,51 @@ public class ModelRenderPanel extends JPanel {
try {
return glContextManager.waitForModel().get();
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
throw new RuntimeException("无法获取模型引用: " + e.getMessage(), e);
}
}
return modelRef.get();
}
/**
* 异步加载新的模型并更新所有组件状态。
* * 这个方法解决了新模型加载后，各种工具（如 SelectionTool）仍然指向旧模型或未初始化的状态的问题。
* 它确保在模型加载完成后，清除旧的选中状态，并将工具切换回默认状态。
* * @param modelPath 新的模型文件路径。
* @return 包含加载完成的模型对象的 CompletableFuture。
*/
public CompletableFuture<Model2D> loadModel(String modelPath) {
CompletableFuture<Model2D> loadFuture = glContextManager.loadModel(modelPath);
return loadFuture.whenComplete((model, ex) -> {
SwingUtilities.invokeLater(() -> {
if (ex == null && model != null) {
this.modelRef.set(model);
resetPostLoadState(model);
modelsUpdate(model);
logger.info("ModelRenderPanel 模型更新完成，工具状态已重置。");
} else {
this.modelRef.set(null);
resetPostLoadState(null);
logger.error("模型加载失败，ModelRenderPanel 状态已重置。");
}
});
});
}
/**
* 重置加载新模型后需要清理或初始化的状态。
*/
private void resetPostLoadState(Model2D model) {
Tool defaultTool = toolManagement.getDefaultTool();
if (defaultTool instanceof SelectionTool) {
((SelectionTool) defaultTool).clearSelectedMeshes();
}
toolManagement.switchToDefaultTool();
if (model != null) {
resetCamera();
}
}
/**
* 重新设置面板大小
* <p>

6
src/main/java/com/chuangzhou/vivid2D/render/awt/ParametersPanel.java
View File

@@ -308,7 +308,6 @@ public class ParametersPanel extends JPanel {
Map<String, AnimationParameter> map = currentPart.getParameters();
if (map != null) {
map.remove(sel.getId());
// 如果 ModelPart 提供删除方法可以使用之；此处直接移除
} else {
// 反射尝试
Field f = currentPart.getClass().getDeclaredField("parameters");
@@ -318,6 +317,7 @@ public class ParametersPanel extends JPanel {
((Map) o).remove(sel.getId());
}
}
renderPanel.getParametersManagement().removeParameter(currentPart, sel.getId());
listModel.removeElement(sel);
selectParameter = null;
ParameterEventBroadcaster.getInstance().fireRemoveEvent(sel);
@@ -439,6 +439,10 @@ public class ParametersPanel extends JPanel {
return renderPanel.getSelectedMesh();
}
public ModelRenderPanel getRenderPanel() {
return renderPanel;
}
public AnimationParameter getSelectParameter() {
return selectParameter;
}

329
src/main/java/com/chuangzhou/vivid2D/render/awt/TransformPanel.java
View File

@@ -13,6 +13,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* @author tzdwindows 7
@@ -20,7 +22,6 @@ import java.util.Map;
public class TransformPanel extends JPanel implements ModelEvent {
private final ModelRenderPanel renderPanel;
private final List<ModelPart> selectedParts = new ArrayList<>();
private boolean isMultiSelection = false;
// 位置控制
private JTextField positionXField;
@@ -47,6 +48,9 @@ public class TransformPanel extends JPanel implements ModelEvent {
private boolean updatingUI = false; // 防止UI更新时触发事件
private javax.swing.Timer transformTimer; // 用于延迟处理变换输入
// 【新增字段】用于多选时的位移计算（记录多选部件的初始平均位置或第一个部件的位置）
private Vector2f initialPosition = new Vector2f();
private final OperationHistoryGlobal operationHistory;
public TransformPanel(ModelRenderPanel renderPanel) {
@@ -72,7 +76,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
gbc.gridx = 1;
gbc.gridy = row;
positionXField = new JTextField("0.0");
positionXField = new JTextField("0.00");
add(positionXField, gbc);
gbc.gridx = 2;
@@ -81,17 +85,25 @@ public class TransformPanel extends JPanel implements ModelEvent {
gbc.gridx = 3;
gbc.gridy = row++;
positionYField = new JTextField("0.0");
positionYField = new JTextField("0.00");
add(positionYField, gbc);
// 分隔线
gbc.gridx = 0;
gbc.gridy = row++;
gbc.gridwidth = 4;
add(new JSeparator(SwingConstants.HORIZONTAL), gbc);
// 旋转控制
gbc.gridx = 0;
gbc.gridy = row;
gbc.gridwidth = 1;
add(new JLabel("旋转角度:"), gbc);
gbc.gridx = 1;
gbc.gridy = row;
rotationField = new JTextField("0.0");
rotationField = new JTextField("0.00");
add(rotationField, gbc);
gbc.gridx = 2;
@@ -108,6 +120,12 @@ public class TransformPanel extends JPanel implements ModelEvent {
rotate90CCWButton.setToolTipText("逆时针旋转90度");
add(rotate90CCWButton, gbc);
// 分隔线
gbc.gridx = 0;
gbc.gridy = ++row;
gbc.gridwidth = 4;
add(new JSeparator(SwingConstants.HORIZONTAL), gbc);
// 缩放控制
gbc.gridx = 0;
gbc.gridy = ++row;
@@ -116,7 +134,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
gbc.gridx = 1;
gbc.gridy = row;
scaleXField = new JTextField("1.0");
scaleXField = new JTextField("1.00");
add(scaleXField, gbc);
gbc.gridx = 2;
@@ -125,7 +143,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
gbc.gridx = 3;
gbc.gridy = row;
scaleYField = new JTextField("1.0");
scaleYField = new JTextField("1.00");
add(scaleYField, gbc);
gbc.gridx = 0;
@@ -147,6 +165,12 @@ public class TransformPanel extends JPanel implements ModelEvent {
resetScaleButton.setToolTipText("重置为1:1缩放");
add(resetScaleButton, gbc);
// 分隔线
gbc.gridx = 0;
gbc.gridy = ++row;
gbc.gridwidth = 4;
add(new JSeparator(SwingConstants.HORIZONTAL), gbc);
// 中心点控制
gbc.gridx = 0;
gbc.gridy = ++row;
@@ -155,7 +179,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
gbc.gridx = 1;
gbc.gridy = row;
pivotXField = new JTextField("0.0");
pivotXField = new JTextField("0.00");
add(pivotXField, gbc);
gbc.gridx = 2;
@@ -164,11 +188,15 @@ public class TransformPanel extends JPanel implements ModelEvent {
gbc.gridx = 3;
gbc.gridy = row;
pivotYField = new JTextField("0.0");
pivotYField = new JTextField("0.00");
add(pivotYField, gbc);
// Set border
setBorder(BorderFactory.createTitledBorder("变换控制"));
// 占位符，确保组件靠上
gbc.gridx = 0;
gbc.gridy = ++row;
gbc.gridwidth = 4;
gbc.weighty = 1.0;
add(new JPanel(), gbc);
// 初始化定时器，用于延迟处理变换输入
transformTimer = new javax.swing.Timer(300, e -> applyTransformChanges());
@@ -233,7 +261,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
pivotXField.addActionListener(enterListener);
pivotYField.addActionListener(enterListener);
// 旋转按钮监听器修改（支持多选）
// 旋转按钮监听器修改（支持多选）- 保持不变
rotate90CWButton.addActionListener(e -> {
if (!selectedParts.isEmpty()) {
renderPanel.getGlContextManager().executeInGLContext(() -> {
@@ -253,9 +281,12 @@ public class TransformPanel extends JPanel implements ModelEvent {
// 记录多选操作历史
recordMultiPartOperation("ROTATION",
new HashMap<>(oldRotations),
new HashMap<>(newRotations));
oldRotations.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())),
newRotations.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())));
SwingUtilities.invokeLater(this::updateUIFromSelectedParts);
renderPanel.repaint();
});
}
@@ -280,15 +311,18 @@ public class TransformPanel extends JPanel implements ModelEvent {
// 记录多选操作历史
recordMultiPartOperation("ROTATION",
new HashMap<>(oldRotations),
new HashMap<>(newRotations));
oldRotations.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())),
newRotations.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())));
SwingUtilities.invokeLater(this::updateUIFromSelectedParts);
renderPanel.repaint();
});
}
});
// 翻转按钮监听器修改（支持多选）
// 翻转按钮监听器修改（支持多选）- 保持不变
flipXButton.addActionListener(e -> {
if (!selectedParts.isEmpty()) {
renderPanel.getGlContextManager().executeInGLContext(() -> {
@@ -308,9 +342,12 @@ public class TransformPanel extends JPanel implements ModelEvent {
// 记录多选操作历史
recordMultiPartOperation("SCALE",
new HashMap<>(oldScales),
new HashMap<>(newScales));
oldScales.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())),
newScales.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())));
SwingUtilities.invokeLater(this::updateUIFromSelectedParts);
renderPanel.repaint();
});
}
@@ -335,15 +372,18 @@ public class TransformPanel extends JPanel implements ModelEvent {
// 记录多选操作历史
recordMultiPartOperation("SCALE",
new HashMap<>(oldScales),
new HashMap<>(newScales));
oldScales.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())),
newScales.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())));
SwingUtilities.invokeLater(this::updateUIFromSelectedParts);
renderPanel.repaint();
});
}
});
// 重置缩放按钮监听器修改（支持多选）
// 重置缩放按钮监听器修改（支持多选）- 保持不变
resetScaleButton.addActionListener(e -> {
if (!selectedParts.isEmpty()) {
renderPanel.getGlContextManager().executeInGLContext(() -> {
@@ -361,9 +401,12 @@ public class TransformPanel extends JPanel implements ModelEvent {
// 记录多选操作历史
recordMultiPartOperation("SCALE",
new HashMap<>(oldScales),
new HashMap<>(newScales));
oldScales.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())),
newScales.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e2 -> (Object) e2.getValue())));
SwingUtilities.invokeLater(this::updateUIFromSelectedParts);
renderPanel.repaint();
});
}
@@ -372,6 +415,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
/**
* 记录多部件操作历史
* 【修复】简化操作历史记录，不再需要复杂的 Object[] 数组，直接记录 Map<ModelPart, Object>
*/
private void recordMultiPartOperation(String operationType, Map<ModelPart, Object> oldValues, Map<ModelPart, Object> newValues) {
if (operationHistory != null && !selectedParts.isEmpty()) {
@@ -385,32 +429,30 @@ public class TransformPanel extends JPanel implements ModelEvent {
/**
* 批量应用变换到所有选中部件
* 【修复】拆分逻辑，这里只处理绝对值（旋转、缩放、中心点），位移在 applyTransformChanges 中处理
*/
private void applyTransformToAllParts(float posX, float posY, float rotationDegrees,
float scaleX, float scaleY, float pivotX, float pivotY) {
private void applyAbsoluteTransformToAllParts(float rotationDegrees,
float scaleX, float scaleY, float pivotX, float pivotY) {
// 记录变换前的状态
Map<ModelPart, Object> oldStates = new HashMap<>();
Map<ModelPart, Object> newStates = new HashMap<>();
for (ModelPart part : selectedParts) {
// 记录旧状态
// 记录旧状态 (只记录绝对变换)
Object[] oldState = new Object[]{
new Vector2f(part.getPosition()),
part.getRotation(),
new Vector2f(part.getScale()),
new Vector2f(part.getPivot())
};
oldStates.put(part, oldState);
// 应用变换
part.setPosition(posX, posY);
// 应用绝对变换
part.setRotation((float) Math.toRadians(rotationDegrees));
part.setScale(scaleX, scaleY);
part.setPivot(pivotX, pivotY);
// 记录新状态
Object[] newState = new Object[]{
new Vector2f(part.getPosition()),
part.getRotation(),
new Vector2f(part.getScale()),
new Vector2f(part.getPivot())
@@ -419,7 +461,42 @@ public class TransformPanel extends JPanel implements ModelEvent {
}
// 记录批量操作历史
recordMultiPartOperation("BATCH_TRANSFORM", oldStates, newStates);
recordMultiPartOperation("BATCH_ABS_TRANSFORM", oldStates, newStates);
}
/**
* 批量应用相对位移到所有选中部件
* 模仿 SelectionTool 的多选移动逻辑：计算相对位移并应用
*/
private void applyRelativePositionToAllParts(float targetPosX, float targetPosY) {
if (selectedParts.isEmpty()) return;
// 1. 计算相对位移
float deltaX = targetPosX - initialPosition.x;
float deltaY = targetPosY - initialPosition.y;
if (deltaX == 0.0f && deltaY == 0.0f) return;
// 2. 记录旧状态
Map<ModelPart, Object> oldPositions = new HashMap<>();
Map<ModelPart, Object> newPositions = new HashMap<>();
for (ModelPart part : selectedParts) {
Vector2f oldPos = new Vector2f(part.getPosition());
oldPositions.put(part, oldPos);
// 3. 应用相对位移
part.setPosition(oldPos.x + deltaX, oldPos.y + deltaY);
// 4. 记录新状态
newPositions.put(part, new Vector2f(part.getPosition()));
}
// 5. 更新初始位置为新的目标位置
initialPosition.set(targetPosX, targetPosY);
// 6. 记录操作历史
recordMultiPartOperation("POSITION", oldPositions, newPositions);
}
/**
@@ -427,45 +504,24 @@ public class TransformPanel extends JPanel implements ModelEvent {
*/
@Override
public void trigger(String eventName, Object source) {
// 【修复】确保即使在多选时，来自 GLContext 的单个部件更新也能触发 UI 刷新
if (!(source instanceof ModelPart) || !selectedParts.contains(source)) return;
SwingUtilities.invokeLater(() -> {
// 如果是多选，只更新UI但不记录历史（避免循环触发）
if (selectedParts.size() > 1) {
updatingUI = true;
updateUIForMultiSelection();
updatingUI = false;
} else if (selectedParts.size() == 1) {
updatingUI = true;
try {
updatingUI = true;
try {
if (selectedParts.size() == 1) {
// 单选：显示具体值
ModelPart part = (ModelPart) source;
switch (eventName) {
case "position":
Vector2f position = part.getPosition();
positionXField.setText(String.format("%.2f", position.x));
positionYField.setText(String.format("%.2f", position.y));
break;
case "rotation":
float currentRotation = (float) Math.toDegrees(part.getRotation());
currentRotation = normalizeAngle(currentRotation);
rotationField.setText(String.format("%.2f", currentRotation));
break;
case "scale":
Vector2f scale = part.getScale();
scaleXField.setText(String.format("%.2f", scale.x));
scaleYField.setText(String.format("%.2f", scale.y));
break;
case "pivot":
Vector2f pivot = part.getPivot();
pivotXField.setText(String.format("%.2f", pivot.x));
pivotYField.setText(String.format("%.2f", pivot.y));
break;
}
} catch (Exception ex) {
ex.printStackTrace();
updateUIFromSinglePart(part);
} else {
// 多选：更新 UI，但不需要记录历史（防止循环）
updateUIForMultiSelection();
}
updatingUI = false;
} catch (Exception ex) {
ex.printStackTrace();
}
updatingUI = false;
});
}
@@ -491,6 +547,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
/**
* 应用所有变换更改（支持多选）
* 【修复】拆分位移和绝对变换逻辑
*/
private void applyTransformChanges() {
if (updatingUI || selectedParts.isEmpty()) return;
@@ -506,9 +563,13 @@ public class TransformPanel extends JPanel implements ModelEvent {
float pivotX = Float.parseFloat(pivotXField.getText());
float pivotY = Float.parseFloat(pivotYField.getText());
// 批量应用到所有选中部件
applyTransformToAllParts(posX, posY, rotationDegrees, scaleX, scaleY, pivotX, pivotY);
// 1. 处理位置/位移 (相对变换)
applyRelativePositionToAllParts(posX, posY);
// 2. 处理绝对变换 (旋转、缩放、中心点)
applyAbsoluteTransformToAllParts(rotationDegrees, scaleX, scaleY, pivotX, pivotY);
SwingUtilities.invokeLater(() -> updateUIFromSelectedParts()); // 确保 UI 立即刷新以反映新的初始位置
renderPanel.repaint();
} catch (NumberFormatException ex) {
// 输入无效时恢复之前的值
@@ -519,6 +580,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
/**
* 从选中的部件更新UI（支持多选）
* 【修复】在多选模式下，显示各属性的平均值，并将该平均值作为新的 initialPosition
*/
private void updateUIFromSelectedParts() {
if (selectedParts.isEmpty()) return;
@@ -526,14 +588,12 @@ public class TransformPanel extends JPanel implements ModelEvent {
updatingUI = true;
try {
if (selectedParts.size() == 1) {
// 单选：显示具体值
ModelPart part = selectedParts.get(0);
updateUIFromSinglePart(part);
isMultiSelection = false;
// 记录单选时的初始位置
initialPosition.set(part.getPosition());
} else {
// 多选：显示特殊标识或平均值
updateUIForMultiSelection();
isMultiSelection = true;
}
} catch (Exception ex) {
ex.printStackTrace();
@@ -542,7 +602,7 @@ public class TransformPanel extends JPanel implements ModelEvent {
}
/**
* 从单个部件更新UI
* 从单个部件更新UI - 保持不变
*/
private void updateUIFromSinglePart(ModelPart part) {
// 更新位置
@@ -568,23 +628,66 @@ public class TransformPanel extends JPanel implements ModelEvent {
/**
* 多选时的UI显示
* 【改进】计算并显示平均值作为多选时的参考值
*/
private void updateUIForMultiSelection() {
// 多选时显示特殊值或平均值
positionXField.setText("[多选]");
positionYField.setText("[多选]");
rotationField.setText("[多选]");
scaleXField.setText("[多选]");
scaleYField.setText("[多选]");
pivotXField.setText("[多选]");
pivotYField.setText("[多选]");
// 计算平均值
float avgX = 0;
float avgY = 0;
float avgRot = 0;
float avgScaleX = 0;
float avgScaleY = 0;
float avgPivotX = 0;
float avgPivotY = 0;
// 或者计算平均值（可选）
// calculateAndDisplayAverageValues();
int count = selectedParts.size();
for (ModelPart part : selectedParts) {
avgX += part.getPosition().x;
avgY += part.getPosition().y;
avgRot += normalizeAngle((float) Math.toDegrees(part.getRotation()));
avgScaleX += part.getScale().x;
avgScaleY += part.getScale().y;
avgPivotX += part.getPivot().x;
avgPivotY += part.getPivot().y;
}
avgX /= count;
avgY /= count;
avgRot /= count;
avgScaleX /= count;
avgScaleY /= count;
avgPivotX /= count;
avgPivotY /= count;
// 设置平均值到字段，并更新初始位置
initialPosition.set(avgX, avgY);
positionXField.setText(String.format("%.2f", avgX));
positionYField.setText(String.format("%.2f", avgY));
rotationField.setText(String.format("%.2f", avgRot));
scaleXField.setText(String.format("%.2f", avgScaleX));
scaleYField.setText(String.format("%.2f", avgScaleY));
pivotXField.setText(String.format("%.2f", avgPivotX));
pivotYField.setText(String.format("%.2f", avgPivotY));
// 【可选改进】如果某个属性在多选部件间不一致，可以显示特殊标记，例如：
// if (!isUniformRotation()) rotationField.setText("[混合]");
}
// 【新增辅助方法】检查多选部件的旋转值是否一致
private boolean isUniformRotation() {
if (selectedParts.isEmpty()) return true;
float firstRotation = selectedParts.get(0).getRotation();
for (ModelPart part : selectedParts) {
if (Math.abs(part.getRotation() - firstRotation) > 0.0001f) {
return false;
}
}
return true;
}
/**
* 设置选中的部件（支持多选）
* 【修复】添加了对 initialPosition 的初始化
*/
public void setSelectedParts(List<ModelPart> parts) {
// 移除旧部件的事件监听
@@ -602,69 +705,11 @@ public class TransformPanel extends JPanel implements ModelEvent {
}
}
// 【关键修复】更新 UI 状态后，会设置 initialPosition
updateUIState();
}
/**
* 添加选中部件
*/
public void addSelectedPart(ModelPart part) {
if (part != null && !selectedParts.contains(part)) {
selectedParts.add(part);
part.addEvent(this);
updateUIState();
}
}
/**
* 移除选中部件
*/
public void removeSelectedPart(ModelPart part) {
if (part != null && selectedParts.contains(part)) {
selectedParts.remove(part);
part.removeEvent(this);
updateUIState();
}
}
/**
* 清空选中部件
*/
public void clearSelectedParts() {
for (ModelPart part : selectedParts) {
part.removeEvent(this);
}
selectedParts.clear();
updateUIState();
}
/**
* 获取当前选中部件
*/
public ModelPart getSelectedPart() {
return selectedParts.isEmpty() ? null : selectedParts.get(0);
}
/**
* 获取所有选中部件
*/
public List<ModelPart> getSelectedParts() {
return new ArrayList<>(selectedParts);
}
/**
* 获取当前选中部件数量
*/
public int getSelectedPartsCount() {
return selectedParts.size();
}
/**
* 检查是否是多选状态
*/
public boolean isMultiSelection() {
return isMultiSelection;
}
// ... (addSelectedPart, removeSelectedPart, clearSelectedParts, getSelectedPart, getSelectedParts, getSelectedPartsCount, isMultiSelection 保持不变)
private void updateUIState() {
updatingUI = true;
@@ -680,8 +725,8 @@ public class TransformPanel extends JPanel implements ModelEvent {
scaleYField.setText("1.00");
pivotXField.setText("0.00");
pivotYField.setText("0.00");
initialPosition.set(0.0f, 0.0f); // 清空初始位置
setControlsEnabled(false);
isMultiSelection = false;
}
updatingUI = false;
}

75
src/main/java/com/chuangzhou/vivid2D/render/awt/manager/GLContextManager.java
View File

@@ -10,6 +10,7 @@ import org.lwjgl.system.MemoryUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.nio.ByteBuffer;
@@ -31,7 +32,7 @@ public class GLContextManager {
private BufferedImage currentFrame;
private volatile boolean contextInitialized = false;
private final CompletableFuture<Void> contextReady = new CompletableFuture<>();
private final String modelPath;
private String modelPath;
private final AtomicReference<Model2D> modelRef = new AtomicReference<>();
private BufferedImage lastFrame = null;
@@ -215,8 +216,13 @@ public class GLContextManager {
Model2D currentModel = modelRef.get();
if (currentModel != null) {
try {
// 使用 RenderSystem 清除缓冲区
RenderSystem.setClearColor(0.18f, 0.18f, 0.25f, 1f);
Color panelBackground = UIManager.getColor("Panel.background");
Color darkerBackground = panelBackground.darker();
float r = darkerBackground.getRed() / 255.0f;
float g = darkerBackground.getGreen() / 255.0f;
float b = darkerBackground.getBlue() / 255.0f;
float a = darkerBackground.getAlpha() / 255.0f;
RenderSystem.setClearColor(r, g, b, a);
RenderSystem.clear(RenderSystem.GL_COLOR_BUFFER_BIT | RenderSystem.GL_DEPTH_BUFFER_BIT);
// 渲染模型
ModelRender.render(1.0f / 60f, currentModel);
@@ -580,6 +586,65 @@ public class GLContextManager {
return targetScale;
}
/**
* 动态加载新的模型，在 GL 线程上执行文件 I/O 和模型初始化。
* * @param newModelPath 新的模型文件路径。
* @return 包含加载完成的模型对象的 CompletableFuture，可用于获取加载结果或处理错误。
*/
public CompletableFuture<Model2D> loadModel(String newModelPath) {
// 使用 executeInGLContext(Callable) 确保模型加载在 GL 线程上进行，并返回结果
return executeInGLContext(() -> {
Model2D model;
try {
if (newModelPath != null && !newModelPath.isEmpty()) {
// 尝试从文件中加载模型
model = Model2D.loadFromFile(newModelPath);
logger.info("动态加载模型成功: {}", newModelPath);
} else {
// 如果路径为空，创建一个默认空模型
model = new Model2D("新的空项目");
logger.info("创建新的空模型项目");
}
// 1. 更新上下文中的模型路径和模型引用
this.modelPath = newModelPath; // 更新 modelPath
modelRef.set(model); // 设置新的 Model2D 实例
// 2. 确保如果外部调用者正在等待初始模型（通过 waitForModel），它能得到结果
// 注意：这里我们假设外部主要依赖于这个 loadModel 返回的 Future，
// 但如果 ModelReady 尚未完成，我们让它完成（通常在空启动时发生）。
if (!modelReady.isDone()) {
modelReady.complete(model);
}
// 3. 请求重绘，以便立即显示新模型
if (repaintCallback != null) {
// 确保 repaint() 调用返回到 Swing EDT
SwingUtilities.invokeLater(repaintCallback::repaint);
}
return model; // 返回加载成功的模型
} catch (Throwable e) {
logger.error("动态加载模型失败: {}", e.getMessage(), e);
// 加载失败时，设置一个空的模型以清除渲染画面，避免崩溃
Model2D emptyModel = new Model2D("加载失败");
modelRef.set(emptyModel);
this.modelPath = null; // 清除路径
// 确保通知外部调用者加载失败
if (repaintCallback != null) {
SwingUtilities.invokeLater(repaintCallback::repaint);
}
// 抛出异常，让 CompletableFuture 携带失败信息
throw new Exception("模型加载失败: " + e.getMessage(), e);
}
});
}
public interface RepaintCallback {
void repaint();
}
@@ -608,6 +673,10 @@ public class GLContextManager {
this.cameraDragging = cameraDragging;
}
public String getModelPath() {
return modelPath;
}
/**
* 从 GLContextManager 获取当前模型引用
*/

78
src/main/java/com/chuangzhou/vivid2D/render/awt/manager/LayerOperationManager.java
View File

@@ -4,6 +4,8 @@ import com.chuangzhou.vivid2D.render.model.Model2D;
import com.chuangzhou.vivid2D.render.model.ModelPart;
import org.joml.Vector2f;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -11,24 +13,89 @@ import java.util.Map;
public class LayerOperationManager {
private final Model2D model;
public static class LayerInfo implements Serializable {
@Serial
private static final long serialVersionUID = 2L;
String name;
int orderIndex;
public LayerInfo(String name, int orderIndex) {
this.name = name;
this.orderIndex = orderIndex;
}
@Override
public String toString() {
return "LayerInfo{" +
"name='" + name + '\'' +
", orderIndex=" + orderIndex +
'}';
}
}
public final List<LayerInfo> layerMetadata;
public LayerOperationManager(Model2D model) {
this.model = model;
this.layerMetadata = new ArrayList<>();
initializeMetadata();
}
/**
* 加载并替换当前的图层元数据列表，并根据加载的顺序重新排列 Model2D 内部的图层。
* 通常在反序列化（加载文件）时调用。
* @param loadedMetadata 从文件加载的 LayerInfo 列表
*/
public void loadMetadata(List<LayerInfo> loadedMetadata) {
if (loadedMetadata == null || loadedMetadata.isEmpty()) return;
this.layerMetadata.clear();
this.layerMetadata.addAll(loadedMetadata);
Map<String, ModelPart> partMap = model.getPartMap();
if (partMap == null || partMap.isEmpty()) return;
List<ModelPart> modelReorderList = new ArrayList<>(loadedMetadata.size());
for (LayerInfo info : loadedMetadata) {
ModelPart part = partMap.get(info.name);
if (part != null) {
modelReorderList.add(part);
} else {
System.err.println("Warning: ModelPart with name '" + info.name + "' not found during metadata loading. Skipping part.");
}
}
if (!modelReorderList.isEmpty()) {
replaceModelPartsList(modelReorderList);
model.markNeedsUpdate();
} else {
System.err.println("Error: Could not reconstruct model parts list from loaded metadata.");
}
}
private void initializeMetadata() {
layerMetadata.clear();
List<ModelPart> parts = model.getParts();
if (parts != null) {
for (int i = 0; i < parts.size(); i++) {
ModelPart part = parts.get(i);
layerMetadata.add(new LayerInfo(part.getName(), i));
}
}
}
public void addLayer(String name) {
model.createPart(name);
ModelPart newPart = model.createPart(name);
if (newPart != null) {
int newIndex = model.getParts() != null ? model.getParts().size() - 1 : 0;
layerMetadata.add(new LayerInfo(newPart.getName(), newIndex));
}
model.markNeedsUpdate();
}
public void removeLayer(ModelPart part) {
if (part == null) return;
List<ModelPart> parts = model.getParts();
if (parts != null) parts.remove(part);
Map<String, ModelPart> partMap = model.getPartMap();
if (partMap != null) partMap.remove(part.getName());
initializeMetadata();
model.markNeedsUpdate();
}
@@ -38,6 +105,7 @@ public class LayerOperationManager {
newModelParts.add(visualOrder.get(i));
}
replaceModelPartsList(newModelParts);
initializeMetadata();
model.markNeedsUpdate();
}
@@ -67,4 +135,4 @@ public class LayerOperationManager {
e.printStackTrace();
}
}
}
}

47
src/main/java/com/chuangzhou/vivid2D/render/awt/manager/ParametersManagement.java
View File

@@ -1,20 +1,56 @@
package com.chuangzhou.vivid2D.render.awt.manager;
import com.chuangzhou.vivid2D.render.awt.ParametersPanel;
import com.chuangzhou.vivid2D.render.awt.manager.data.LayerOperationManagerData;
import com.chuangzhou.vivid2D.render.awt.manager.data.ParametersManagementData;
import com.chuangzhou.vivid2D.render.model.AnimationParameter;
import com.chuangzhou.vivid2D.render.model.ModelPart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.List;
public class ParametersManagement {
private static final Logger logger = LoggerFactory.getLogger(ParametersManagement.class);
private final ParametersPanel parametersPanel;
private final List<Parameter> oldValues = new ArrayList<>();
public List<Parameter> oldValues = new ArrayList<>();
public ParametersManagement(ParametersPanel parametersPanel) {
this.parametersPanel = parametersPanel;
}
public static ParametersManagement getInstance(ParametersPanel parametersPanel) {
String managementFilePath = parametersPanel.getRenderPanel().getGlContextManager().getModelPath() + ".data";
File managementFile = new File(managementFilePath);
if (managementFile.exists()) {
logger.info("已找到参数管理数据文件: {}", managementFilePath);
try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(managementFile))) {
Object layerDataObject = ois.readObject();
Object o = ois.readObject();
if (o instanceof ParametersManagementData managementData) {
List<ModelPart> parts = parametersPanel.getRenderPanel().getModel().getParts();
ParametersManagement management = managementData.toParametersManagement(parametersPanel, parts);
//logger.info("参数管理数据转换成功: {}", management);
ParametersManagement instance = new ParametersManagement(parametersPanel);
instance.oldValues = management.oldValues;
//logger.info("参数管理数据加载成功: {}", management.oldValues);
return instance;
} else {
logger.warn("加载参数管理数据失败: 预期第二个对象为ParametersManagementData，但实际为 {}", o != null ? o.getClass().getName() : "null");
}
} catch (Exception e) {
logger.warn("加载参数管理数据失败: {}", e.getMessage());
}
} else {
logger.info("未找到参数管理数据文件 {}，创建新的参数管理实例", managementFilePath);
}
return new ParametersManagement(parametersPanel);
}
/**
* 获取ModelPart的所有参数
* @param modelPart 部件
@@ -71,7 +107,7 @@ public class ParametersManagement {
Parameter existingParameter = oldValues.get(i);
if (existingParameter.modelPart().equals(modelPart)) {
// 更新现有记录（复制所有列表以确保记录的不可变性）
List<AnimationParameter> newAnimationParameters = new ArrayList<>(existingParameter.animationParameter()); // NEW
List<AnimationParameter> newAnimationParameters = new ArrayList<>(existingParameter.animationParameter());
List<String> newParamIds = new ArrayList<>(existingParameter.paramId());
List<Object> newValues = new ArrayList<>(existingParameter.value());
List<Float> newKeyframes = new ArrayList<>(existingParameter.keyframe());
@@ -110,6 +146,10 @@ public class ParametersManagement {
for (int i = 0; i < oldValues.size(); i++) {
Parameter existingParameter = oldValues.get(i);
if (existingParameter.modelPart().equals(modelPart)) {
if ("all".equals(paramId)) {
oldValues.remove(i);
return;
}
List<AnimationParameter> newAnimationParameters = new ArrayList<>(existingParameter.animationParameter());
List<String> newParamIds = new ArrayList<>(existingParameter.paramId());
List<Object> newValues = new ArrayList<>(existingParameter.value());
@@ -176,6 +216,9 @@ public class ParametersManagement {
return null;
}
public ParametersPanel getParametersPanel() {
return parametersPanel;
}
public record Parameter(
ModelPart modelPart,

19
src/main/java/com/chuangzhou/vivid2D/render/awt/manager/data/LayerOperationManagerData.java Normal file
View File

@@ -0,0 +1,19 @@
package com.chuangzhou.vivid2D.render.awt.manager.data;
import com.chuangzhou.vivid2D.render.awt.manager.LayerOperationManager;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
public class LayerOperationManagerData implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
public List<LayerOperationManager.LayerInfo> layerMetadata;
public LayerOperationManagerData(List<LayerOperationManager.LayerInfo> layerMetadata) {
this.layerMetadata = layerMetadata;
}
public LayerOperationManagerData() {}
}

247
src/main/java/com/chuangzhou/vivid2D/render/awt/manager/data/ParametersManagementData.java Normal file
View File

@@ -0,0 +1,247 @@
package com.chuangzhou.vivid2D.render.awt.manager.data;
import com.chuangzhou.vivid2D.render.awt.ParametersPanel;
import com.chuangzhou.vivid2D.render.awt.manager.ParametersManagement;
import com.chuangzhou.vivid2D.render.model.AnimationParameter;
import com.chuangzhou.vivid2D.render.model.ModelPart;
import com.chuangzhou.vivid2D.render.model.data.ParameterData;
import com.chuangzhou.vivid2D.render.model.data.PartData;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* ParametersManagement 的序列化数据类
*/
public class ParametersManagementData implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
public List<ManagementParameterRecord> oldValues;
public boolean isBreakage;
public ParametersManagementData(boolean isBreakage) {
this.oldValues = new ArrayList<>();
this.isBreakage = isBreakage;
}
public ParametersManagementData() {
this.oldValues = new ArrayList<>();
this.isBreakage = false;
}
public ParametersManagementData(ParametersManagement management) {
this();
if (management != null) {
for (ParametersManagement.Parameter param : management.oldValues) {
ManagementParameterRecord paramRecord = new ManagementParameterRecord(param);
this.oldValues.add(paramRecord);
}
}
}
public ParametersManagement toParametersManagement(ParametersPanel parametersPanel) {
ParametersManagement management = new ParametersManagement(parametersPanel);
if (this.oldValues != null) {
for (ManagementParameterRecord paramRecord : this.oldValues) {
ParametersManagement.Parameter param = paramRecord.toParameter();
management.oldValues.add(param);
}
}
return management;
}
/**
* 使用 ModelPart 列表来重新关联 ModelPart 引用
*/
public ParametersManagement toParametersManagement(ParametersPanel parametersPanel, List<ModelPart> modelParts) {
ParametersManagement management = new ParametersManagement(parametersPanel);
if (this.oldValues != null) {
for (ManagementParameterRecord paramRecord : this.oldValues) {
ParametersManagement.Parameter param = paramRecord.toParameter(modelParts);
management.oldValues.add(param);
}
}
return management;
}
public ParametersManagementData copy() {
ParametersManagementData copy = new ParametersManagementData();
copy.oldValues = new ArrayList<>();
if (this.oldValues != null) {
for (ManagementParameterRecord paramRecord : this.oldValues) {
copy.oldValues.add(paramRecord.copy());
}
}
return copy;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("ParametersManagementData:\n");
if (oldValues == null || oldValues.isEmpty()) {
sb.append(" No parameter records\n");
} else {
for (int i = 0; i < oldValues.size(); i++) {
ManagementParameterRecord paramRecord = oldValues.get(i);
sb.append(String.format(" Record %d: %s\n", i, paramRecord.toString()));
}
}
return sb.toString();
}
public static class ManagementParameterRecord implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
public String modelPartName; // 通过名称引用 ModelPart
public PartData modelPartData; // 新增：完整的 ModelPart 数据
public List<ParameterData> animationParameters;
public List<String> paramIds;
public List<Object> values;
public List<Float> keyframes;
public List<Boolean> isKeyframes;
public ManagementParameterRecord() {
this.animationParameters = new ArrayList<>();
this.paramIds = new ArrayList<>();
this.values = new ArrayList<>();
this.keyframes = new ArrayList<>();
this.isKeyframes = new ArrayList<>();
}
public ManagementParameterRecord(ParametersManagement.Parameter parameter) {
this();
if (parameter.modelPart() != null) {
this.modelPartName = parameter.modelPart().getName();
// 序列化完整的 ModelPart 数据
this.modelPartData = new PartData(parameter.modelPart());
}
// 序列化 AnimationParameter 列表
if (parameter.animationParameter() != null) {
for (AnimationParameter animParam : parameter.animationParameter()) {
ParameterData animParamData = new ParameterData(animParam);
this.animationParameters.add(animParamData);
}
}
// 序列化其他列表
if (parameter.paramId() != null) {
this.paramIds.addAll(parameter.paramId());
}
if (parameter.value() != null) {
this.values.addAll(parameter.value());
}
if (parameter.keyframe() != null) {
this.keyframes.addAll(parameter.keyframe());
}
if (parameter.isKeyframe() != null) {
this.isKeyframes.addAll(parameter.isKeyframe());
}
}
public ParametersManagement.Parameter toParameter() {
// 注意：ModelPart 需要通过名称在反序列化时重新关联
List<AnimationParameter> animParams = new ArrayList<>();
if (this.animationParameters != null) {
for (ParameterData animParamData : this.animationParameters) {
AnimationParameter animParam = animParamData.toAnimationParameter();
animParams.add(animParam);
}
}
return new ParametersManagement.Parameter(
null, // ModelPart 需要在外部重新设置
animParams,
this.paramIds != null ? new ArrayList<>(this.paramIds) : new ArrayList<>(),
this.values != null ? new ArrayList<>(this.values) : new ArrayList<>(),
this.keyframes != null ? new ArrayList<>(this.keyframes) : new ArrayList<>(),
this.isKeyframes != null ? new ArrayList<>(this.isKeyframes) : new ArrayList<>()
);
}
/**
* 使用 ModelPart 列表重新关联 ModelPart 引用
*/
public ParametersManagement.Parameter toParameter(List<ModelPart> modelParts) {
ModelPart modelPart = null;
// 通过名称查找对应的 ModelPart
if (this.modelPartName != null && modelParts != null) {
for (ModelPart part : modelParts) {
if (this.modelPartName.equals(part.getName())) {
modelPart = part;
break;
}
}
}
// 如果没找到，尝试使用 modelPartData 重建
if (modelPart == null && this.modelPartData != null) {
try {
// 创建一个空的 meshMap，因为这里可能没有完整的网格上下文
modelPart = this.modelPartData.toModelPart(new java.util.HashMap<>());
} catch (Exception e) {
System.err.println("重建 ModelPart 失败: " + e.getMessage());
}
}
List<AnimationParameter> animParams = new ArrayList<>();
if (this.animationParameters != null) {
for (ParameterData animParamData : this.animationParameters) {
AnimationParameter animParam = animParamData.toAnimationParameter();
animParams.add(animParam);
}
}
return new ParametersManagement.Parameter(
modelPart,
animParams,
this.paramIds != null ? new ArrayList<>(this.paramIds) : new ArrayList<>(),
this.values != null ? new ArrayList<>(this.values) : new ArrayList<>(),
this.keyframes != null ? new ArrayList<>(this.keyframes) : new ArrayList<>(),
this.isKeyframes != null ? new ArrayList<>(this.isKeyframes) : new ArrayList<>()
);
}
public ManagementParameterRecord copy() {
ManagementParameterRecord copy = new ManagementParameterRecord();
copy.modelPartName = this.modelPartName;
copy.modelPartData = this.modelPartData != null ? this.modelPartData.copy() : null;
// 深拷贝 animationParameters
copy.animationParameters = new ArrayList<>();
if (this.animationParameters != null) {
for (ParameterData animParam : this.animationParameters) {
copy.animationParameters.add(animParam.copy());
}
}
// 深拷贝其他列表
copy.paramIds = this.paramIds != null ? new ArrayList<>(this.paramIds) : new ArrayList<>();
copy.values = this.values != null ? new ArrayList<>(this.values) : new ArrayList<>();
copy.keyframes = this.keyframes != null ? new ArrayList<>(this.keyframes) : new ArrayList<>();
copy.isKeyframes = this.isKeyframes != null ? new ArrayList<>(this.isKeyframes) : new ArrayList<>();
return copy;
}
@Override
public String toString() {
return String.format(
"ManagementParameterRecord[Part=%s, Params=%s, Values=%s, Keyframes=%s]",
modelPartName, paramIds, values, keyframes
);
}
}
}

79
src/main/java/com/chuangzhou/vivid2D/render/awt/util/FrameInterpolator.java
View File

@@ -82,27 +82,38 @@ public class FrameInterpolator {
}
// ---- 找 paramId 对应索引集合 ----
private static List<Integer> findIndicesForParam(ParametersManagement.Parameter fullParam, String paramId) {
private static List<Integer> findIndicesForParam(ParametersManagement.Parameter fullParam, String paramId, AnimationParameter currentAnimationParameter) {
List<Integer> indices = new ArrayList<>();
if (fullParam == null || fullParam.paramId() == null) return indices;
if (fullParam == null || fullParam.paramId() == null || currentAnimationParameter == null) return indices;
List<String> pids = fullParam.paramId();
// (NEW) Get the list of associated animation parameters
List<AnimationParameter> animParams = fullParam.animationParameter();
// (NEW) Safety check
if (animParams == null || animParams.size() != pids.size()) {
// Mismatch in list sizes, cannot safely proceed
return indices;
}
for (int i = 0; i < pids.size(); i++) {
if (paramId.equals(pids.get(i))) indices.add(i);
// (MODIFIED) Check both paramId AND the animation parameter
if (paramId.equals(pids.get(i)) && currentAnimationParameter.equals(animParams.get(i))) {
indices.add(i);
}
}
return indices;
}
// ---- 在指定索引集合中查找围绕 current 的前后关键帧（返回全局索引） ----
private static int[] findSurroundingKeyframesForIndices(List<?> animParams, List<Boolean> isKeyframeList, List<Integer> indices, float current) {
private static int[] findSurroundingKeyframesForIndices(List<Float> keyframes, List<Integer> indices, float current) {
int prevIndex = -1;
int nextIndex = -1;
float prevVal = Float.NEGATIVE_INFINITY;
float nextVal = Float.POSITIVE_INFINITY;
if (animParams == null || indices == null) return new int[]{-1, -1};
if (keyframes == null || indices == null) return new int[]{-1, -1};
for (int idx : indices) {
if (idx < 0 || idx >= animParams.size()) continue;
if (idx < 0 || idx >= keyframes.size()) continue;
// 注意：这里不再强制要求 isKeyframe 为 true，因实时广播可能没有标记为 keyframe
float val = getAnimValueSafely(animParams.get(idx));
float val = keyframes.get(idx);
if (val <= current) {
if (prevIndex == -1 || val >= prevVal) {
prevIndex = idx;
@@ -128,13 +139,14 @@ public class FrameInterpolator {
}
// ---- 计算 position/scale/pivot 的目标值（在 fullParam 的特定 paramId 索引集合中计算） ----
private static boolean computeVec2Target(ParametersManagement.Parameter fullParam, String paramId, float current, float[] out) {
private static boolean computeVec2Target(ParametersManagement.Parameter fullParam, String paramId, float current, float[] out, AnimationParameter currentAnimationParameter) {
if (fullParam == null || out == null) return false;
List<Integer> idxs = findIndicesForParam(fullParam, paramId);
// (MODIFIED) Pass currentAnimationParameter
List<Integer> idxs = findIndicesForParam(fullParam, paramId, currentAnimationParameter);
if (idxs.isEmpty()) return false;
List<AnimationParameter> animParams = fullParam.animationParameter();
//List<Boolean> isKey = fullParam.isKeyframe(); // 不强制使用 isKeyframe
int[] idx = findSurroundingKeyframesForIndices(animParams, fullParam.isKeyframe(), idxs, current);
int[] idx = findSurroundingKeyframesForIndices(fullParam.keyframe(), idxs, current);
int prevIndex = idx[0], nextIndex = idx[1];
List<Object> values = fullParam.value();
@@ -148,8 +160,8 @@ public class FrameInterpolator {
} else {
float[] prev = readVec2(values.get(prevIndex));
float[] next = readVec2(values.get(nextIndex));
float prevVal = getAnimValueSafely(animParams.get(prevIndex));
float nextVal = getAnimValueSafely(animParams.get(nextIndex));
float prevVal = fullParam.keyframe().get(prevIndex);
float nextVal = fullParam.keyframe().get(nextIndex);
float t = computeT(prevVal, nextVal, current);
out[0] = prev[0] + t * (next[0] - prev[0]);
out[1] = prev[1] + t * (next[1] - prev[1]);
@@ -168,7 +180,7 @@ public class FrameInterpolator {
for (int i : idxs) {
if (i < 0 || i >= animParams.size()) continue;
// 允许非 keyframe 的值作为实时覆盖
float val = getAnimValueSafely(animParams.get(i));
float val = fullParam.keyframe().get(i);
if (Float.compare(val, current) == 0) {
float[] v = readVec2(values.get(i));
out[0] = v[0]; out[1] = v[1];
@@ -180,13 +192,14 @@ public class FrameInterpolator {
return false;
}
private static boolean computeRotationTargetGeneric(ParametersManagement.Parameter fullParam, String paramId, float current, float[] outSingle) {
private static boolean computeRotationTargetGeneric(ParametersManagement.Parameter fullParam, String paramId, float current, float[] outSingle, AnimationParameter currentAnimationParameter) {
if (fullParam == null || outSingle == null) return false;
List<Integer> idxs = findIndicesForParam(fullParam, paramId);
// (MODIFIED) Pass currentAnimationParameter
List<Integer> idxs = findIndicesForParam(fullParam, paramId, currentAnimationParameter);
if (idxs.isEmpty()) return false;
List<?> animParams = fullParam.animationParameter();
List<Object> values = fullParam.value();
int[] idx = findSurroundingKeyframesForIndices(animParams, fullParam.isKeyframe(), idxs, current);
int[] idx = findSurroundingKeyframesForIndices(fullParam.keyframe(), idxs, current);
int prevIndex = idx[0], nextIndex = idx[1];
try {
@@ -197,8 +210,8 @@ public class FrameInterpolator {
} else {
float p = toFloat(values.get(prevIndex));
float q = toFloat(values.get(nextIndex));
float prevVal = getAnimValueSafely(animParams.get(prevIndex));
float nextVal = getAnimValueSafely(animParams.get(nextIndex));
float prevVal = fullParam.keyframe().get(prevIndex);
float nextVal = fullParam.keyframe().get(nextIndex);
float t = computeT(prevVal, nextVal, current);
float diff = normalizeAngle(q - p);
target = p + diff * t;
@@ -211,7 +224,7 @@ public class FrameInterpolator {
float found = Float.NaN;
for (int i : idxs) {
if (i < 0 || i >= animParams.size()) continue;
float val = getAnimValueSafely(animParams.get(i));
float val = fullParam.keyframe().get(i);
if (Float.compare(val, current) == 0) {
found = toFloat(values.get(i));
break;
@@ -229,11 +242,12 @@ public class FrameInterpolator {
// ---- Secondary vertex 插值（为每个 vertex id 计算目标） ----
// 返回列表：每个 SecondaryVertexTarget 表示 id -> 插值后的位置 或 标记为 deleted
private static List<SecondaryVertexTarget> computeAllSecondaryVertexTargets(ParametersManagement.Parameter fullParam, String paramId, float current) {
private static List<SecondaryVertexTarget> computeAllSecondaryVertexTargets(ParametersManagement.Parameter fullParam, String paramId, float current, AnimationParameter currentAnimationParameter) {
List<SecondaryVertexTarget> results = new ArrayList<>();
if (fullParam == null) return results;
List<Integer> idxs = findIndicesForParam(fullParam, paramId);
// (MODIFIED) Pass currentAnimationParameter
List<Integer> idxs = findIndicesForParam(fullParam, paramId, currentAnimationParameter);
if (idxs.isEmpty()) return results;
List<?> animParams = fullParam.animationParameter();
@@ -258,7 +272,7 @@ public class FrameInterpolator {
int prevIndex = -1, nextIndex = -1;
float prevVal = Float.NEGATIVE_INFINITY, nextVal = Float.POSITIVE_INFINITY;
for (int idx : list) {
float val = getAnimValueSafely(animParams.get(idx));
float val = fullParam.keyframe().get(idx);
if (val <= current) {
if (prevIndex == -1 || val >= prevVal) {
prevIndex = idx;
@@ -338,7 +352,7 @@ public class FrameInterpolator {
} else {
// 兜底：查找与 current 相等的条目
for (int idx : list) {
float val = getAnimValueSafely(animParams.get(idx));
float val = fullParam.keyframe().get(idx);
if (Float.compare(val, current) == 0) {
ParsedVertex pv = parseVertexValue(values.get(idx));
if (pv != null) {
@@ -441,10 +455,12 @@ public class FrameInterpolator {
for (ModelPart part : parts) {
try {
if (!pm.getParametersPanel().getSelectParameter().equals(currentAnimationParameter)){
return;
}
// Full parameter record for this ModelPart (contains lists for all paramIds)
ParametersManagement.Parameter fullParam = pm.getModelPartParameters(part);
if (fullParam == null) {
// 没有记录则继续
continue;
}
@@ -457,28 +473,33 @@ public class FrameInterpolator {
// pivot
float[] tmp2 = new float[2];
if (computeVec2Target(fullParam, "pivot", current, tmp2)) {
// (MODIFIED) Pass currentAnimationParameter
if (computeVec2Target(fullParam, "pivot", current, tmp2, currentAnimationParameter)) {
targetPivot = new float[]{tmp2[0], tmp2[1]};
}
// scale
if (computeVec2Target(fullParam, "scale", current, tmp2)) {
// (MODIFIED) Pass currentAnimationParameter
if (computeVec2Target(fullParam, "scale", current, tmp2, currentAnimationParameter)) {
targetScale = new float[]{tmp2[0], tmp2[1]};
}
// rotate
float[] tmp1 = new float[1];
if (computeRotationTargetGeneric(fullParam, "rotate", current, tmp1)) {
// (MODIFIED) Pass currentAnimationParameter
if (computeRotationTargetGeneric(fullParam, "rotate", current, tmp1, currentAnimationParameter)) {
targetRotation = tmp1[0];
}
// position
if (computeVec2Target(fullParam, "position", current, tmp2)) {
// (MODIFIED) Pass currentAnimationParameter
if (computeVec2Target(fullParam, "position", current, tmp2, currentAnimationParameter)) {
targetPosition = new float[]{tmp2[0], tmp2[1]};
}
// secondaryVertex: 为每个记录的 vertex id 计算目标位置（包含实时广播）
List<SecondaryVertexTarget> computedSV = computeAllSecondaryVertexTargets(fullParam, "secondaryVertex", current);
// (MODIFIED) Pass currentAnimationParameter
List<SecondaryVertexTarget> computedSV = computeAllSecondaryVertexTargets(fullParam, "secondaryVertex", current, currentAnimationParameter);
if (computedSV != null && !computedSV.isEmpty()) {
svTargets = computedSV;
}

3
src/main/java/com/chuangzhou/vivid2D/render/model/Model2D.java
View File

@@ -1,11 +1,14 @@
package com.chuangzhou.vivid2D.render.model;
import com.chuangzhou.vivid2D.render.awt.manager.data.ParametersManagementData;
import com.chuangzhou.vivid2D.render.model.data.ModelData;
import com.chuangzhou.vivid2D.render.model.data.ModelMetadata;
import com.chuangzhou.vivid2D.render.model.util.*;
import org.joml.Matrix3f;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.FileOutputStream;
import java.io.ObjectOutputStream;
import java.util.*;
/**

6
src/main/java/com/chuangzhou/vivid2D/render/model/ModelPart.java
View File

@@ -423,6 +423,7 @@ public class ModelPart {
child.markTransformDirty();
// 确保子节点的 worldTransform 立即更新
child.recomputeWorldTransformRecursive();
triggerEvent("children");
}
/**
@@ -435,6 +436,7 @@ public class ModelPart {
child.markTransformDirty();
child.recomputeWorldTransformRecursive();
}
triggerEvent("children");
return removed;
}
@@ -2092,6 +2094,7 @@ public class ModelPart {
mesh.markDirty();
meshes.add(mesh);
boundsDirty = true;
triggerEvent("meshes");
}
/**
@@ -2369,6 +2372,7 @@ public class ModelPart {
public void setVisible(boolean visible) {
this.visible = visible;
triggerEvent("visible");
}
public BlendMode getBlendMode() {
@@ -2377,6 +2381,7 @@ public class ModelPart {
public void setBlendMode(BlendMode blendMode) {
this.blendMode = blendMode;
triggerEvent("blendMode");
}
public float getOpacity() {
@@ -2393,6 +2398,7 @@ public class ModelPart {
public void setOpacity(float opacity) {
this.opacity = Math.max(0.0f, Math.min(1.0f, opacity));
triggerEvent("opacity");
}
public List<Deformer> getDeformers() {

41
src/main/java/com/chuangzhou/vivid2D/render/model/data/ModelData.java
View File

@@ -959,47 +959,6 @@ public class ModelData implements Serializable {
}
}
/**
* 参数数据
*/
public static class ParameterData implements Serializable {
private static final long serialVersionUID = 1L;
public String id;
public float value;
public float defaultValue;
public float minValue;
public float maxValue;
public ParameterData() {
}
public ParameterData(AnimationParameter param) {
this.id = param.getId();
this.value = param.getValue();
this.defaultValue = param.getDefaultValue();
this.minValue = param.getMinValue();
this.maxValue = param.getMaxValue();
}
public AnimationParameter toAnimationParameter() {
AnimationParameter param = new AnimationParameter(id, minValue, maxValue, defaultValue);
param.setValue(value); // 恢复保存时的值
return param;
}
public ParameterData copy() {
ParameterData copy = new ParameterData();
copy.id = this.id;
copy.value = this.value;
copy.defaultValue = this.defaultValue;
copy.minValue = this.minValue;
copy.maxValue = this.maxValue;
return copy;
}
}
/**
* 动画数据
*/

90
src/main/java/com/chuangzhou/vivid2D/render/model/data/ParameterData.java Normal file
View File

@@ -0,0 +1,90 @@
package com.chuangzhou.vivid2D.render.model.data;
import com.chuangzhou.vivid2D.render.model.AnimationParameter;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.SortedSet;
public class ParameterData implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
public String id;
public float value;
public float defaultValue;
public float minValue;
public float maxValue;
public boolean changed;
public List<Float> keyframes;
public ParameterData() {
this.keyframes = new ArrayList<>();
}
public ParameterData(AnimationParameter param) {
this();
this.id = param.getId();
this.value = param.getValue();
this.defaultValue = param.getDefaultValue();
this.minValue = param.getMinValue();
this.maxValue = param.getMaxValue();
this.changed = param.hasChanged();
SortedSet<Float> frames = param.getKeyframes();
if (frames != null && !frames.isEmpty()) {
this.keyframes.addAll(frames);
}
}
public AnimationParameter toAnimationParameter() {
AnimationParameter param = new AnimationParameter(id, minValue, maxValue, defaultValue);
param.setValue(value);
// 恢复 changed 状态
if (changed) {
// 由于 setValue 会自动设置 changed 标志，我们需要特殊处理
// 这里使用反射或者额外的方法来直接设置 changed 状态
try {
java.lang.reflect.Field changedField = param.getClass().getDeclaredField("changed");
changedField.setAccessible(true);
changedField.set(param, this.changed);
} catch (Exception e) {
// 如果反射失败，至少保证值是正确的
System.err.println("无法恢复 changed 状态: " + e.getMessage());
}
}
// 恢复关键帧
if (keyframes != null) {
for (Float frameValue : keyframes) {
param.addKeyframe(frameValue);
}
}
return param;
}
public ParameterData copy() {
ParameterData copy = new ParameterData();
copy.id = this.id;
copy.value = this.value;
copy.defaultValue = this.defaultValue;
copy.minValue = this.minValue;
copy.maxValue = this.maxValue;
copy.changed = this.changed;
copy.keyframes = new ArrayList<>(this.keyframes);
return copy;
}
@Override
public String toString() {
return String.format(
"ParameterData[ID=%s, Value=%.3f, Range=[%.3f, %.3f], Default=%.3f, Changed=%s, Keyframes=%s]",
id, value, minValue, maxValue, defaultValue, changed, keyframes
);
}
}

68
src/main/java/com/chuangzhou/vivid2D/render/model/data/PartData.java
View File

@@ -1,10 +1,12 @@
package com.chuangzhou.vivid2D.render.model.data;
import com.chuangzhou.vivid2D.render.model.AnimationParameter;
import com.chuangzhou.vivid2D.render.model.ModelPart;
import com.chuangzhou.vivid2D.render.model.util.Deformer;
import com.chuangzhou.vivid2D.render.model.util.Mesh2D;
import org.joml.Vector2f;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -15,6 +17,7 @@ import java.util.Map;
* @author tzdwindows 7
*/
public class PartData implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
public String name;
@@ -26,12 +29,9 @@ public class PartData implements Serializable {
public float opacity;
public List<String> meshNames;
public Map<String, String> userData;
// 保存变形器数据
public List<DeformerData> deformers;
// 保存液化笔划数据（可保存多个笔划）
public List<LiquifyStrokeData> liquifyStrokes;
public List<ParameterData> parameters;
public PartData() {
this.position = new Vector2f();
@@ -43,6 +43,7 @@ public class PartData implements Serializable {
this.userData = new HashMap<>();
this.deformers = new ArrayList<>();
this.liquifyStrokes = new ArrayList<>();
this.parameters = new ArrayList<>();
}
public PartData(ModelPart part) {
@@ -179,6 +180,19 @@ public class PartData implements Serializable {
if (part.getParent() != null) {
this.parentName = part.getParent().getName();
}
Map<String, AnimationParameter> partParams = part.getParameters();
if (partParams != null && !partParams.isEmpty()) {
for (AnimationParameter param : partParams.values()) {
try {
ParameterData paramData = new ParameterData(param);
this.parameters.add(paramData);
} catch (Exception e) {
System.err.println("序列化参数失败: " + param.getId());
e.printStackTrace();
}
}
}
}
public ModelPart toModelPart(Map<String, Mesh2D> meshMap) {
@@ -188,30 +202,21 @@ public class PartData implements Serializable {
part.setScale(scale);
part.setVisible(visible);
part.setOpacity(opacity);
// 添加网格
for (String meshName : meshNames) {
Mesh2D mesh = meshMap.get(meshName);
if (mesh != null) {
part.addMesh(mesh);
}
}
// 反序列化变形器（仅创建已知类型，其他类型可拓展）
if (deformers != null) {
for (DeformerData dd : deformers) {
try {
String className = dd.type;
// 通过反射获取类并实例化（必须有 public 构造函数(String name)）
Class<?> clazz = Class.forName(className);
if (Deformer.class.isAssignableFrom(clazz)) {
Deformer deformer = (Deformer) clazz
.getConstructor(String.class)
.newInstance(dd.name);
// 反序列化属性
try {
deformer.deserialize(dd.properties != null ? dd.properties : new HashMap<>());
} catch (Exception ex) {
@@ -229,18 +234,24 @@ public class PartData implements Serializable {
}
}
}
// 反序列化液化笔划：如果 PartData 中存在 liquifyStrokes，尝试在新创建的 part 上重放这些笔划
if (parameters != null) {
for (ParameterData paramData : parameters) {
try {
AnimationParameter param = paramData.toAnimationParameter();
part.addParameter(param);
} catch (Exception e) {
System.err.println("反序列化参数失败: " + paramData.id);
e.printStackTrace();
}
}
}
if (liquifyStrokes != null && !liquifyStrokes.isEmpty()) {
for (LiquifyStrokeData stroke : liquifyStrokes) {
// 尝试将 mode 转换为 ModelPart.LiquifyMode
ModelPart.LiquifyMode modeEnum = ModelPart.LiquifyMode.PUSH;
try {
modeEnum = ModelPart.LiquifyMode.valueOf(stroke.mode);
} catch (Exception ignored) {
}
// 对每个点进行重放：调用 applyLiquify（存在于 ModelPart）
if (stroke.points != null) {
for (LiquifyPointData p : stroke.points) {
try {
@@ -266,8 +277,6 @@ public class PartData implements Serializable {
copy.opacity = this.opacity;
copy.meshNames = new ArrayList<>(this.meshNames);
copy.userData = new HashMap<>(this.userData);
// 深拷贝 deformers 列表
copy.deformers = new ArrayList<>();
if (this.deformers != null) {
for (DeformerData d : this.deformers) {
@@ -278,8 +287,6 @@ public class PartData implements Serializable {
copy.deformers.add(cd);
}
}
// 深拷贝 liquifyStrokes
copy.liquifyStrokes = new ArrayList<>();
if (this.liquifyStrokes != null) {
for (LiquifyStrokeData s : this.liquifyStrokes) {
@@ -301,7 +308,12 @@ public class PartData implements Serializable {
copy.liquifyStrokes.add(cs);
}
}
copy.parameters = new ArrayList<>();
if (this.parameters != null) {
for (ParameterData p : this.parameters) {
copy.parameters.add(p.copy());
}
}
return copy;
}
@@ -320,23 +332,15 @@ public class PartData implements Serializable {
* 每个笔划有若干点以及笔划级别参数（mode/radius/strength/iterations）
*/
public static class LiquifyStrokeData implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
// LiquifyMode 的 name()，例如 "PUSH", "PULL" 等
public String mode = ModelPart.LiquifyMode.PUSH.name();
// 画笔半径与强度（用于重放）
public float radius = 50.0f;
public float strength = 0.5f;
public int iterations = 1;
// 笔划包含的点序列（世界坐标）
public List<LiquifyPointData> points = new ArrayList<>();
}
/**
* 内部类：单个液化点数据
*/
public static class LiquifyPointData implements Serializable {
private static final long serialVersionUID = 1L;
public float x;

12
src/main/java/com/chuangzhou/vivid2D/test/ModelLayerPanelTest.java
View File

@@ -5,6 +5,7 @@ import com.chuangzhou.vivid2D.render.awt.ModelRenderPanel;
import com.chuangzhou.vivid2D.render.awt.ParametersPanel;
import com.chuangzhou.vivid2D.render.awt.TransformPanel;
import com.chuangzhou.vivid2D.render.awt.manager.ParametersManagement;
import com.chuangzhou.vivid2D.render.awt.manager.data.ParametersManagementData;
import com.chuangzhou.vivid2D.render.model.Model2D;
import com.chuangzhou.vivid2D.render.model.ModelPart;
import com.formdev.flatlaf.themes.FlatMacDarkLaf;
@@ -13,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.io.PrintStream;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -55,7 +56,7 @@ public class ModelLayerPanelTest {
rightTabbedPane.setPreferredSize(new Dimension(300, 600));
frame.add(rightTabbedPane, BorderLayout.EAST);
ParametersPanel parametersPanel = new ParametersPanel(renderPanel);
renderPanel.setParametersManagement(new ParametersManagement(parametersPanel));
renderPanel.setParametersManagement(ParametersManagement.getInstance(parametersPanel));
JScrollPane paramScroll = new JScrollPane(parametersPanel);
paramScroll.setPreferredSize(new Dimension(280, 600));
rightTabbedPane.addTab("参数管理", paramScroll);
@@ -76,6 +77,13 @@ public class ModelLayerPanelTest {
} catch (Throwable ignored) {
}
model.saveToFile("C:\\Users\\Administrator\\Desktop\\testing.model");
ParametersManagementData managementData = new ParametersManagementData(renderPanel.getParametersManagement());
String managementFilePath = "C:\\Users\\Administrator\\Desktop\\testing.model" + ".data";
try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(managementFilePath))) {
oos.writeObject(managementData);
} catch (IOException ex) {
throw new RuntimeException(ex);
}
System.exit(0);
}
});

367
src/main/java/com/chuangzhou/vivid2D/window/MainWindow.java Normal file
View File

@@ -0,0 +1,367 @@
package com.chuangzhou.vivid2D.window;
import com.chuangzhou.vivid2D.render.awt.ModelLayerPanel;
import com.chuangzhou.vivid2D.render.awt.ModelRenderPanel;
import com.chuangzhou.vivid2D.render.awt.ParametersPanel;
import com.chuangzhou.vivid2D.render.awt.TransformPanel;
import com.chuangzhou.vivid2D.render.awt.manager.LayerOperationManager;
import com.chuangzhou.vivid2D.render.awt.manager.ParametersManagement;
import com.chuangzhou.vivid2D.render.awt.manager.data.LayerOperationManagerData;
import com.chuangzhou.vivid2D.render.awt.manager.data.ParametersManagementData;
import com.chuangzhou.vivid2D.render.awt.ModelPartInfoPanel;
import com.chuangzhou.vivid2D.render.model.Model2D;
import com.chuangzhou.vivid2D.render.model.ModelPart;
import com.formdev.flatlaf.themes.FlatMacDarkLaf;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.PrintStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
/**
* 现代化的主应用程序窗口，布局类似于 Live2D Cubism Editor。
* 它组织并展示核心的渲染和编辑面板。
*/
public class MainWindow extends JFrame {
private final ModelRenderPanel renderPanel;
private final ModelLayerPanel layerPanel;
private final TransformPanel transformPanel;
private final ParametersPanel parametersPanel;
private final ModelPartInfoPanel partInfoPanel;
private String currentModelPath = null;
private JLabel statusBarLabel;
private JMenuBar menuBar;
/**
* 启动器。
*/
public static void main(String[] args) {
// 设置 Look and Feel
try {
UIManager.setLookAndFeel(new FlatMacDarkLaf());
} catch (UnsupportedLookAndFeelException e) {
throw new RuntimeException(e);
}
// 确保控制台输出使用 UTF-8
System.setOut(new PrintStream(System.out, true, StandardCharsets.UTF_8));
System.setErr(new PrintStream(System.err, true, StandardCharsets.UTF_8));
// 在 EDT (Event Dispatch Thread) 上创建和显示 GUI
SwingUtilities.invokeLater(() -> {
MainWindow mainWin = new MainWindow();
mainWin.setVisible(true);
});
}
/**
* 构造主窗口。
*/
public MainWindow() {
setTitle("Vivid2D Editor - [未加载文件]");
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
setLayout(new BorderLayout());
// 1. 初始化核心渲染器和面板
// ModelRenderPanel 传入空路径 ""
this.renderPanel = new ModelRenderPanel("", 1024, 768);
this.layerPanel = new ModelLayerPanel(renderPanel);
this.transformPanel = new TransformPanel(renderPanel);
this.parametersPanel = new ParametersPanel(renderPanel);
// 【重要】使用我们新实现的 ModelPartInfoPanel
this.partInfoPanel = new ModelPartInfoPanel(renderPanel);
// 关联参数管理器
//renderPanel.setParametersManagement(ParametersManagement.getInstance(parametersPanel));
// 2. 构建模块化的 UI
createMenuBar();
createToolBar();
createMainLayout();
createStatusBar();
// 3. 设置初始状态：所有编辑功能禁用
setEditComponentsEnabled(false);
setupInitialListeners();
// 4. 设置窗口
setSize(1600, 900);
setLocationRelativeTo(null);
}
/**
* 创建顶部菜单栏并设置事件。
*/
private void createMenuBar() {
menuBar = new JMenuBar();
JMenu fileMenu = new JMenu("文件");
JMenuItem openItem = new JMenuItem("打开模型...");
openItem.addActionListener(e -> openModelFile());
fileMenu.add(openItem);
fileMenu.addSeparator();
JMenuItem saveItem = new JMenuItem("保存");
saveItem.setName("saveItem");
saveItem.addActionListener(e -> saveData(false));
fileMenu.add(saveItem);
JMenuItem exitItem = new JMenuItem("退出");
exitItem.addActionListener(e -> dispatchEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING)));
fileMenu.add(exitItem);
menuBar.add(fileMenu);
JMenu editMenu = new JMenu("编辑");
editMenu.setName("editMenu");
menuBar.add(editMenu);
menuBar.add(new JMenu("显示"));
setJMenuBar(menuBar);
}
/**
* 创建顶部工具栏。
*/
private void createToolBar() {
JToolBar toolBar = new JToolBar();
toolBar.setFloatable(false);
toolBar.setName("toolBar");
toolBar.add(new JButton("建模"));
toolBar.add(new JButton("动画"));
toolBar.addSeparator();
add(toolBar, BorderLayout.NORTH);
}
/**
* 创建主工作区布局（左、中、右面板）。
*/
private void createMainLayout() {
JScrollPane layerScroll = new JScrollPane(layerPanel);
layerScroll.setMinimumSize(new Dimension(240, 100));
layerScroll.setPreferredSize(new Dimension(260, 600));
JPanel centerPanelWrapper = new JPanel(new BorderLayout());
centerPanelWrapper.add(renderPanel, BorderLayout.CENTER);
centerPanelWrapper.setMinimumSize(new Dimension(400, 300));
JScrollPane transformScroll = new JScrollPane(transformPanel);
transformScroll.setBorder(BorderFactory.createTitledBorder("变换控制"));
transformScroll.setPreferredSize(new Dimension(300, 200));
JScrollPane paramScroll = new JScrollPane(parametersPanel);
paramScroll.setBorder(BorderFactory.createTitledBorder("参数管理"));
paramScroll.setPreferredSize(new Dimension(300, 200));
JSplitPane rightPanelSplit = getjSplitPane(paramScroll, transformScroll);
JSplitPane mainSplit = getjSplitPane(new JSplitPane(
JSplitPane.HORIZONTAL_SPLIT,
centerPanelWrapper,
rightPanelSplit
), 0.75, JSplitPane.HORIZONTAL_SPLIT, layerScroll, 0.2);
add(mainSplit, BorderLayout.CENTER);
}
private static @NotNull JSplitPane getjSplitPane(JSplitPane HORIZONTAL_SPLIT, double value, int horizontalSplit, JScrollPane layerScroll, double value1) {
HORIZONTAL_SPLIT.setResizeWeight(value);
HORIZONTAL_SPLIT.setOneTouchExpandable(true);
JSplitPane mainSplit = new JSplitPane(
horizontalSplit,
layerScroll,
HORIZONTAL_SPLIT
);
mainSplit.setResizeWeight(value1);
mainSplit.setOneTouchExpandable(true);
return mainSplit;
}
private @NotNull JSplitPane getjSplitPane(JScrollPane paramScroll, JScrollPane transformScroll) {
JSplitPane rightPanelSplit = getjSplitPane(new JSplitPane(
JSplitPane.VERTICAL_SPLIT,
paramScroll,
partInfoPanel
), 0.5, JSplitPane.VERTICAL_SPLIT, transformScroll, 0.33);
rightPanelSplit.setPreferredSize(new Dimension(300, 600));
return rightPanelSplit;
}
/**
* 创建底部状态栏。
*/
private void createStatusBar() {
JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT));
statusBar.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.GRAY));
this.statusBarLabel = new JLabel("未加载模型。请通过 [文件] -> [打开模型...] 启动编辑。");
statusBar.add(statusBarLabel);
add(statusBar, BorderLayout.SOUTH);
}
/**
* 设置初始的监听器，特别是窗口关闭监听。
*/
private void setupInitialListeners() {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
if (currentModelPath == null) {
shutdown();
return;
}
int confirm = JOptionPane.showConfirmDialog(
MainWindow.this,
"是否在退出前保存更改？",
"退出确认",
JOptionPane.YES_NO_CANCEL_OPTION
);
if (confirm == JOptionPane.CANCEL_OPTION) {
return;
}
if (confirm == JOptionPane.YES_OPTION) {
saveData(true);
} else {
shutdown();
}
}
});
renderPanel.addModelClickListener((mesh, modelX, modelY, screenX, screenY) -> {
List<ModelPart> selectedPart = renderPanel.getSelectedParts();
SwingUtilities.invokeLater(() -> {
transformPanel.setSelectedParts(selectedPart);
if (!selectedPart.isEmpty()) {
partInfoPanel.updatePanel(selectedPart.get(0));
} else {
partInfoPanel.updatePanel(null);
}
});
});
}
/**
* 根据是否有模型加载来启用或禁用编辑组件。
*/
private void setEditComponentsEnabled(boolean enabled) {
layerPanel.setEnabled(enabled);
transformPanel.setEnabled(enabled);
parametersPanel.setEnabled(enabled);
partInfoPanel.setEnabled(enabled);
renderPanel.setEnabled(enabled);
for (Component comp : menuBar.getComponents()) {
if (comp instanceof JMenu) {
JMenu menu = (JMenu) comp;
if ("编辑".equals(menu.getName())) {
menu.setEnabled(enabled);
}
for (Component item : menu.getMenuComponents()) {
if ("saveItem".equals(item.getName())) {
item.setEnabled(enabled);
}
}
}
}
for (Component comp : getContentPane().getComponents()) {
if (comp instanceof JToolBar && "toolBar".equals(comp.getName())) {
comp.setEnabled(enabled);
for (Component button : ((JToolBar) comp).getComponents()) {
button.setEnabled(enabled);
}
}
}
}
/**
* 打开文件对话框并加载模型。
*/
private void openModelFile() {
JFileChooser fileChooser = new JFileChooser();
fileChooser.setDialogTitle("选择 Vivid2D 模型文件 (*.model)");
FileNameExtensionFilter filter = new FileNameExtensionFilter("Vivid2D 模型文件 (*.model)", "model");
fileChooser.setFileFilter(filter);
fileChooser.setAcceptAllFileFilterUsed(false); // 这一行可选，用于禁用 "All Files" 选项
if (fileChooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
File file = fileChooser.getSelectedFile();
loadModel(file.getAbsolutePath());
}
}
/**
* 加载模型并更新 UI 状态。
*/
private void loadModel(String modelPath) {
setEditComponentsEnabled(false);
statusBarLabel.setText("正在加载模型: " + modelPath);
CompletableFuture.runAsync(() -> {
Model2D model = null;
try {
model = renderPanel.loadModel(modelPath).get();
} catch (InterruptedException | ExecutionException e) {
System.err.println("模型异步加载失败: " + e.getMessage());
}
Model2D finalModel = model;
SwingUtilities.invokeLater(() -> {
if (finalModel == null || !renderPanel.getGlContextManager().isRunning()) {
currentModelPath = null;
setTitle("Vivid2D Editor - [加载失败]");
statusBarLabel.setText("模型加载失败！无法加载: " + modelPath);
JOptionPane.showMessageDialog(this,
"无法加载模型: " + modelPath,
"加载错误",
JOptionPane.ERROR_MESSAGE);
} else {
renderPanel.setParametersManagement(ParametersManagement.getInstance(parametersPanel));
layerPanel.loadMetadata();
currentModelPath = modelPath;
setTitle("Vivid2D Editor - " + new File(modelPath).getName());
statusBarLabel.setText("模型加载完毕。");
setEditComponentsEnabled(true);
layerPanel.setModel(finalModel);
}
});
});
}
/**
* 保存模型和参数数据。
* @param exitOnComplete 如果为 true，则在保存后调用 shutdown()。
*/
private void saveData(boolean exitOnComplete) {
if (currentModelPath == null) {
statusBarLabel.setText("没有加载模型，无法保存。");
return;
}
statusBarLabel.setText("正在保存...");
if (renderPanel.getModel() != null) {
System.out.println("正在保存模型: " + currentModelPath);
renderPanel.getModel().saveToFile(currentModelPath);
}
LayerOperationManager layerManager = layerPanel.getLayerOperationManager();
LayerOperationManagerData layerData = new LayerOperationManagerData(layerManager.layerMetadata);
//System.out.println("正在保存参数: " + renderPanel.getParametersManagement());
ParametersManagementData managementData = new ParametersManagementData(renderPanel.getParametersManagement());
String managementFilePath = currentModelPath + ".data";
try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(managementFilePath))) {
oos.writeObject(layerData);
oos.writeObject(managementData);
} catch (IOException ex) {
ex.printStackTrace(System.err);
statusBarLabel.setText("保存参数失败！");
}
statusBarLabel.setText("保存成功。");
if (exitOnComplete) {
shutdown();
}
}
/**
* 清理资源并退出应用程序。
*/
private void shutdown() {
statusBarLabel.setText("正在关闭...");
try {
renderPanel.getGlContextManager().dispose();
} catch (Throwable ignored) {}
dispose();
System.exit(0);
}
}