Author: kono
Date: 2009-06-26 17:10:37 -0700 (Fri, 26 Jun 2009)
New Revision: 17138
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
Removed:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Abstract3DObjectShape.java
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PNodeView.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
Log:
Some simple object had been added.
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/AnnotationObject.java
2009-06-27 00:10:37 UTC (rev 17138)
@@ -0,0 +1,5 @@
+package org.cytoscape.view.presentation.processing;
+
+public interface AnnotationObject extends ObjectShape {
+
+}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
2009-06-27 00:09:41 UTC (rev 17137)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
2009-06-27 00:10:37 UTC (rev 17138)
@@ -17,6 +17,7 @@
/**
* Name of this shape, such as ellipse, rectangle, triangle, etc.
+ * This is immutable.
*
* @return Name of shape as string
*
@@ -25,17 +26,31 @@
public float getX();
public float getY();
+ public float getZ();
public void setX(final float x);
public void setY(final float y);
+ public void setZ(final float z);
+ public void setLocation(float x, float y, float z);
public Color getColor();
public void setColor(Color color);
+ public void setOpacity(float alpha);
+ public float getOpacity();
+
public float getWidth();
public float getHeight();
+ public float getDepth();
public void setWidth(final float width);
public void setHeight(final float height);
+ public void setDepth(final float depth);
+ public void setSize(float w, float h, float d);
+ public void scale(float s);
+ public void rotate(float angle);
+
+
+
}
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
2009-06-27 00:09:41 UTC (rev 17137)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
2009-06-27 00:10:37 UTC (rev 17138)
@@ -1,11 +0,0 @@
-package org.cytoscape.view.presentation.processing;
-
-public interface ObjectShape3D extends ObjectShape {
-
- public float getZ();
- public void setZ(final float z);
-
- public float getDepth();
- public void setDepth(final float depth);
-
-}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PNodeView.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PNodeView.java
2009-06-27 00:09:41 UTC (rev 17137)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PNodeView.java
2009-06-27 00:10:37 UTC (rev 17138)
@@ -1,9 +1,16 @@
package org.cytoscape.view.presentation.processing;
-public interface PNodeView {
+import org.cytoscape.model.CyNode;
+import org.cytoscape.view.model.View;
+
+public interface PNodeView extends ObjectShape {
- public void scale();
+ /**
+ * return the backend view model for this node presentation.
+ * This is immutable.
+ *
+ * @return Node View Model.
+ */
+ public View<CyNode> getViewModel();
- public void rotate();
-
}
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Abstract3DObjectShape.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Abstract3DObjectShape.java
2009-06-27 00:09:41 UTC (rev 17137)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Abstract3DObjectShape.java
2009-06-27 00:10:37 UTC (rev 17138)
@@ -1,11 +0,0 @@
-package org.cytoscape.view.presentation.processing.internal.shape;
-
-public class Abstract3DObjectShape extends AbstractObjectShape {
-
- @Override
- public void draw() {
- // TODO Auto-generated method stub
-
- }
-
-}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
2009-06-27 00:09:41 UTC (rev 17137)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/AbstractObjectShape.java
2009-06-27 00:10:37 UTC (rev 17138)
@@ -5,8 +5,12 @@
import org.cytoscape.view.presentation.processing.ObjectShape;
import org.cytoscape.view.presentation.processing.PickableObject;
+import processing.core.PApplet;
+
public abstract class AbstractObjectShape implements ObjectShape,
PickableObject {
+ protected PApplet p;
+
protected float width;
protected float height;
protected float depth;
@@ -16,8 +20,11 @@
protected boolean picked;
protected Color basicColor;
+
+ public AbstractObjectShape(PApplet parent) {
+ this.p = parent;
+ }
- // This should be implemented in each shape implementation classes.
public abstract void draw();
public Color getColor() {
@@ -25,6 +32,11 @@
return null;
}
+ public float getDepth() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
public String getDisplayName() {
// TODO Auto-generated method stub
return null;
@@ -35,6 +47,11 @@
return 0;
}
+ public float getOpacity() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
public float getWidth() {
// TODO Auto-generated method stub
return 0;
@@ -50,33 +67,77 @@
return 0;
}
+ public float getZ() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public void rotate(float angle) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void scale(float s) {
+ // TODO Auto-generated method stub
+
+ }
+
public void setColor(Color color) {
// TODO Auto-generated method stub
+
+ }
+ public void setDepth(float depth) {
+ // TODO Auto-generated method stub
+
}
public void setHeight(float height) {
// TODO Auto-generated method stub
+
+ }
+ public void setLocation(float x, float y, float z) {
+ // TODO Auto-generated method stub
+
}
- public void setWidth(float width) {
+ public void setOpacity(float alpha) {
// TODO Auto-generated method stub
+
+ }
+ public void setSize(float w, float h, float d) {
+ // TODO Auto-generated method stub
+
}
+ public void setWidth(float width) {
+ // TODO Auto-generated method stub
+
+ }
+
public void setX(float x) {
// TODO Auto-generated method stub
-
+
}
public void setY(float y) {
// TODO Auto-generated method stub
+
+ }
+ public void setZ(float z) {
+ // TODO Auto-generated method stub
+
}
-
- public void pick(float x, float y){
+
+ public void pick(float x, float y) {
+ // TODO Auto-generated method stub
}
+
+
+
}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
2009-06-27 00:09:41 UTC (rev 17137)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
2009-06-27 00:10:37 UTC (rev 17138)
@@ -1,11 +1,61 @@
package org.cytoscape.view.presentation.processing.internal.shape;
-public class Cube extends Abstract3DObjectShape {
+import processing.core.PApplet;
+import processing.core.PImage;
+public class Cube extends AbstractObjectShape {
+
+ private final PImage texture;
+
+ public Cube(PApplet parent, PImage texture) {
+ super(parent);
+ this.texture = texture;
+ }
+
@Override
public void draw() {
-
+ p.beginShape(PApplet.QUADS);
+ p.texture(texture);
+
+ // +Z "front" face
+ p.vertex(-1, -1, 1, 0, 0);
+ p.vertex(1, -1, 1, 1, 0);
+ p.vertex(1, 1, 1, 1, 1);
+ p.vertex(-1, 1, 1, 0, 1);
+
+ // -Z "back" face
+ p.vertex(1, -1, -1, 0, 0);
+ p.vertex(-1, -1, -1, 1, 0);
+ p.vertex(-1, 1, -1, 1, 1);
+ p.vertex(1, 1, -1, 0, 1);
+
+ // +Y "bottom" face
+ p.vertex(-1, 1, 1, 0, 0);
+ p.vertex(1, 1, 1, 1, 0);
+ p.vertex(1, 1, -1, 1, 1);
+ p.vertex(-1, 1, -1, 0, 1);
+
+ // -Y "top" face
+ p.vertex(-1, -1, -1, 0, 0);
+ p.vertex(1, -1, -1, 1, 0);
+ p.vertex(1, -1, 1, 1, 1);
+ p.vertex(-1, -1, 1, 0, 1);
+
+ // +X "right" face
+ p.vertex(1, -1, 1, 0, 0);
+ p.vertex(1, -1, -1, 1, 0);
+ p.vertex(1, 1, -1, 1, 1);
+ p.vertex(1, 1, 1, 0, 1);
+
+ // -X "left" face
+ p.vertex(-1, -1, -1, 0, 0);
+ p.vertex(-1, -1, 1, 1, 0);
+ p.vertex(-1, 1, 1, 1, 1);
+ p.vertex(-1, 1, -1, 0, 1);
+
+ p.endShape();
+
}
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
