Project

General

Profile

« Previous | Next » 

Revision 7ba38dd4

Added by Leszek Koltunski over 2 years ago

Major change: separate the notion of a TwistyObject and its Node. Now,

1) the Node stays when we change objects (this makes transitions faster)
2) it's possible to just create an Object without adding it to the Screen (now app needs to explicitly create the Node and add it to its Screen itself)

View differences:

src/main/java/org/distorted/objectlib/automator/ObjectAutomator.java
50 50

  
51 51
  DistortedFramebuffer getFramebuffer()
52 52
    {
53
    ObjectLibInterface inter = mObjectControl.getInterface();
54
    return inter.getFramebuffer();
53
    return mObjectControl.getNode().getFramebuffer();
55 54
    }
56 55

  
57 56
///////////////////////////////////////////////////////////////////////////////////////////////////
......
113 112
      for (DistortedNode node : screenNodes) frame.attach(node);
114 113
      }
115 114

  
116
    DistortedNode object = mObjectControl.getObject();
115
    DistortedNode object = mObjectControl.getObject().getNode();
117 116
    DistortedNode[] objectNodes = mRotate.getObjectNodes();
118 117

  
119 118
    if( object!=null && objectNodes!=null )
......
134 133
      for (DistortedNode node : screenNodes) frame.detach(node);
135 134
      }
136 135

  
137
    DistortedNode object = mObjectControl.getObject();
136
    DistortedNode object = mObjectControl.getObject().getNode();
138 137
    DistortedNode[] objectNodes = mRotate.returnObjectNodes();
139 138

  
140 139
    if( object!=null && objectNodes!=null )

Also available in: Unified diff