| .. | .. |
|---|
| 355 | 355 | toolbarPanel.setName("Toolbar"); |
|---|
| 356 | 356 | treePanel = new JPanel(); |
|---|
| 357 | 357 | treePanel.setName("Tree"); |
|---|
| 358 | | - ctrlPanel = new JPanel(); // new GridBagLayout()); |
|---|
| 358 | + ctrlPanel = new cGridBag(); // new GridBagLayout()); |
|---|
| 359 | 359 | ctrlPanel.setName("Edit"); |
|---|
| 360 | | - materialPanel = new JPanel(); |
|---|
| 360 | + materialPanel = new cGridBag().setVertical(true); |
|---|
| 361 | 361 | materialPanel.setName("Material"); |
|---|
| 362 | 362 | /*JTextPane*/ |
|---|
| 363 | 363 | infoarea = createTextPane(); |
|---|
| .. | .. |
|---|
| 387 | 387 | toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); |
|---|
| 388 | 388 | treePanel.setLayout(new GridBagLayout()); |
|---|
| 389 | 389 | ctrlPanel.setLayout(new GridBagLayout()); |
|---|
| 390 | | - materialPanel.setLayout(new GridBagLayout()); |
|---|
| 390 | + //materialPanel.setLayout(new GridBagLayout()); |
|---|
| 391 | 391 | |
|---|
| 392 | 392 | aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, |
|---|
| 393 | 393 | GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0); |
|---|
| .. | .. |
|---|
| 814 | 814 | return combo; |
|---|
| 815 | 815 | } |
|---|
| 816 | 816 | |
|---|
| 817 | | - NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow) |
|---|
| 817 | + cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow) |
|---|
| 818 | 818 | { |
|---|
| 819 | | - NumberSlider combo; |
|---|
| 819 | + cGridBag control = new cGridBag(); |
|---|
| 820 | + |
|---|
| 821 | + cNumberSlider combo; |
|---|
| 820 | 822 | |
|---|
| 821 | 823 | JLabel jlabel = new JLabel(label); |
|---|
| 822 | | - |
|---|
| 823 | | - aConstraints.fill = GridBagConstraints.VERTICAL; |
|---|
| 824 | 824 | jlabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 825 | | - aConstraints.gridwidth = 1; |
|---|
| 826 | | - ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 827 | | - aConstraints.gridx += 1; |
|---|
| 828 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 829 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 830 | | - ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 831 | | - aConstraints.gridx += 1; |
|---|
| 832 | | - aConstraints.gridwidth = 1; |
|---|
| 833 | | - |
|---|
| 825 | + control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 826 | + control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 834 | 827 | combo.setFloat(current); |
|---|
| 835 | | - |
|---|
| 836 | | - combo.label = jlabel; |
|---|
| 837 | | - |
|---|
| 838 | | - combo.addChangeListener(this); |
|---|
| 839 | | - |
|---|
| 828 | + |
|---|
| 829 | + ctrlPanel.add(control); |
|---|
| 830 | + |
|---|
| 840 | 831 | return combo; |
|---|
| 841 | 832 | } |
|---|
| 842 | 833 | |
|---|
| 843 | | - NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current) |
|---|
| 834 | + cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current) |
|---|
| 844 | 835 | { |
|---|
| 845 | | - NumberSlider combo; |
|---|
| 836 | + cGridBag control = new cGridBag(); |
|---|
| 837 | + |
|---|
| 838 | + cNumberSlider combo; |
|---|
| 846 | 839 | |
|---|
| 847 | 840 | JLabel jlabel = new JLabel(label); |
|---|
| 848 | | - |
|---|
| 849 | | - aConstraints.fill = GridBagConstraints.VERTICAL; |
|---|
| 850 | 841 | jlabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 851 | | - aConstraints.gridwidth = 2; |
|---|
| 852 | | - ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 853 | | - aConstraints.gridx += 1; |
|---|
| 854 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 855 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 856 | | - ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 857 | | - aConstraints.gridx += 1; |
|---|
| 858 | | - aConstraints.gridwidth = 1; |
|---|
| 859 | | - |
|---|
| 842 | + ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 843 | + ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 860 | 844 | combo.setInteger(current); |
|---|
| 861 | 845 | |
|---|
| 862 | | - combo.label = jlabel; |
|---|
| 863 | | - |
|---|
| 864 | | - combo.addChangeListener(this); |
|---|
| 865 | | - |
|---|
| 846 | + ctrlPanel.add(control); |
|---|
| 847 | + |
|---|
| 866 | 848 | return combo; |
|---|
| 867 | 849 | } |
|---|
| 868 | 850 | |
|---|
| 869 | | - JTextArea AddText(JPanel ctrlPanel, String name) |
|---|
| 851 | + JTextArea AddText(cGridBag ctrlPanel, String name) |
|---|
| 870 | 852 | { |
|---|
| 871 | 853 | JTextArea text; |
|---|
| 872 | 854 | |
|---|
| 873 | 855 | aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 874 | 856 | aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 875 | | - ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 857 | + ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1); |
|---|
| 876 | 858 | text.addCaretListener(this); |
|---|
| 877 | 859 | aConstraints.gridx += 1; |
|---|
| 878 | 860 | aConstraints.gridwidth = 1; |
|---|
| .. | .. |
|---|
| 902 | 884 | { |
|---|
| 903 | 885 | j.removeChangeListener(this); |
|---|
| 904 | 886 | objEditor.ctrlPanel.remove(j.label); |
|---|
| 887 | + objEditor.ctrlPanel.remove(j); |
|---|
| 888 | + } |
|---|
| 889 | + |
|---|
| 890 | + void Remove(cNumberSlider j) |
|---|
| 891 | + { |
|---|
| 892 | + j.removeChangeListener(this); |
|---|
| 893 | + //objEditor.ctrlPanel.remove(j.label); |
|---|
| 905 | 894 | objEditor.ctrlPanel.remove(j); |
|---|
| 906 | 895 | } |
|---|
| 907 | 896 | |
|---|
| .. | .. |
|---|
| 989 | 978 | fasterButton = AddButton(oe, "Fast"); |
|---|
| 990 | 979 | remarkButton = AddButton(oe, "Rem"); |
|---|
| 991 | 980 | |
|---|
| 992 | | - Return(); |
|---|
| 981 | + //Return(); |
|---|
| 993 | 982 | |
|---|
| 994 | | - normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1); |
|---|
| 995 | | - Return(); |
|---|
| 983 | + //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1); |
|---|
| 984 | + //Return(); |
|---|
| 996 | 985 | |
|---|
| 997 | 986 | // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2); |
|---|
| 998 | 987 | // ObjEditor.aConstraints.gridx += 1; |
|---|
| .. | .. |
|---|
| 1296 | 1285 | |
|---|
| 1297 | 1286 | tabbedPane.add(FSPane = new cFileSystemPane(this)); |
|---|
| 1298 | 1287 | |
|---|
| 1299 | | - optionsPanel = new JPanel(new GridBagLayout()); |
|---|
| 1288 | + optionsPanel = new cGridBag().setVertical(true); |
|---|
| 1300 | 1289 | |
|---|
| 1301 | 1290 | optionsPanel.setName("Options"); |
|---|
| 1302 | 1291 | |
|---|
| 1303 | | - AddOptions(optionsPanel, aConstraints); |
|---|
| 1292 | + AddOptions(optionsPanel); //, aConstraints); |
|---|
| 1304 | 1293 | |
|---|
| 1305 | 1294 | tabbedPane.add(optionsPanel); |
|---|
| 1306 | 1295 | |
|---|
| .. | .. |
|---|
| 1411 | 1400 | }); |
|---|
| 1412 | 1401 | } |
|---|
| 1413 | 1402 | |
|---|
| 1414 | | - void AddOptions(JPanel panel, GridBagConstraints constraints) |
|---|
| 1403 | + void AddOptions(cGridBag panel) //, GridBagConstraints constraints) |
|---|
| 1415 | 1404 | { |
|---|
| 1416 | 1405 | } |
|---|
| 1417 | 1406 | |
|---|
| .. | .. |
|---|
| 1426 | 1415 | ctrlPanel.removeAll(); |
|---|
| 1427 | 1416 | } |
|---|
| 1428 | 1417 | |
|---|
| 1429 | | - void SetupMaterial(JPanel ctrlPanel) |
|---|
| 1418 | + void SetupMaterial(cGridBag ctrlPanel) |
|---|
| 1430 | 1419 | { |
|---|
| 1431 | | - aConstraints.weighty = 0; |
|---|
| 1432 | | - //aConstraints.weightx = 1; |
|---|
| 1433 | | - /* |
|---|
| 1420 | + /* |
|---|
| 1434 | 1421 | ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints); |
|---|
| 1435 | 1422 | materialLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1436 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1437 | | - aConstraints.gridx += 1; |
|---|
| 1438 | 1423 | */ |
|---|
| 1439 | 1424 | |
|---|
| 1440 | | - aConstraints.gridwidth = 1; |
|---|
| 1441 | | - ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints); |
|---|
| 1442 | | - aConstraints.gridx += 1; |
|---|
| 1443 | | - aConstraints.weighty = 0; |
|---|
| 1444 | | - aConstraints.gridwidth = 1; |
|---|
| 1425 | + cGridBag editBar = new cGridBag().setVertical(false); |
|---|
| 1426 | + |
|---|
| 1427 | + editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints); |
|---|
| 1445 | 1428 | |
|---|
| 1446 | 1429 | /* |
|---|
| 1447 | 1430 | ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints); |
|---|
| 1448 | | - aConstraints.gridx += 1; |
|---|
| 1449 | | - aConstraints.weighty = 0; |
|---|
| 1450 | | - aConstraints.gridwidth = 1; |
|---|
| 1451 | 1431 | */ |
|---|
| 1452 | 1432 | |
|---|
| 1453 | | - ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints); |
|---|
| 1454 | | - aConstraints.gridx += 1; |
|---|
| 1433 | + editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints); |
|---|
| 1434 | + editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints); |
|---|
| 1435 | + editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints); |
|---|
| 1436 | + editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints); |
|---|
| 1455 | 1437 | |
|---|
| 1456 | | - ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints); |
|---|
| 1457 | | - |
|---|
| 1458 | | - aConstraints.gridx += 1; |
|---|
| 1459 | | - |
|---|
| 1460 | | - ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints); |
|---|
| 1461 | | - |
|---|
| 1462 | | - aConstraints.gridx += 1; |
|---|
| 1463 | | - |
|---|
| 1464 | | - ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints); |
|---|
| 1465 | | - |
|---|
| 1466 | | - aConstraints.gridx = 0; |
|---|
| 1467 | | - aConstraints.gridy += 1; |
|---|
| 1468 | | - aConstraints.weighty = 0; |
|---|
| 1469 | | - aConstraints.gridwidth = 1; |
|---|
| 1438 | + ctrlPanel.add(editBar); |
|---|
| 1439 | + |
|---|
| 1470 | 1440 | /**/ |
|---|
| 1471 | 1441 | //aConstraints.weighty = 0; |
|---|
| 1472 | 1442 | ////aConstraints.weightx = 1; |
|---|
| 1473 | 1443 | //aConstraints.weighty = 1; |
|---|
| 1474 | 1444 | aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100; |
|---|
| 1475 | 1445 | //aConstraints.gridx += 1; |
|---|
| 1476 | | - ctrlPanel.add(new JLabel("----------------------------------"), aConstraints); |
|---|
| 1477 | | - aConstraints.weighty = 0; |
|---|
| 1478 | | - aConstraints.gridx = 0; |
|---|
| 1479 | | - aConstraints.gridy += 1; |
|---|
| 1480 | | - aConstraints.gridwidth = 1; |
|---|
| 1446 | + //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
|---|
| 1481 | 1447 | |
|---|
| 1482 | | - ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints); |
|---|
| 1483 | | - colorLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1484 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1485 | | - aConstraints.gridx += 1; |
|---|
| 1486 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1487 | | - //aConstraints.weightx = 0; |
|---|
| 1488 | | - ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1489 | | - aConstraints.gridx = 0; |
|---|
| 1490 | | - aConstraints.gridy += 1; |
|---|
| 1491 | | - aConstraints.gridwidth = 1; |
|---|
| 1448 | + cGridBag colorSection = new cGridBag().setVertical(true); |
|---|
| 1449 | + |
|---|
| 1450 | + cGridBag color = new cGridBag(); |
|---|
| 1451 | + color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints); |
|---|
| 1452 | + colorLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1453 | + color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1454 | + //colorField.preferredWidth = 200; |
|---|
| 1455 | + colorSection.add(color); |
|---|
| 1492 | 1456 | |
|---|
| 1493 | | - ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints); |
|---|
| 1494 | | - modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1495 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1496 | | - aConstraints.gridx += 1; |
|---|
| 1497 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1498 | | - ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1499 | | - aConstraints.gridx = 0; |
|---|
| 1500 | | - aConstraints.gridy += 1; |
|---|
| 1501 | | - aConstraints.gridwidth = 1; |
|---|
| 1457 | + cGridBag modulation = new cGridBag(); |
|---|
| 1458 | + modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints); |
|---|
| 1459 | + modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1460 | + modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1461 | + colorSection.add(modulation); |
|---|
| 1502 | 1462 | |
|---|
| 1503 | | - ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints); |
|---|
| 1504 | | - textureLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1505 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1506 | | - aConstraints.gridx += 1; |
|---|
| 1507 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1508 | | - ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1509 | | - aConstraints.gridx = 0; |
|---|
| 1510 | | - aConstraints.gridy += 1; |
|---|
| 1511 | | - aConstraints.gridwidth = 1; |
|---|
| 1463 | + cGridBag texture = new cGridBag(); |
|---|
| 1464 | + texture.add(textureLabel = new JLabel("Texture")); // , aConstraints); |
|---|
| 1465 | + textureLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1466 | + texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1467 | + colorSection.add(texture); |
|---|
| 1512 | 1468 | |
|---|
| 1513 | | - ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints); |
|---|
| 1514 | | - anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1515 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1516 | | - aConstraints.gridx += 1; |
|---|
| 1517 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1518 | | - ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1519 | | - aConstraints.gridx = 0; |
|---|
| 1520 | | - aConstraints.gridy += 1; |
|---|
| 1521 | | - aConstraints.gridwidth = 1; |
|---|
| 1469 | + cGridBag anisoU = new cGridBag(); |
|---|
| 1470 | + anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints); |
|---|
| 1471 | + anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1472 | + anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1473 | + colorSection.add(anisoU); |
|---|
| 1522 | 1474 | |
|---|
| 1523 | | - ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints); |
|---|
| 1524 | | - anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1525 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1526 | | - aConstraints.gridx += 1; |
|---|
| 1527 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1528 | | - ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1529 | | - aConstraints.gridx = 0; |
|---|
| 1530 | | - aConstraints.gridy += 1; |
|---|
| 1531 | | - aConstraints.gridwidth = 1; |
|---|
| 1475 | + cGridBag anisoV = new cGridBag(); |
|---|
| 1476 | + anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints); |
|---|
| 1477 | + anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1478 | + anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1479 | + colorSection.add(anisoV); |
|---|
| 1532 | 1480 | |
|---|
| 1533 | | - ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints); |
|---|
| 1534 | | - shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1535 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1536 | | - aConstraints.gridx += 1; |
|---|
| 1537 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1538 | | - ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1539 | | - aConstraints.gridx = 0; |
|---|
| 1540 | | - aConstraints.gridy += 1; |
|---|
| 1541 | | - aConstraints.gridwidth = 1; |
|---|
| 1481 | + cGridBag shadowbias = new cGridBag(); |
|---|
| 1482 | + shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints); |
|---|
| 1483 | + shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1484 | + shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1485 | + colorSection.add(shadowbias); |
|---|
| 1542 | 1486 | |
|---|
| 1543 | | - //aConstraints.weighty = 1; |
|---|
| 1544 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100; |
|---|
| 1545 | | - //aConstraints.gridx += 1; |
|---|
| 1546 | | - ctrlPanel.add(new JLabel("----------------------------------"), aConstraints); |
|---|
| 1547 | | - aConstraints.weighty = 0; |
|---|
| 1548 | | - aConstraints.gridx = 0; |
|---|
| 1549 | | - aConstraints.gridy += 1; |
|---|
| 1550 | | - aConstraints.gridwidth = 1; |
|---|
| 1487 | + ctrlPanel.add(new JSeparator()); |
|---|
| 1488 | + |
|---|
| 1489 | + ctrlPanel.add(colorSection); |
|---|
| 1490 | + |
|---|
| 1491 | + //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
|---|
| 1492 | + |
|---|
| 1493 | + cGridBag diffuseSection = new cGridBag().setVertical(true); |
|---|
| 1494 | + |
|---|
| 1495 | + cGridBag diffuse = new cGridBag(); |
|---|
| 1496 | + diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints); |
|---|
| 1497 | + diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1498 | + diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1499 | + diffuseSection.add(diffuse); |
|---|
| 1551 | 1500 | |
|---|
| 1552 | | - ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints); |
|---|
| 1553 | | - diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1554 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1555 | | - aConstraints.gridx += 1; |
|---|
| 1556 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1557 | | - ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1558 | | - aConstraints.gridx = 0; |
|---|
| 1559 | | - aConstraints.gridy += 1; |
|---|
| 1560 | | - aConstraints.gridwidth = 1; |
|---|
| 1501 | + cGridBag diffuseness = new cGridBag(); |
|---|
| 1502 | + diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints); |
|---|
| 1503 | + diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1504 | + diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1505 | + diffuseSection.add(diffuseness); |
|---|
| 1561 | 1506 | |
|---|
| 1562 | | - ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints); |
|---|
| 1563 | | - diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1564 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1565 | | - aConstraints.gridx += 1; |
|---|
| 1566 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1567 | | - ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1568 | | - aConstraints.gridx = 0; |
|---|
| 1569 | | - aConstraints.gridy += 1; |
|---|
| 1570 | | - aConstraints.gridwidth = 1; |
|---|
| 1507 | + cGridBag selfshadow = new cGridBag(); |
|---|
| 1508 | + selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints); |
|---|
| 1509 | + selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1510 | + selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1511 | + diffuseSection.add(selfshadow); |
|---|
| 1571 | 1512 | |
|---|
| 1572 | | - ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints); |
|---|
| 1573 | | - selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1574 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1575 | | - aConstraints.gridx += 1; |
|---|
| 1576 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1577 | | - ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1578 | | - aConstraints.gridx = 0; |
|---|
| 1579 | | - aConstraints.gridy += 1; |
|---|
| 1580 | | - aConstraints.gridwidth = 1; |
|---|
| 1513 | + cGridBag sheen = new cGridBag(); |
|---|
| 1514 | + sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints); |
|---|
| 1515 | + sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1516 | + sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1517 | + diffuseSection.add(sheen); |
|---|
| 1581 | 1518 | |
|---|
| 1582 | | - ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints); |
|---|
| 1583 | | - sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1584 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1585 | | - aConstraints.gridx += 1; |
|---|
| 1586 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1587 | | - ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1588 | | - aConstraints.gridx = 0; |
|---|
| 1589 | | - aConstraints.gridy += 1; |
|---|
| 1590 | | - aConstraints.gridwidth = 1; |
|---|
| 1519 | + cGridBag subsurface = new cGridBag(); |
|---|
| 1520 | + subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints); |
|---|
| 1521 | + subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1522 | + subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1523 | + diffuseSection.add(subsurface); |
|---|
| 1591 | 1524 | |
|---|
| 1592 | | - ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints); |
|---|
| 1593 | | - subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1594 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1595 | | - aConstraints.gridx += 1; |
|---|
| 1596 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1597 | | - ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1598 | | - aConstraints.gridx = 0; |
|---|
| 1599 | | - aConstraints.gridy += 1; |
|---|
| 1600 | | - aConstraints.gridwidth = 1; |
|---|
| 1525 | + cGridBag shadow = new cGridBag(); |
|---|
| 1526 | + shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints); |
|---|
| 1527 | + shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1528 | + shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1529 | + diffuseSection.add(shadow); |
|---|
| 1601 | 1530 | |
|---|
| 1602 | | - ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints); |
|---|
| 1603 | | - shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1604 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1605 | | - aConstraints.gridx += 1; |
|---|
| 1606 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1607 | | - ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1608 | | - aConstraints.gridx = 0; |
|---|
| 1609 | | - aConstraints.gridy += 1; |
|---|
| 1610 | | - aConstraints.gridwidth = 1; |
|---|
| 1531 | + cGridBag fakedepth = new cGridBag(); |
|---|
| 1532 | + fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints); |
|---|
| 1533 | + fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1534 | + fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1535 | + diffuseSection.add(fakedepth); |
|---|
| 1611 | 1536 | |
|---|
| 1612 | | - ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints); |
|---|
| 1613 | | - fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1614 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1615 | | - aConstraints.gridx += 1; |
|---|
| 1616 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1617 | | - ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1618 | | - aConstraints.gridx = 0; |
|---|
| 1619 | | - aConstraints.gridy += 1; |
|---|
| 1620 | | - aConstraints.gridwidth = 1; |
|---|
| 1537 | + ctrlPanel.add(new JSeparator()); |
|---|
| 1538 | + |
|---|
| 1539 | + ctrlPanel.add(diffuseSection); |
|---|
| 1540 | + |
|---|
| 1541 | + //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
|---|
| 1542 | + |
|---|
| 1543 | + cGridBag specularSection = new cGridBag().setVertical(true); |
|---|
| 1621 | 1544 | |
|---|
| 1622 | | - //aConstraints.weighty = 1; |
|---|
| 1623 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100; |
|---|
| 1624 | | - //aConstraints.gridx += 1; |
|---|
| 1625 | | - ctrlPanel.add(new JLabel("----------------------------------"), aConstraints); |
|---|
| 1626 | | - aConstraints.weighty = 0; |
|---|
| 1627 | | - aConstraints.gridx = 0; |
|---|
| 1628 | | - aConstraints.gridy += 1; |
|---|
| 1629 | | - aConstraints.gridwidth = 1; |
|---|
| 1545 | + cGridBag specular = new cGridBag(); |
|---|
| 1546 | + specular.add(specularLabel = new JLabel("Specular")); // , aConstraints); |
|---|
| 1547 | + specularLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1548 | + specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1549 | + specularSection.add(specular); |
|---|
| 1630 | 1550 | |
|---|
| 1631 | | - ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints); |
|---|
| 1632 | | - specularLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1633 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1634 | | - aConstraints.gridx += 1; |
|---|
| 1635 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1636 | | - ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1637 | | - aConstraints.gridx = 0; |
|---|
| 1638 | | - aConstraints.gridy += 1; |
|---|
| 1639 | | - aConstraints.gridwidth = 1; |
|---|
| 1551 | + cGridBag lightarea = new cGridBag(); |
|---|
| 1552 | + lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints); |
|---|
| 1553 | + lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1554 | + lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1555 | + specularSection.add(lightarea); |
|---|
| 1640 | 1556 | |
|---|
| 1641 | | - ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints); |
|---|
| 1642 | | - lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1643 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1644 | | - aConstraints.gridx += 1; |
|---|
| 1645 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1646 | | - ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1647 | | - aConstraints.gridx = 0; |
|---|
| 1648 | | - aConstraints.gridy += 1; |
|---|
| 1649 | | - aConstraints.gridwidth = 1; |
|---|
| 1557 | + cGridBag shininess = new cGridBag(); |
|---|
| 1558 | + shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints); |
|---|
| 1559 | + shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1560 | + shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1561 | + specularSection.add(shininess); |
|---|
| 1650 | 1562 | |
|---|
| 1651 | | - ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints); |
|---|
| 1652 | | - shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1653 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1654 | | - aConstraints.gridx += 1; |
|---|
| 1655 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1656 | | - ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1657 | | - aConstraints.gridx = 0; |
|---|
| 1658 | | - aConstraints.gridy += 1; |
|---|
| 1659 | | - aConstraints.gridwidth = 1; |
|---|
| 1563 | + cGridBag metalness = new cGridBag(); |
|---|
| 1564 | + metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints); |
|---|
| 1565 | + metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1566 | + metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1567 | + specularSection.add(metalness); |
|---|
| 1660 | 1568 | |
|---|
| 1661 | | - ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints); |
|---|
| 1662 | | - metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1663 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1664 | | - aConstraints.gridx += 1; |
|---|
| 1665 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1666 | | - ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1667 | | - aConstraints.gridx = 0; |
|---|
| 1668 | | - aConstraints.gridy += 1; |
|---|
| 1669 | | - aConstraints.gridwidth = 1; |
|---|
| 1569 | + cGridBag velvet = new cGridBag(); |
|---|
| 1570 | + velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints); |
|---|
| 1571 | + velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1572 | + velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1573 | + specularSection.add(velvet); |
|---|
| 1670 | 1574 | |
|---|
| 1671 | | - ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints); |
|---|
| 1672 | | - velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1673 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1674 | | - aConstraints.gridx += 1; |
|---|
| 1675 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1676 | | - ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1677 | | - aConstraints.gridx = 0; |
|---|
| 1678 | | - aConstraints.gridy += 1; |
|---|
| 1679 | | - aConstraints.gridwidth = 1; |
|---|
| 1680 | | - |
|---|
| 1681 | | - shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1); |
|---|
| 1682 | | - Return(); |
|---|
| 1575 | + shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1); |
|---|
| 1576 | + //Return(); |
|---|
| 1683 | 1577 | // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints); |
|---|
| 1684 | 1578 | // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1685 | 1579 | // aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| .. | .. |
|---|
| 1690 | 1584 | // aConstraints.gridy += 1; |
|---|
| 1691 | 1585 | // aConstraints.gridwidth = 1; |
|---|
| 1692 | 1586 | |
|---|
| 1693 | | - //aConstraints.weighty = 1; |
|---|
| 1694 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100; |
|---|
| 1695 | | - //aConstraints.gridx += 1; |
|---|
| 1696 | | - ctrlPanel.add(new JLabel("----------------------------------"), aConstraints); |
|---|
| 1697 | | - aConstraints.weighty = 0; |
|---|
| 1698 | | - aConstraints.gridx = 0; |
|---|
| 1699 | | - aConstraints.gridy += 1; |
|---|
| 1700 | | - aConstraints.gridwidth = 1; |
|---|
| 1701 | 1587 | |
|---|
| 1702 | | - ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints); |
|---|
| 1703 | | - cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1704 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1705 | | - aConstraints.gridx += 1; |
|---|
| 1706 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1707 | | - ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1708 | | - aConstraints.gridx = 0; |
|---|
| 1709 | | - aConstraints.gridy += 1; |
|---|
| 1710 | | - aConstraints.gridwidth = 1; |
|---|
| 1588 | + ctrlPanel.add(new JSeparator()); |
|---|
| 1589 | + |
|---|
| 1590 | + ctrlPanel.add(specularSection); |
|---|
| 1591 | + |
|---|
| 1592 | + //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
|---|
| 1593 | + |
|---|
| 1594 | + cGridBag globalSection = new cGridBag().setVertical(true); |
|---|
| 1711 | 1595 | |
|---|
| 1712 | | - ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints); |
|---|
| 1713 | | - ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1714 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1715 | | - aConstraints.gridx += 1; |
|---|
| 1716 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1717 | | - ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1718 | | - aConstraints.gridx = 0; |
|---|
| 1719 | | - aConstraints.gridy += 1; |
|---|
| 1720 | | - aConstraints.gridwidth = 1; |
|---|
| 1596 | + cGridBag camera = new cGridBag(); |
|---|
| 1597 | + camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints); |
|---|
| 1598 | + cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1599 | + camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1600 | + globalSection.add(camera); |
|---|
| 1721 | 1601 | |
|---|
| 1722 | | - ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints); |
|---|
| 1723 | | - backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1724 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1725 | | - aConstraints.gridx += 1; |
|---|
| 1726 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1727 | | - ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints); |
|---|
| 1728 | | - aConstraints.gridx = 0; |
|---|
| 1729 | | - aConstraints.gridy += 1; |
|---|
| 1730 | | - aConstraints.gridwidth = 1; |
|---|
| 1602 | + cGridBag ambient = new cGridBag(); |
|---|
| 1603 | + ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints); |
|---|
| 1604 | + ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1605 | + ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1606 | + globalSection.add(ambient); |
|---|
| 1731 | 1607 | |
|---|
| 1732 | | - ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints); |
|---|
| 1733 | | - opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1734 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1735 | | - aConstraints.gridx += 1; |
|---|
| 1736 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1737 | | - ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints); |
|---|
| 1738 | | - aConstraints.gridx = 0; |
|---|
| 1739 | | - aConstraints.gridy += 1; |
|---|
| 1740 | | - aConstraints.gridwidth = 1; |
|---|
| 1741 | | - aConstraints.weighty = 0; |
|---|
| 1608 | + cGridBag backlit = new cGridBag(); |
|---|
| 1609 | + backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints); |
|---|
| 1610 | + backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1611 | + backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints); |
|---|
| 1612 | + globalSection.add(backlit); |
|---|
| 1742 | 1613 | |
|---|
| 1743 | | - ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints); |
|---|
| 1744 | | - bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1745 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1746 | | - aConstraints.gridx += 1; |
|---|
| 1747 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1748 | | - ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints); |
|---|
| 1749 | | - aConstraints.gridx = 0; |
|---|
| 1750 | | - aConstraints.gridy += 1; |
|---|
| 1751 | | - aConstraints.gridwidth = 1; |
|---|
| 1614 | + cGridBag opacity = new cGridBag(); |
|---|
| 1615 | + opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints); |
|---|
| 1616 | + opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1617 | + opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints); |
|---|
| 1618 | + globalSection.add(opacity); |
|---|
| 1752 | 1619 | |
|---|
| 1753 | | - ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints); |
|---|
| 1754 | | - noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1755 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1756 | | - aConstraints.gridx += 1; |
|---|
| 1757 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1758 | | - ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints); |
|---|
| 1759 | | - aConstraints.gridx = 0; |
|---|
| 1760 | | - aConstraints.gridy += 1; |
|---|
| 1761 | | - aConstraints.gridwidth = 1; |
|---|
| 1620 | + ctrlPanel.add(new JSeparator()); |
|---|
| 1621 | + |
|---|
| 1622 | + ctrlPanel.add(globalSection); |
|---|
| 1623 | + |
|---|
| 1624 | + //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
|---|
| 1625 | + |
|---|
| 1626 | + cGridBag textureSection = new cGridBag().setVertical(true); |
|---|
| 1762 | 1627 | |
|---|
| 1763 | | - ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints); |
|---|
| 1764 | | - powerLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1765 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1766 | | - aConstraints.gridx += 1; |
|---|
| 1767 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1768 | | - ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints); |
|---|
| 1769 | | - aConstraints.gridx = 0; |
|---|
| 1770 | | - aConstraints.gridy += 1; |
|---|
| 1771 | | - aConstraints.gridwidth = 1; |
|---|
| 1628 | + cGridBag bump = new cGridBag(); |
|---|
| 1629 | + bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints); |
|---|
| 1630 | + bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1631 | + bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints); |
|---|
| 1632 | + textureSection.add(bump); |
|---|
| 1772 | 1633 | |
|---|
| 1773 | | - ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints); |
|---|
| 1774 | | - borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1775 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1776 | | - aConstraints.gridx += 1; |
|---|
| 1777 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1778 | | - ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints); |
|---|
| 1779 | | - aConstraints.gridx = 0; |
|---|
| 1780 | | - aConstraints.gridy += 1; |
|---|
| 1781 | | - aConstraints.gridwidth = 1; |
|---|
| 1634 | + cGridBag noise = new cGridBag(); |
|---|
| 1635 | + noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints); |
|---|
| 1636 | + noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1637 | + noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints); |
|---|
| 1638 | + textureSection.add(noise); |
|---|
| 1782 | 1639 | |
|---|
| 1783 | | - ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints); |
|---|
| 1784 | | - fogLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1785 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1786 | | - aConstraints.gridx += 1; |
|---|
| 1787 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1788 | | - ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints); |
|---|
| 1789 | | - aConstraints.gridx = 0; |
|---|
| 1790 | | - aConstraints.gridy += 1; |
|---|
| 1791 | | - aConstraints.gridwidth = 1; |
|---|
| 1640 | + cGridBag power = new cGridBag(); |
|---|
| 1641 | + power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints); |
|---|
| 1642 | + powerLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1643 | + power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints); |
|---|
| 1644 | + textureSection.add(power); |
|---|
| 1792 | 1645 | |
|---|
| 1793 | | - ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints); |
|---|
| 1794 | | - opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1795 | | - aConstraints.fill = GridBagConstraints.HORIZONTAL; |
|---|
| 1796 | | - aConstraints.gridx += 1; |
|---|
| 1797 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; |
|---|
| 1798 | | - ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints); |
|---|
| 1799 | | - aConstraints.gridx = 0; |
|---|
| 1800 | | - aConstraints.gridy += 1; |
|---|
| 1801 | | - aConstraints.gridwidth = 1; |
|---|
| 1646 | + cGridBag borderfade = new cGridBag(); |
|---|
| 1647 | + borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints); |
|---|
| 1648 | + borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1649 | + borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints); |
|---|
| 1650 | + textureSection.add(borderfade); |
|---|
| 1802 | 1651 | |
|---|
| 1803 | | - //aConstraints.weighty = 1; |
|---|
| 1804 | | - aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100; |
|---|
| 1805 | | - //aConstraints.gridx += 1; |
|---|
| 1806 | | - ctrlPanel.add(new JLabel("----------------------------------"), aConstraints); |
|---|
| 1807 | | - aConstraints.weighty = 0; |
|---|
| 1652 | + cGridBag fog = new cGridBag(); |
|---|
| 1653 | + fog.add(fogLabel = new JLabel("Punch")); // , aConstraints); |
|---|
| 1654 | + fogLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1655 | + fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints); |
|---|
| 1656 | + textureSection.add(fog); |
|---|
| 1808 | 1657 | |
|---|
| 1809 | | - aConstraints.gridx = 0; |
|---|
| 1810 | | - aConstraints.gridy = 0; |
|---|
| 1811 | | - aConstraints.gridwidth = 1; |
|---|
| 1658 | + cGridBag opacityPower = new cGridBag(); |
|---|
| 1659 | + opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints); |
|---|
| 1660 | + opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING); |
|---|
| 1661 | + opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints); |
|---|
| 1662 | + textureSection.add(opacityPower); |
|---|
| 1663 | + |
|---|
| 1664 | + ctrlPanel.add(new JSeparator()); |
|---|
| 1665 | + |
|---|
| 1666 | + ctrlPanel.add(textureSection); |
|---|
| 1667 | + |
|---|
| 1668 | + //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints); |
|---|
| 1812 | 1669 | |
|---|
| 1813 | 1670 | SetMaterial(copy); // .GetMaterial()); |
|---|
| 1814 | 1671 | |
|---|
| 1815 | | - colorField.addChangeListener(this); |
|---|
| 1816 | | - modulationField.addChangeListener(this); |
|---|
| 1672 | + //colorField.addChangeListener(this); |
|---|
| 1673 | +// modulationField.addChangeListener(this); |
|---|
| 1817 | 1674 | metalnessField.addChangeListener(this); |
|---|
| 1818 | 1675 | diffuseField.addChangeListener(this); |
|---|
| 1819 | 1676 | specularField.addChangeListener(this); |
|---|
| .. | .. |
|---|
| 3516 | 3373 | current.fakedepth = (float) fakedepthField.getFloat(); |
|---|
| 3517 | 3374 | current.shadowbias = (float) shadowbiasField.getFloat(); |
|---|
| 3518 | 3375 | |
|---|
| 3519 | | - if (!NumberSlider.frozen) |
|---|
| 3376 | + if (!cNumberSlider.frozen) |
|---|
| 3520 | 3377 | { |
|---|
| 3521 | 3378 | //System.out.println("Propagate = " + propagate); |
|---|
| 3522 | 3379 | copy.UpdateMaterial(anchor, current, propagate); |
|---|
| .. | .. |
|---|
| 3889 | 3746 | |
|---|
| 3890 | 3747 | radioPanel.revalidate(); |
|---|
| 3891 | 3748 | radioPanel.repaint(); |
|---|
| 3892 | | - ctrlPanel.revalidate(); // ? new |
|---|
| 3749 | + ctrlPanel.validate(); // ? new |
|---|
| 3893 | 3750 | ctrlPanel.repaint(); |
|---|
| 3894 | 3751 | } |
|---|
| 3895 | 3752 | } |
|---|
| .. | .. |
|---|
| 4556 | 4413 | JPanel treePanel; |
|---|
| 4557 | 4414 | JPanel radioPanel; |
|---|
| 4558 | 4415 | ButtonGroup buttonGroup; |
|---|
| 4559 | | - JPanel ctrlPanel; |
|---|
| 4560 | | - JPanel materialPanel; |
|---|
| 4416 | + cGridBag ctrlPanel; |
|---|
| 4417 | + cGridBag materialPanel; |
|---|
| 4561 | 4418 | JScrollPane infoPanel; |
|---|
| 4562 | | - JPanel optionsPanel; |
|---|
| 4419 | + cGridBag optionsPanel; |
|---|
| 4563 | 4420 | JTabbedPane objectPanel; |
|---|
| 4564 | 4421 | cGridBag XYZPanel; |
|---|
| 4565 | 4422 | JSplitPane gridPanel; |
|---|
| .. | .. |
|---|
| 4619 | 4476 | // MATERIAL |
|---|
| 4620 | 4477 | JLabel materialLabel; |
|---|
| 4621 | 4478 | JLabel colorLabel; |
|---|
| 4622 | | - NumberSlider colorField; |
|---|
| 4479 | + cNumberSlider colorField; |
|---|
| 4623 | 4480 | JLabel modulationLabel; |
|---|
| 4624 | | - NumberSlider modulationField; |
|---|
| 4481 | + cNumberSlider modulationField; |
|---|
| 4625 | 4482 | JLabel metalnessLabel; |
|---|
| 4626 | | - NumberSlider metalnessField; |
|---|
| 4483 | + cNumberSlider metalnessField; |
|---|
| 4627 | 4484 | JLabel diffuseLabel; |
|---|
| 4628 | | - NumberSlider diffuseField; |
|---|
| 4485 | + cNumberSlider diffuseField; |
|---|
| 4629 | 4486 | JLabel specularLabel; |
|---|
| 4630 | | - NumberSlider specularField; |
|---|
| 4487 | + cNumberSlider specularField; |
|---|
| 4631 | 4488 | JLabel shininessLabel; |
|---|
| 4632 | | - NumberSlider shininessField; |
|---|
| 4489 | + cNumberSlider shininessField; |
|---|
| 4633 | 4490 | JLabel shiftLabel; |
|---|
| 4634 | | - NumberSlider shiftField; |
|---|
| 4491 | + cNumberSlider shiftField; |
|---|
| 4635 | 4492 | JLabel ambientLabel; |
|---|
| 4636 | | - NumberSlider ambientField; |
|---|
| 4493 | + cNumberSlider ambientField; |
|---|
| 4637 | 4494 | JLabel lightareaLabel; |
|---|
| 4638 | | - NumberSlider lightareaField; |
|---|
| 4495 | + cNumberSlider lightareaField; |
|---|
| 4639 | 4496 | JLabel diffusenessLabel; |
|---|
| 4640 | | - NumberSlider diffusenessField; |
|---|
| 4497 | + cNumberSlider diffusenessField; |
|---|
| 4641 | 4498 | JLabel velvetLabel; |
|---|
| 4642 | | - NumberSlider velvetField; |
|---|
| 4499 | + cNumberSlider velvetField; |
|---|
| 4643 | 4500 | JLabel sheenLabel; |
|---|
| 4644 | | - NumberSlider sheenField; |
|---|
| 4501 | + cNumberSlider sheenField; |
|---|
| 4645 | 4502 | JLabel subsurfaceLabel; |
|---|
| 4646 | | - NumberSlider subsurfaceField; |
|---|
| 4503 | + cNumberSlider subsurfaceField; |
|---|
| 4647 | 4504 | //JLabel bumpLabel; |
|---|
| 4648 | 4505 | //NumberSlider bumpField; |
|---|
| 4649 | 4506 | JLabel backlitLabel; |
|---|
| 4650 | | - NumberSlider backlitField; |
|---|
| 4507 | + cNumberSlider backlitField; |
|---|
| 4651 | 4508 | JLabel anisoLabel; |
|---|
| 4652 | | - NumberSlider anisoField; |
|---|
| 4509 | + cNumberSlider anisoField; |
|---|
| 4653 | 4510 | JLabel anisoVLabel; |
|---|
| 4654 | | - NumberSlider anisoVField; |
|---|
| 4511 | + cNumberSlider anisoVField; |
|---|
| 4655 | 4512 | JLabel cameraLabel; |
|---|
| 4656 | | - NumberSlider cameraField; |
|---|
| 4513 | + cNumberSlider cameraField; |
|---|
| 4657 | 4514 | JLabel selfshadowLabel; |
|---|
| 4658 | | - NumberSlider selfshadowField; |
|---|
| 4515 | + cNumberSlider selfshadowField; |
|---|
| 4659 | 4516 | JLabel shadowLabel; |
|---|
| 4660 | | - NumberSlider shadowField; |
|---|
| 4517 | + cNumberSlider shadowField; |
|---|
| 4661 | 4518 | JLabel textureLabel; |
|---|
| 4662 | | - NumberSlider textureField; |
|---|
| 4519 | + cNumberSlider textureField; |
|---|
| 4663 | 4520 | JLabel opacityLabel; |
|---|
| 4664 | | - NumberSlider opacityField; |
|---|
| 4521 | + cNumberSlider opacityField; |
|---|
| 4665 | 4522 | JLabel fakedepthLabel; |
|---|
| 4666 | | - NumberSlider fakedepthField; |
|---|
| 4523 | + cNumberSlider fakedepthField; |
|---|
| 4667 | 4524 | JLabel shadowbiasLabel; |
|---|
| 4668 | | - NumberSlider shadowbiasField; |
|---|
| 4525 | + cNumberSlider shadowbiasField; |
|---|
| 4669 | 4526 | JLabel bumpLabel; |
|---|
| 4670 | | - NumberSlider bumpField; |
|---|
| 4527 | + cNumberSlider bumpField; |
|---|
| 4671 | 4528 | JLabel noiseLabel; |
|---|
| 4672 | | - NumberSlider noiseField; |
|---|
| 4529 | + cNumberSlider noiseField; |
|---|
| 4673 | 4530 | JLabel powerLabel; |
|---|
| 4674 | | - NumberSlider powerField; |
|---|
| 4531 | + cNumberSlider powerField; |
|---|
| 4675 | 4532 | JLabel borderfadeLabel; |
|---|
| 4676 | | - NumberSlider borderfadeField; |
|---|
| 4533 | + cNumberSlider borderfadeField; |
|---|
| 4677 | 4534 | JLabel fogLabel; |
|---|
| 4678 | | - NumberSlider fogField; |
|---|
| 4535 | + cNumberSlider fogField; |
|---|
| 4679 | 4536 | JLabel opacityPowerLabel; |
|---|
| 4680 | | - NumberSlider opacityPowerField; |
|---|
| 4537 | + cNumberSlider opacityPowerField; |
|---|
| 4681 | 4538 | JTree jTree; |
|---|
| 4682 | 4539 | //ObjectUI parent; |
|---|
| 4683 | 4540 | |
|---|
| 4684 | | - NumberSlider normalpushField; |
|---|
| 4541 | + cNumberSlider normalpushField; |
|---|
| 4685 | 4542 | } |
|---|
