patchanim-commit Mailing List for patchanim (Page 2)
Brought to you by:
dbrosius
You can subscribe to this list here.
2008 |
Jan
(80) |
Feb
(158) |
Mar
|
Apr
|
May
(3) |
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(26) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(3) |
2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <dbr...@us...> - 2009-01-04 22:27:22
|
Revision: 280 http://patchanim.svn.sourceforge.net/patchanim/?rev=280&view=rev Author: dbrosius Date: 2009-01-04 22:27:17 +0000 (Sun, 04 Jan 2009) Log Message: ----------- add set all border points menu option Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2009-01-02 06:02:58 UTC (rev 279) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2009-01-04 22:27:17 UTC (rev 280) @@ -68,7 +68,7 @@ private transient Thread redrawThread = null; private final Object redrawLock = new Object(); private boolean redrawing = false; - private boolean dragging = false; + private boolean dragging = false; public JPatchSamplePanel(PatchColor c) { color = c; @@ -108,16 +108,16 @@ public void mousePressed(MouseEvent me) { if ((color != PatchColor.Combined) && me.isPopupTrigger()) showPatchContentMenu(me); - else if (decorator != null) { - dragging = decorator.press(me.getPoint(), JPatchSamplePanel.this.getBounds()); - } + else if (decorator != null) { + dragging = decorator.press(me.getPoint(), JPatchSamplePanel.this.getBounds()); + } } @Override public void mouseReleased(MouseEvent me) { if ((color != PatchColor.Combined) && me.isPopupTrigger()) showPatchContentMenu(me); - dragging = false; + dragging = false; } }); @@ -214,34 +214,70 @@ JPopupMenu menu = new JPopupMenu(); JMenu setAllItem = new JMenu(rb.getString(PatchAnimBundle.SETALLPOINTS)); menu.add(setAllItem); - JMenuItem blackItem = new JMenuItem(rb.getString(PatchAnimBundle.BLACK)); - blackItem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent ae) { - setAllPts(0.0); - } - }); - setAllItem.add(blackItem); - JMenuItem fullColorItem = new JMenuItem(rb.getString(PatchAnimBundle.FULLCOLOR)); - fullColorItem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent ae) { - setAllPts(255.0); - } - }); + { + JMenuItem blackItem = new JMenuItem(rb.getString(PatchAnimBundle.BLACK)); + blackItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + setAllPts(0.0); + } + }); + setAllItem.add(blackItem); + + JMenuItem fullColorItem = new JMenuItem(rb.getString(PatchAnimBundle.FULLCOLOR)); + fullColorItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + setAllPts(255.0); + } + }); + setAllItem.add(fullColorItem); + + JMenuItem valueItem = new JMenuItem(rb.getString(PatchAnimBundle.VALUE)); + valueItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + String value = JOptionPane.showInputDialog(JPatchSamplePanel.this, rb.getString(PatchAnimBundle.VALUE), "128"); + try { + if (value != null) + setAllPts(Double.parseDouble(value)); + } catch (NumberFormatException nfe) { + } + } + }); + setAllItem.add(valueItem); + } - setAllItem.add(fullColorItem); - JMenuItem valueItem = new JMenuItem(rb.getString(PatchAnimBundle.VALUE)); - valueItem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent ae) { - String value = JOptionPane.showInputDialog(JPatchSamplePanel.this, rb.getString(PatchAnimBundle.VALUE), "128"); - try { - if (value != null) - setAllPts(Double.parseDouble(value)); - } catch (NumberFormatException nfe) { + JMenu borderItem = new JMenu(rb.getString(PatchAnimBundle.SETBORDERPOINTS)); + menu.add(borderItem); + { + JMenuItem blackItem = new JMenuItem(rb.getString(PatchAnimBundle.BLACK)); + blackItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + setAllBorderPts(0.0); } - } - }); + }); + borderItem.add(blackItem); + + JMenuItem fullColorItem = new JMenuItem(rb.getString(PatchAnimBundle.FULLCOLOR)); + fullColorItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + setAllBorderPts(255.0); + } + }); + borderItem.add(fullColorItem); + + JMenuItem valueItem = new JMenuItem(rb.getString(PatchAnimBundle.VALUE)); + valueItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + String value = JOptionPane.showInputDialog(JPatchSamplePanel.this, rb.getString(PatchAnimBundle.VALUE), "128"); + try { + if (value != null) + setAllBorderPts(Double.parseDouble(value)); + } catch (NumberFormatException nfe) { + } + } + }); + borderItem.add(valueItem); + } - setAllItem.add(valueItem); JMenuItem lightenPatch = new JMenuItem(rb.getString(PatchAnimBundle.LIGHTENPATCH)); lightenPatch.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) { @@ -471,6 +507,28 @@ mediator.setNewActivePatch(patch); } + private void setAllBorderPts(double d) { + PatchPanelMediator mediator = PatchPanelMediator.getMediator(); + CombinedPatch patch = mediator.getActivePatch(); + PatchCoords coords = patch.getPatch(color); + int order = coords.getOrder(); + for (int k = 0; k < order; k++) { + Coordinate c = coords.getCoordinate(k, 0); + c.setColor(d); + coords.setCoordinate(k, 0, c); + c = coords.getCoordinate(0, k); + c.setColor(d); + coords.setCoordinate(0, k, c); + c = coords.getCoordinate(k, order-1); + c.setColor(d); + coords.setCoordinate(k, order-1, c); + c = coords.getCoordinate(order-1, k); + c.setColor(d); + coords.setCoordinate(order-1, k, c); + } + mediator.setNewActivePatch(patch); + } + private void linearGradient(BlendDirection direction) { PatchPanelMediator mediator = PatchPanelMediator.getMediator(); CombinedPatch patch = mediator.getActivePatch(); Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2009-01-02 06:02:58 UTC (rev 279) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2009-01-04 22:27:17 UTC (rev 280) @@ -83,6 +83,7 @@ public static final String CLONE = "patchanim.clone"; public static final String COLOR = "patchanim.color"; public static final String SETALLPOINTS = "patchanim.setallpoints"; + public static final String SETBORDERPOINTS = "patchanim.setborderpoints"; public static final String BLACK = "patchanim.black"; public static final String FULLCOLOR="patchanim.fullcolor"; public static final String VALUE="patchanim.value"; Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2009-01-02 06:02:58 UTC (rev 279) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2009-01-04 22:27:17 UTC (rev 280) @@ -82,6 +82,7 @@ patchanim.clone = Clone patchanim.color = Color patchanim.setallpoints = Set all control points to... +patchanim.setborderpoints = Set border points to... patchanim.black = Black patchanim.fullcolor = Full Color patchanim.value = Value... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2009-01-02 06:03:01
|
Revision: 279 http://patchanim.svn.sourceforge.net/patchanim/?rev=279&view=rev Author: dbrosius Date: 2009-01-02 06:02:58 +0000 (Fri, 02 Jan 2009) Log Message: ----------- more doc Modified Paths: -------------- trunk/patchanim/htdocs/index.html Modified: trunk/patchanim/htdocs/index.html =================================================================== --- trunk/patchanim/htdocs/index.html 2009-01-02 05:47:18 UTC (rev 278) +++ trunk/patchanim/htdocs/index.html 2009-01-02 06:02:58 UTC (rev 279) @@ -64,6 +64,10 @@ <ul> <li>Support for tween styles, or how one patch transitions into another patch</li> </ul> + <p>January 2, 2009</p> + <ul> + <li>Added Shape gradients</li> + </ul> <p>If you would like to see the tool as it progresses, you can run the webstart version <a href="jnlp/patchanim.jnlp">here.</a></p> <img src="sample.jpg"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2009-01-02 05:47:23
|
Revision: 278 http://patchanim.svn.sourceforge.net/patchanim/?rev=278&view=rev Author: dbrosius Date: 2009-01-02 05:47:18 +0000 (Fri, 02 Jan 2009) Log Message: ----------- add shape gradients Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2009-01-02 05:44:20 UTC (rev 277) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2009-01-02 05:47:18 UTC (rev 278) @@ -94,6 +94,7 @@ public static final String RIGHTTOLEFT = "patchanim.righttoleft"; public static final String BOTTOMTOTOP = "patchanim.bottomtotop"; public static final String RADIALGRADIENT = "patchanim.radialgradient"; + public static final String SHAPEGRADIENT = "patchanim.shapegradient"; public static final String OUTWARD = "patchanim.outward"; public static final String INWARD = "patchanim.inward"; public static final String SHIFT = "patchanim.shift"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2009-01-02 05:44:23
|
Revision: 277 http://patchanim.svn.sourceforge.net/patchanim/?rev=277&view=rev Author: dbrosius Date: 2009-01-02 05:44:20 +0000 (Fri, 02 Jan 2009) Log Message: ----------- add shape gradients Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2009-01-02 05:43:59 UTC (rev 276) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2009-01-02 05:44:20 UTC (rev 277) @@ -93,6 +93,7 @@ patchanim.righttoleft = Right to Left patchanim.bottomtotop = Bottom to Top patchanim.radialgradient = Radial Gradient... +patchanim.shapegradient = Shape Gradient... patchanim.outward = Outward patchanim.inward = Inward patchanim.shift = Shift... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2009-01-02 05:44:02
|
Revision: 276 http://patchanim.svn.sourceforge.net/patchanim/?rev=276&view=rev Author: dbrosius Date: 2009-01-02 05:43:59 +0000 (Fri, 02 Jan 2009) Log Message: ----------- add shape gradients Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2009-01-02 02:01:40 UTC (rev 275) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2009-01-02 05:43:59 UTC (rev 276) @@ -312,6 +312,25 @@ radialGradient.add(inward); menu.add(radialGradient); + JMenu shapeGradient = new JMenu(rb.getString(PatchAnimBundle.SHAPEGRADIENT)); + JMenuItem outwardSh = new JMenuItem(rb.getString(PatchAnimBundle.OUTWARD)); + outwardSh.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + shapeGradient(BlendDirection.Outward); + } + }); + + JMenuItem inwardSh = new JMenuItem(rb.getString(PatchAnimBundle.INWARD)); + inwardSh.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + shapeGradient(BlendDirection.Inward); + } + }); + + shapeGradient.add(outwardSh); + shapeGradient.add(inwardSh); + menu.add(shapeGradient); + JMenu shift = new JMenu(rb.getString(PatchAnimBundle.SHIFT)); JMenuItem left = new JMenuItem(rb.getString(PatchAnimBundle.LEFT)); left.addActionListener(new ActionListener() { @@ -515,7 +534,36 @@ } mediator.setNewActivePatch(patch); } + + private void shapeGradient(BlendDirection direction) { + PatchPanelMediator mediator = PatchPanelMediator.getMediator(); + CombinedPatch patch = mediator.getActivePatch(); + PatchCoords coords = patch.getPatch(color); + int order = coords.getOrder(); + double color = 0.0; + double midOrder = (order - 1) / 2.0; + for (int i = 0; i < order; i++) { + for (int j = 0; j < order; j++) { + Coordinate c = coords.getCoordinate(i, j); + double outside = Math.max(Math.abs(i - midOrder), Math.abs(j - midOrder)); + switch (direction) { + case Outward: + color = (int)(255.0 * (outside / midOrder)); + break; + + case Inward: + color = (int)(255.0 - (255.0 * (outside / midOrder))); + break; + } + + c.setColor(color); + coords.setCoordinate(i, j, c); + } + } + mediator.setNewActivePatch(patch); + } + private void shiftPatch(ShiftDirection dir) { PatchPanelMediator mediator = PatchPanelMediator.getMediator(); CombinedPatch patch = mediator.getActivePatch(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2009-01-02 02:01:45
|
Revision: 275 http://patchanim.svn.sourceforge.net/patchanim/?rev=275&view=rev Author: dbrosius Date: 2009-01-02 02:01:40 +0000 (Fri, 02 Jan 2009) Log Message: ----------- update copyright to 2009 Modified Paths: -------------- trunk/patchanim/build.xml trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java Modified: trunk/patchanim/build.xml =================================================================== --- trunk/patchanim/build.xml 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/build.xml 2009-01-02 02:01:40 UTC (rev 275) @@ -1,7 +1,7 @@ <!-- /* * patchanim - Bezier Blend Batch Animation Builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java 2008-12-28 07:46:02 UTC (rev 274) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java 2009-01-02 02:01:40 UTC (rev 275) @@ -1,6 +1,6 @@ /* * patchanim - A bezier surface patch color blend animation builder - * Copyright (C) 2008 Dave Brosius + * Copyright (C) 2008-2009 Dave Brosius * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 07:46:04
|
Revision: 274 http://patchanim.svn.sourceforge.net/patchanim/?rev=274&view=rev Author: dbrosius Date: 2008-12-28 07:46:02 +0000 (Sun, 28 Dec 2008) Log Message: ----------- fix problem where user deletes patch while test animating. Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2008-12-28 07:01:27 UTC (rev 273) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2008-12-28 07:46:02 UTC (rev 274) @@ -61,14 +61,19 @@ animThread = new Thread(new Runnable() { public void run() { - try { - PatchAnimator animator = new PatchAnimator(document); - animator.addPatchCompletionListener(JTestFrame.this); - AnimationType type = document.getAnimationType(); - while (type != AnimationType.None) + AnimationType type = document.getAnimationType(); + do { + try { + PatchAnimator animator = new PatchAnimator(document); + animator.addPatchCompletionListener(JTestFrame.this); animator.animatePatches(); - } catch (InterruptedException ie) { - } + animator.removePatchCompletionListener(JTestFrame.this); + } catch (InterruptedException ie) { + break; + } catch (Exception e) { + //Could get OutOfBoundsException if user deletes patches mid animation + } + } while (type != AnimationType.None); } }); animThread.start(); Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java 2008-12-28 07:01:27 UTC (rev 273) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java 2008-12-28 07:46:02 UTC (rev 274) @@ -40,9 +40,17 @@ } public void addPatchCompletionListener(PatchCompletionListener listener) { - pcListeners.add(listener); + synchronized(pcListeners) { + pcListeners.add(listener); + } } + public void removePatchCompletionListener(PatchCompletionListener listener) { + synchronized(pcListeners) { + pcListeners.remove(listener); + } + } + public void animatePatches() throws InterruptedException { BufferedImage image = PatchGenerator.buildImage(null, document.useAlpha(), document.getWidth(), document.getHeight()); List<CombinedPatch> patches = document.getPatches(); @@ -105,7 +113,12 @@ private void firePatchCompleted(BufferedImage image) throws InterruptedException { PatchCompletionEvent pce = new PatchCompletionEvent(this, image); - for (PatchCompletionListener listener : pcListeners) { + Set<PatchCompletionListener> listeners; + synchronized(pcListeners) { + listeners = new HashSet<PatchCompletionListener>(pcListeners); + } + + for (PatchCompletionListener listener : listeners) { listener.patchCompleted(pce); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 07:01:29
|
Revision: 273 http://patchanim.svn.sourceforge.net/patchanim/?rev=273&view=rev Author: dbrosius Date: 2008-12-28 07:01:27 +0000 (Sun, 28 Dec 2008) Log Message: ----------- Tag version 1.3.0 Added Paths: ----------- tags/patchanim/v1_3_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:44:54
|
Revision: 272 http://patchanim.svn.sourceforge.net/patchanim/?rev=272&view=rev Author: dbrosius Date: 2008-12-28 06:44:52 +0000 (Sun, 28 Dec 2008) Log Message: ----------- updated store Modified Paths: -------------- trunk/patchanim/patchanim.store Modified: trunk/patchanim/patchanim.store =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:40:27
|
Revision: 271 http://patchanim.svn.sourceforge.net/patchanim/?rev=271&view=rev Author: dbrosius Date: 2008-12-28 06:40:25 +0000 (Sun, 28 Dec 2008) Log Message: ----------- upgrade to 1.3.0 Modified Paths: -------------- trunk/patchanim/build.xml Modified: trunk/patchanim/build.xml =================================================================== --- trunk/patchanim/build.xml 2008-12-28 06:38:31 UTC (rev 270) +++ trunk/patchanim/build.xml 2008-12-28 06:40:25 UTC (rev 271) @@ -35,7 +35,7 @@ <property name="javac.deprecation" value="on"/> <property name="javac.debug" value="on"/> - <property name="patchanim.version" value="1.2.0"/> + <property name="patchanim.version" value="1.3.0"/> <target name="clean" description="removes all generated collateral"> <delete dir="${classes.dir}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:38:33
|
Revision: 270 http://patchanim.svn.sourceforge.net/patchanim/?rev=270&view=rev Author: dbrosius Date: 2008-12-28 06:38:31 +0000 (Sun, 28 Dec 2008) Log Message: ----------- updated info Modified Paths: -------------- trunk/patchanim/htdocs/index.html Modified: trunk/patchanim/htdocs/index.html =================================================================== --- trunk/patchanim/htdocs/index.html 2008-12-28 06:35:22 UTC (rev 269) +++ trunk/patchanim/htdocs/index.html 2008-12-28 06:38:31 UTC (rev 270) @@ -50,7 +50,7 @@ to generate one full color blend. Since the description of the blend is very succinct (just 3 * 16 points), It is very easy to generate in-between images from two separate blend descriptions.</p> - <p>February 23, 2008 - added lately</p> + <p>February 23, 2008</p> <ul> <li>Support for controlling transparency with a separate alpha patch</li> <li>Context Patch menu option to shift patch in any direction</li> @@ -60,6 +60,10 @@ <li>Context Patch menu option to generate linear gradients for patch values</li> <li>Patches can now be any order from 2 - 9, specified on the new dialog</li> </ul> + <p>December 27, 2008</p> + <ul> + <li>Support for tween styles, or how one patch transitions into another patch</li> + </ul> <p>If you would like to see the tool as it progresses, you can run the webstart version <a href="jnlp/patchanim.jnlp">here.</a></p> <img src="sample.jpg"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:35:24
|
Revision: 269 http://patchanim.svn.sourceforge.net/patchanim/?rev=269&view=rev Author: dbrosius Date: 2008-12-28 06:35:22 +0000 (Sun, 28 Dec 2008) Log Message: ----------- updated screen shot Modified Paths: -------------- trunk/patchanim/htdocs/sample.jpg Modified: trunk/patchanim/htdocs/sample.jpg =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:27:32
|
Revision: 268 http://patchanim.svn.sourceforge.net/patchanim/?rev=268&view=rev Author: dbrosius Date: 2008-12-28 06:27:30 +0000 (Sun, 28 Dec 2008) Log Message: ----------- simplify tweenstyle algos Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-28 06:25:42 UTC (rev 267) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-28 06:27:30 UTC (rev 268) @@ -35,10 +35,10 @@ * </ul> */ public enum TweenStyle { - Linear(0, 1.0/3.0, 2.0/3.0, 1), + Linear(0, 1), Accelerating(0, 0, 0, 1), Decelerating(0, 1, 1, 1), - EaseInEaseOut(0, 0.0, 1, 1), + EaseInEaseOut(0, 0, 1, 1), AccelerateInAccelerateOut(0, 1, 0, 1), Wave(0, 2, -1, 1); @@ -49,13 +49,13 @@ private TweenStyle(double... ys) { this.ys = ys; - coeffs = new double[4]; + coeffs = new double[ys.length]; } public double transform(double frac) { PatchGenerator.buildCoefficients(frac, coeffs); double out = 0.0; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < ys.length; i++) { out += coeffs[i] * ys[i]; } return out; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:26:03
|
Revision: 267 http://patchanim.svn.sourceforge.net/patchanim/?rev=267&view=rev Author: dbrosius Date: 2008-12-28 06:25:42 +0000 (Sun, 28 Dec 2008) Log Message: ----------- fix the tween styles Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-28 06:11:15 UTC (rev 266) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-28 06:25:42 UTC (rev 267) @@ -18,7 +18,6 @@ */ package com.mebigfatguy.patchanim; -import java.awt.Point; import java.util.ResourceBundle; import com.mebigfatguy.patchanim.main.PatchAnimBundle; @@ -32,24 +31,24 @@ * <li><b>Decelerating</b> Control points are tweened decelerating from start to finish</li> * <li><b>EaseInEaseOut</b> Control points are tweened eased in from start, then eased out to finish</li> * <li><b>Accelerating</b> Control points are tweened accelerating in from start and then accelerated out to finish</li> - * <li><b>Accelerating</b> Control points are tweened waved from start to finish</li> + * <li><b>Wave</b> Control points are tweened waved from start to finish</li> * </ul> */ public enum TweenStyle { - Linear(new Point(0, 0), new Point(0, 0), new Point(100, 100), new Point(100, 100)), - Accelerating(new Point(0, 0), new Point(100, 0), new Point(100, 100), new Point(100, 100)), - Decelerating(new Point(0, 0), new Point(0, 100), new Point(100, 100), new Point(100, 100)), - EaseInEaseOut(new Point(0, 0), new Point(50, 0), new Point(50, 100), new Point(100, 100)), - AccelerateInAccelerateOut(new Point(0, 0), new Point(0, 50), new Point(100, 50), new Point(100, 100)), - Wave(new Point(0, 0), new Point(0, 200), new Point(100, -200), new Point(100, 100)); + Linear(0, 1.0/3.0, 2.0/3.0, 1), + Accelerating(0, 0, 0, 1), + Decelerating(0, 1, 1, 1), + EaseInEaseOut(0, 0.0, 1, 1), + AccelerateInAccelerateOut(0, 1, 0, 1), + Wave(0, 2, -1, 1); private static final String TWEEN = "tweenstyle."; - private Point[] points; + private double[] ys; private double[] coeffs; - private TweenStyle(Point... pts) { - points = pts; + private TweenStyle(double... ys) { + this.ys = ys; coeffs = new double[4]; } @@ -57,7 +56,7 @@ PatchGenerator.buildCoefficients(frac, coeffs); double out = 0.0; for (int i = 0; i < 4; i++) { - out += coeffs[i] * points[i].y / 100; + out += coeffs[i] * ys[i]; } return out; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:11:17
|
Revision: 266 http://patchanim.svn.sourceforge.net/patchanim/?rev=266&view=rev Author: dbrosius Date: 2008-12-28 06:11:15 +0000 (Sun, 28 Dec 2008) Log Message: ----------- pull calc of tween frac out of loop Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-28 06:06:28 UTC (rev 265) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-28 06:11:15 UTC (rev 266) @@ -84,12 +84,13 @@ public static PatchCoords tween(PatchCoords startCoords, PatchCoords endCoords, TweenStyle tweenStyle, double frac) { PatchCoords tweenCoords = new PatchCoords(startCoords.getOrder()); + double tweenFrac = tweenStyle.transform(frac); for (int x = 0; x < tweenCoords.order; x++) { for (int y = 0; y < tweenCoords.order; y++) { Coordinate startC = startCoords.getCoordinate(x,y); Coordinate endC = endCoords.getCoordinate(x,y); double startColor = startC.getColor(); - int tweenColor = (int)(startColor + (endC.getColor() - startColor) * tweenStyle.transform(frac)); + int tweenColor = (int)(startColor + (endC.getColor() - startColor) * tweenFrac); Coordinate tweenC = new Coordinate(startC.getX(), startC.getY(), tweenColor); tweenCoords.setCoordinate(x, y, tweenC); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-28 06:06:31
|
Revision: 265 http://patchanim.svn.sourceforge.net/patchanim/?rev=265&view=rev Author: dbrosius Date: 2008-12-28 06:06:28 +0000 (Sun, 28 Dec 2008) Log Message: ----------- too painful to shutdown test on defocus. Figure out another way to fix the breakage when number of patches changes. Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2008-12-26 05:32:38 UTC (rev 264) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2008-12-28 06:06:28 UTC (rev 265) @@ -21,8 +21,6 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Graphics; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; @@ -117,15 +115,6 @@ dispose(); } }); - - this.addFocusListener(new FocusAdapter() { - @Override - public void focusLost(FocusEvent e) { - super.focusLost(e); - endAnimation(); - dispose(); - } - }); } class TestPanel extends JPanel { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-26 05:32:41
|
Revision: 264 http://patchanim.svn.sourceforge.net/patchanim/?rev=264&view=rev Author: dbrosius Date: 2008-12-26 05:32:38 +0000 (Fri, 26 Dec 2008) Log Message: ----------- fix comment Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsd trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsl trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimExtension.java trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimIO.java trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/AnimationType.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/BlendDirection.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/ExportType.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/OutOfBoundsColor.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/PatchAnimDocument.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/PatchColor.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/ShiftDirection.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or @@ -57,7 +57,7 @@ PatchGenerator.buildCoefficients(frac, coeffs); double out = 0.0; for (int i = 0; i < 4; i++) { - out += coeffs[i] * (points[i].y / 100.0); + out += coeffs[i] * points[i].y / 100; } return out; } Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/DoubleDocument.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/ExportFrame.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/IntegerDocument.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimFrame.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchAnimPanel.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchListPanel.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JTestFrame.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/NewDocumentDialog.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchAnimFileFilter.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchDecorator.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchListModel.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/PatchPanelMediator.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/SourcePatchesPanel.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/Utils.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsd =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsd 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsd 2008-12-26 05:32:38 UTC (rev 264) @@ -1,6 +1,6 @@ <!-- /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsl =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsl 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimDoc.xsl 2008-12-26 05:32:38 UTC (rev 264) @@ -1,6 +1,6 @@ <!-- /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimExtension.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimExtension.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimExtension.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimIO.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimIO.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/io/PatchAnimIO.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/CombinedPatch.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchAnimator.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java 2008-12-26 05:22:15 UTC (rev 263) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java 2008-12-26 05:32:38 UTC (rev 264) @@ -1,5 +1,5 @@ /* - * patchanim - A bezier surface patch color blend gif builder + * patchanim - A bezier surface patch color blend animation builder * Copyright (C) 2008 Dave Brosius * * This library is free software; you can redistribute it and/or This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-26 05:22:19
|
Revision: 263 http://patchanim.svn.sourceforge.net/patchanim/?rev=263&view=rev Author: dbrosius Date: 2008-12-26 05:22:15 +0000 (Fri, 26 Dec 2008) Log Message: ----------- 508 Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2008-12-26 01:52:53 UTC (rev 262) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2008-12-26 05:22:15 UTC (rev 263) @@ -140,6 +140,7 @@ tweenStyleLabel = new JLabel(rb.getString(PatchAnimBundle.TWEENSTYLE)); EnumSet<TweenStyle> ts = EnumSet.<TweenStyle>allOf(TweenStyle.class); tweenStyleCB = new JComboBox(ts.toArray(new TweenStyle[ts.size()])); + tweenStyleLabel.setLabelFor(tweenStyleCB); tweenStyleCB.setToolTipText(rb.getString(PatchAnimBundle.TWEENSTYLE_TT)); outOfBoundsLabel.setLabelFor(tweenStyleCB); JPanel p = Utils.createFormPanel(tweenStyleLabel, tweenStyleCB); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-26 01:52:55
|
Revision: 262 http://patchanim.svn.sourceforge.net/patchanim/?rev=262&view=rev Author: dbrosius Date: 2008-12-26 01:52:53 +0000 (Fri, 26 Dec 2008) Log Message: ----------- put in tween algos Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-26 00:14:24 UTC (rev 261) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-26 01:52:53 UTC (rev 262) @@ -22,6 +22,7 @@ import java.util.ResourceBundle; import com.mebigfatguy.patchanim.main.PatchAnimBundle; +import com.mebigfatguy.patchanim.surface.PatchGenerator; /** * denotes the algorithm to use to tween two patches @@ -45,13 +46,20 @@ private static final String TWEEN = "tweenstyle."; private Point[] points; + private double[] coeffs; private TweenStyle(Point... pts) { points = pts; + coeffs = new double[4]; } public double transform(double frac) { - return frac; + PatchGenerator.buildCoefficients(frac, coeffs); + double out = 0.0; + for (int i = 0; i < 4; i++) { + out += coeffs[i] * (points[i].y / 100.0); + } + return out; } /** Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java 2008-12-26 00:14:24 UTC (rev 261) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchGenerator.java 2008-12-26 01:52:53 UTC (rev 262) @@ -199,7 +199,7 @@ return image; } - private static void buildCoefficients(double t, double[] coeffs) { + public static void buildCoefficients(double t, double[] coeffs) { double tt = 1.0; for (int i = 0; i < coeffs.length; i++) { coeffs[i] = tt; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-26 00:14:26
|
Revision: 261 http://patchanim.svn.sourceforge.net/patchanim/?rev=261&view=rev Author: dbrosius Date: 2008-12-26 00:14:24 +0000 (Fri, 26 Dec 2008) Log Message: ----------- guard against npes Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-26 00:03:08 UTC (rev 260) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-26 00:14:24 UTC (rev 261) @@ -234,7 +234,8 @@ public void actionPerformed(ActionEvent ae) { String value = JOptionPane.showInputDialog(JPatchSamplePanel.this, rb.getString(PatchAnimBundle.VALUE), "128"); try { - setAllPts(Double.parseDouble(value)); + if (value != null) + setAllPts(Double.parseDouble(value)); } catch (NumberFormatException nfe) { } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-26 00:03:12
|
Revision: 260 http://patchanim.svn.sourceforge.net/patchanim/?rev=260&view=rev Author: dbrosius Date: 2008-12-26 00:03:08 +0000 (Fri, 26 Dec 2008) Log Message: ----------- switch TweenStyle to a set of transformation functions on the 0->1 tween fraction Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-25 23:38:58 UTC (rev 259) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/TweenStyle.java 2008-12-26 00:03:08 UTC (rev 260) @@ -18,6 +18,7 @@ */ package com.mebigfatguy.patchanim; +import java.awt.Point; import java.util.ResourceBundle; import com.mebigfatguy.patchanim.main.PatchAnimBundle; @@ -25,15 +26,34 @@ /** * denotes the algorithm to use to tween two patches * <ul> - * <li><b>Linear</b> Control points are tweened linearly</li> - * <li><b>Radial</b> Control points are tweened radially</li> + * <li><b>Linear</b> Control points are tweened linearly from start to finish</li> + * <li><b>Accelerating</b> Control points are tweened accelerating from start to finish</li> + * <li><b>Decelerating</b> Control points are tweened decelerating from start to finish</li> + * <li><b>EaseInEaseOut</b> Control points are tweened eased in from start, then eased out to finish</li> + * <li><b>Accelerating</b> Control points are tweened accelerating in from start and then accelerated out to finish</li> + * <li><b>Accelerating</b> Control points are tweened waved from start to finish</li> * </ul> */ public enum TweenStyle { - Linear, - Radial; + Linear(new Point(0, 0), new Point(0, 0), new Point(100, 100), new Point(100, 100)), + Accelerating(new Point(0, 0), new Point(100, 0), new Point(100, 100), new Point(100, 100)), + Decelerating(new Point(0, 0), new Point(0, 100), new Point(100, 100), new Point(100, 100)), + EaseInEaseOut(new Point(0, 0), new Point(50, 0), new Point(50, 100), new Point(100, 100)), + AccelerateInAccelerateOut(new Point(0, 0), new Point(0, 50), new Point(100, 50), new Point(100, 100)), + Wave(new Point(0, 0), new Point(0, 200), new Point(100, -200), new Point(100, 100)); private static final String TWEEN = "tweenstyle."; + + private Point[] points; + + private TweenStyle(Point... pts) { + points = pts; + } + + public double transform(double frac) { + return frac; + } + /** * returns the localized value of the enum * @return the localized display value Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2008-12-25 23:38:58 UTC (rev 259) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchControlPanel.java 2008-12-26 00:03:08 UTC (rev 260) @@ -26,6 +26,7 @@ import java.awt.event.FocusListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.util.EnumSet; import java.util.ResourceBundle; import javax.swing.BorderFactory; @@ -137,8 +138,8 @@ add(Box.createVerticalStrut(5)); { tweenStyleLabel = new JLabel(rb.getString(PatchAnimBundle.TWEENSTYLE)); - tweenStyleCB = new JComboBox(new Object[] { TweenStyle.Linear, - TweenStyle.Radial }); + EnumSet<TweenStyle> ts = EnumSet.<TweenStyle>allOf(TweenStyle.class); + tweenStyleCB = new JComboBox(ts.toArray(new TweenStyle[ts.size()])); tweenStyleCB.setToolTipText(rb.getString(PatchAnimBundle.TWEENSTYLE_TT)); outOfBoundsLabel.setLabelFor(tweenStyleCB); JPanel p = Utils.createFormPanel(tweenStyleLabel, tweenStyleCB); Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-25 23:38:58 UTC (rev 259) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-26 00:03:08 UTC (rev 260) @@ -66,7 +66,11 @@ patchanim.tweenstyle = Tween Style patchanim.tooltip.tweenstyle = The algorithm used to transition from one patch to another patchanim.tweenstyle.linear = Linear -patchanim.tweenstyle.radial = Radial +patchanim.tweenstyle.accelerating = Accelerating +patchanim.tweenstyle.decelerating = Decelerating +patchanim.tweenstyle.easeineaseout = Ease In/Ease Out +patchanim.tweenstyle.accelerateinaccelerateout = Accelerate In/Accelerate Out +patchanim.tweenstyle.wave = Wave patchanim.test = Test patchanim.tooltip.test = Test the animation using the export settings patchanim.stop = Stop Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-25 23:38:58 UTC (rev 259) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-26 00:03:08 UTC (rev 260) @@ -84,38 +84,15 @@ public static PatchCoords tween(PatchCoords startCoords, PatchCoords endCoords, TweenStyle tweenStyle, double frac) { PatchCoords tweenCoords = new PatchCoords(startCoords.getOrder()); - switch (tweenStyle) { - case Linear: - for (int x = 0; x < tweenCoords.order; x++) { - for (int y = 0; y < tweenCoords.order; y++) { - Coordinate startC = startCoords.getCoordinate(x,y); - Coordinate endC = endCoords.getCoordinate(x,y); - double startX = startC.getX(); - double startY = startC.getY(); - double startColor = startC.getColor(); - double tweenX = (startX + (endC.getX() - startX) * frac); - double tweenY = (startY + (endC.getY() - startY) * frac); - int tweenColor = (int)(startColor + (endC.getColor() - startColor) * frac); - Coordinate tweenC = new Coordinate(tweenX, tweenY, tweenColor); - tweenCoords.setCoordinate(x, y, tweenC); - } - } - break; - - case Radial: - /* this is completely bogus right now, just to fool 'em, till we fix stuff elsewhere */ - for (int x = 0; x < tweenCoords.order; x++) { - for (int y = 0; y < tweenCoords.order; y++) { - Coordinate startC = startCoords.getCoordinate(x,y); - Coordinate endC = endCoords.getCoordinate(x,y); - double[] startVector = new double[] { startC.getX(), startC.getY(), startC.getColor() }; - double[] endVector = new double[] { endC.getX(), endC.getY(), endC.getColor() }; - double ran = Math.random(); - Coordinate tweenC = new Coordinate(startVector[0], endVector[1], startVector[2] * ran + endVector[2] * (1 - ran)); - tweenCoords.setCoordinate(x, y, tweenC); - } - } - break; + for (int x = 0; x < tweenCoords.order; x++) { + for (int y = 0; y < tweenCoords.order; y++) { + Coordinate startC = startCoords.getCoordinate(x,y); + Coordinate endC = endCoords.getCoordinate(x,y); + double startColor = startC.getColor(); + int tweenColor = (int)(startColor + (endC.getColor() - startColor) * tweenStyle.transform(frac)); + Coordinate tweenC = new Coordinate(startC.getX(), startC.getY(), tweenColor); + tweenCoords.setCoordinate(x, y, tweenC); + } } return tweenCoords; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-25 23:39:07
|
Revision: 259 http://patchanim.svn.sourceforge.net/patchanim/?rev=259&view=rev Author: dbrosius Date: 2008-12-25 23:38:58 +0000 (Thu, 25 Dec 2008) Log Message: ----------- bummer, radial ain't gonna work, so there's no point in moving ctrl points in x,y Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-25 20:20:43 UTC (rev 258) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-25 23:38:58 UTC (rev 259) @@ -28,7 +28,6 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; import java.awt.image.BufferedImage; import java.util.ResourceBundle; @@ -122,17 +121,17 @@ } }); - addMouseMotionListener(new MouseMotionAdapter() { - @Override - public void mouseDragged(MouseEvent me) { - if ((decorator != null) && dragging) - if (decorator.drag(me.getPoint(), JPatchSamplePanel.this.getBounds())) { - PatchPanelMediator mediator = PatchPanelMediator.getMediator(); - CombinedPatch currentPatch = mediator.getActivePatch(); - recalcImage(color, currentPatch); - } - } - }); +// addMouseMotionListener(new MouseMotionAdapter() { +// @Override +// public void mouseDragged(MouseEvent me) { +// if ((decorator != null) && dragging) +// if (decorator.drag(me.getPoint(), JPatchSamplePanel.this.getBounds())) { +// PatchPanelMediator mediator = PatchPanelMediator.getMediator(); +// CombinedPatch currentPatch = mediator.getActivePatch(); +// recalcImage(color, currentPatch); +// } +// } +// }); PatchPanelMediator mediator = PatchPanelMediator.getMediator(); mediator.addActivePatchChangedListener(new ActivePatchChangedListener() { @@ -386,17 +385,6 @@ menu.add(copy); - JMenuItem resetGrid = new JMenuItem(rb.getString(PatchAnimBundle.RESETGRID)); - resetGrid.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - PatchPanelMediator mediator = PatchPanelMediator.getMediator(); - PatchCoords coords = mediator.getActivePatch().getPatch(color); - coords.resetSpatialCoordinates(); - redraw(); - } - }); - menu.add(resetGrid); - menu.show(JPatchSamplePanel.this, me.getX(), me.getY()); } Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2008-12-25 20:20:43 UTC (rev 258) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2008-12-25 23:38:58 UTC (rev 259) @@ -106,7 +106,6 @@ public static final String REDPATCH = "patchanim.redpatch"; public static final String GREENPATCH = "patchanim.greenpatch"; public static final String BLUEPATCH = "patchanim.bluepatch"; - public static final String RESETGRID = "patchanim.resetgrid"; public static final String ASKSAVE = "patchanim.asksave"; public static final String LOADFAILED = "patchanim.err.loadfailed"; public static final String SAVEFAILED = "patchanim.err.savefailed"; Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-25 20:20:43 UTC (rev 258) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-25 23:38:58 UTC (rev 259) @@ -101,7 +101,6 @@ patchanim.redpatch = Red Patch patchanim.greenpatch = Green Patch patchanim.bluepatch = Blue Patch -patchanim.resetgrid = Reset Grid patchanim.asksave = Do you want to save your changes? patchanim.err.savefailed = Failed saving Patch Animation File patchanim.err.loadfailed = Failed loading Patch Animation File This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-25 20:20:46
|
Revision: 258 http://patchanim.svn.sourceforge.net/patchanim/?rev=258&view=rev Author: dbrosius Date: 2008-12-25 20:20:43 +0000 (Thu, 25 Dec 2008) Log Message: ----------- do linear tweening right Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-25 18:52:27 UTC (rev 257) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-25 20:20:43 UTC (rev 258) @@ -86,14 +86,17 @@ PatchCoords tweenCoords = new PatchCoords(startCoords.getOrder()); switch (tweenStyle) { case Linear: - /* this only works if the lattice is fixed */ for (int x = 0; x < tweenCoords.order; x++) { for (int y = 0; y < tweenCoords.order; y++) { Coordinate startC = startCoords.getCoordinate(x,y); Coordinate endC = endCoords.getCoordinate(x,y); + double startX = startC.getX(); + double startY = startC.getY(); double startColor = startC.getColor(); + double tweenX = (startX + (endC.getX() - startX) * frac); + double tweenY = (startY + (endC.getY() - startY) * frac); int tweenColor = (int)(startColor + (endC.getColor() - startColor) * frac); - Coordinate tweenC = new Coordinate(startC.getX(), endC.getY(), tweenColor); + Coordinate tweenC = new Coordinate(tweenX, tweenY, tweenColor); tweenCoords.setCoordinate(x, y, tweenC); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-25 18:52:31
|
Revision: 257 http://patchanim.svn.sourceforge.net/patchanim/?rev=257&view=rev Author: dbrosius Date: 2008-12-25 18:52:27 +0000 (Thu, 25 Dec 2008) Log Message: ----------- add reset grid menu item Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2008-12-25 18:40:04 UTC (rev 256) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2008-12-25 18:52:27 UTC (rev 257) @@ -196,7 +196,7 @@ if ((xDeltaSq + yDeltaSq) > MINDRAGDISTANCESQ) { c.setX(inputX); - c.sety(inputY); + c.setY(inputY); return true; } Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-25 18:40:04 UTC (rev 256) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java 2008-12-25 18:52:27 UTC (rev 257) @@ -61,13 +61,13 @@ private static final long serialVersionUID = 8057501623261814175L; private static final int SAMPLE_SIZE = 200; - private PatchColor color; + private final PatchColor color; private Color rgb; private OutOfBoundsColor oob; private transient BufferedImage image; private PatchDecorator decorator; private transient Thread redrawThread = null; - private Object redrawLock = new Object(); + private final Object redrawLock = new Object(); private boolean redrawing = false; private boolean dragging = false; @@ -385,6 +385,18 @@ } menu.add(copy); + + JMenuItem resetGrid = new JMenuItem(rb.getString(PatchAnimBundle.RESETGRID)); + resetGrid.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + PatchPanelMediator mediator = PatchPanelMediator.getMediator(); + PatchCoords coords = mediator.getActivePatch().getPatch(color); + coords.resetSpatialCoordinates(); + redraw(); + } + }); + menu.add(resetGrid); + menu.show(JPatchSamplePanel.this, me.getX(), me.getY()); } @@ -500,11 +512,11 @@ Coordinate c = coords.getCoordinate(i, j); switch (direction) { case Outward: - color = (double)(int)((255.0 * Math.abs(i - midOrder) * Math.abs(j - midOrder)) / midOrderSq); + color = (int)((255.0 * Math.abs(i - midOrder) * Math.abs(j - midOrder)) / midOrderSq); break; case Inward: - color = (double)(int)(255.0 - (255.0 * (Math.abs(i - midOrder) * Math.abs(j - midOrder))) / midOrderSq); + color = (int)(255.0 - (255.0 * (Math.abs(i - midOrder) * Math.abs(j - midOrder))) / midOrderSq); break; } Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2008-12-25 18:40:04 UTC (rev 256) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java 2008-12-25 18:52:27 UTC (rev 257) @@ -106,6 +106,7 @@ public static final String REDPATCH = "patchanim.redpatch"; public static final String GREENPATCH = "patchanim.greenpatch"; public static final String BLUEPATCH = "patchanim.bluepatch"; + public static final String RESETGRID = "patchanim.resetgrid"; public static final String ASKSAVE = "patchanim.asksave"; public static final String LOADFAILED = "patchanim.err.loadfailed"; public static final String SAVEFAILED = "patchanim.err.savefailed"; Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-25 18:40:04 UTC (rev 256) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties 2008-12-25 18:52:27 UTC (rev 257) @@ -101,6 +101,7 @@ patchanim.redpatch = Red Patch patchanim.greenpatch = Green Patch patchanim.bluepatch = Blue Patch +patchanim.resetgrid = Reset Grid patchanim.asksave = Do you want to save your changes? patchanim.err.savefailed = Failed saving Patch Animation File patchanim.err.loadfailed = Failed loading Patch Animation File Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java 2008-12-25 18:40:04 UTC (rev 256) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java 2008-12-25 18:52:27 UTC (rev 257) @@ -53,7 +53,7 @@ return y; } - public void sety(double yPos) { + public void setY(double yPos) { y = yPos; } Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-25 18:40:04 UTC (rev 256) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java 2008-12-25 18:52:27 UTC (rev 257) @@ -125,7 +125,17 @@ public void setCoordinate(int i, int j, Coordinate coordinate) { coords[i][j] = coordinate; } + + public void resetSpatialCoordinates() { + for (int u = 0; u < order; u++) { + for (int v = 0; v < order; v++) { + coords[u][v].setX((u * 100.0) / (order - 1)); + coords[u][v].setY((v * 100.0) / (order - 1)); + } + } + } + @Override public String toString() { return Arrays.toString(coords); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dbr...@us...> - 2008-12-25 18:40:06
|
Revision: 256 http://patchanim.svn.sourceforge.net/patchanim/?rev=256&view=rev Author: dbrosius Date: 2008-12-25 18:40:04 +0000 (Thu, 25 Dec 2008) Log Message: ----------- reenable control point movement, as i see that the tween algorithm was flawed for x,y Modified Paths: -------------- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java =================================================================== --- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2008-12-25 18:35:51 UTC (rev 255) +++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java 2008-12-25 18:40:04 UTC (rev 256) @@ -46,14 +46,14 @@ private static final long serialVersionUID = -2524694507912574529L; private static final double MINCLICKDISTANCESQ = 12.0; - //private static final double MINDRAGDISTANCESQ = 3.0; + private static final double MINDRAGDISTANCESQ = 3.0; private PatchCoords coords; - private PatchColor color; + private final PatchColor color; private JPatchSamplePanel sample; private JLabel colorLabel; private JTextField colorField; - private transient ValueDocumentListener docListener = new ValueDocumentListener(); + private transient final ValueDocumentListener docListener = new ValueDocumentListener(); private int selectedXPt; private int selectedYPt; @@ -180,8 +180,6 @@ } public boolean drag(Point p, Rectangle bounds) { - return false; -/* double inputX = ((p.x - bounds.x) * 100.0) / bounds.width; double inputY = ((p.y - bounds.y) * 100.0) / bounds.height; inputX = Math.min(100.0, Math.max(inputX, 0.0)); @@ -203,7 +201,6 @@ } return false; -*/ } private boolean setSelectedControlPt(Point p, Rectangle bounds) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |