Revision dd00d051
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/automator/ObjectAutomator.java | ||
---|---|---|
23 | 23 |
|
24 | 24 |
import android.app.Activity; |
25 | 25 |
|
26 |
import org.distorted.library.main.DistortedFramebuffer; |
|
26 | 27 |
import org.distorted.library.main.DistortedNode; |
27 |
import org.distorted.library.main.DistortedScreen; |
|
28 | 28 |
import org.distorted.library.message.EffectListener; |
29 | 29 |
import org.distorted.library.type.Static4D; |
30 | 30 |
|
... | ... | |
48 | 48 |
|
49 | 49 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
50 | 50 |
|
51 |
DistortedScreen getScreen()
|
|
51 |
DistortedFramebuffer getFramebuffer()
|
|
52 | 52 |
{ |
53 | 53 |
ObjectLibInterface inter = mObjectControl.getInterface(); |
54 |
return inter.getScreen();
|
|
54 |
return inter.getFramebuffer();
|
|
55 | 55 |
} |
56 | 56 |
|
57 | 57 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
79 | 79 |
|
80 | 80 |
private void addWholeObjects() |
81 | 81 |
{ |
82 |
DistortedScreen screen = getScreen();
|
|
82 |
DistortedFramebuffer frame = getFramebuffer();
|
|
83 | 83 |
DistortedNode[] nodes = mWhole.getNodes(); |
84 | 84 |
|
85 |
if( screen!=null && nodes!=null )
|
|
85 |
if( frame!=null && nodes!=null )
|
|
86 | 86 |
{ |
87 |
for (DistortedNode node : nodes) screen.attach(node);
|
|
87 |
for (DistortedNode node : nodes) frame.attach(node);
|
|
88 | 88 |
} |
89 | 89 |
} |
90 | 90 |
|
... | ... | |
92 | 92 |
|
93 | 93 |
private void removeWholeObjects() |
94 | 94 |
{ |
95 |
DistortedScreen screen = getScreen();
|
|
95 |
DistortedFramebuffer frame = getFramebuffer();
|
|
96 | 96 |
DistortedNode[] nodes = mWhole.returnNodes(); |
97 | 97 |
|
98 |
if( screen!=null && nodes!=null )
|
|
98 |
if( frame!=null && nodes!=null )
|
|
99 | 99 |
{ |
100 |
for (DistortedNode node : nodes) screen.detach(node);
|
|
100 |
for (DistortedNode node : nodes) frame.detach(node);
|
|
101 | 101 |
} |
102 | 102 |
} |
103 | 103 |
|
... | ... | |
105 | 105 |
|
106 | 106 |
private void addRotateObjects() |
107 | 107 |
{ |
108 |
DistortedScreen screen = getScreen();
|
|
108 |
DistortedFramebuffer frame = getFramebuffer();
|
|
109 | 109 |
DistortedNode[] screenNodes = mRotate.getScreenNodes(); |
110 | 110 |
|
111 |
if( screen!=null && screenNodes!=null )
|
|
111 |
if( frame!=null && screenNodes!=null )
|
|
112 | 112 |
{ |
113 |
for (DistortedNode node : screenNodes) screen.attach(node);
|
|
113 |
for (DistortedNode node : screenNodes) frame.attach(node);
|
|
114 | 114 |
} |
115 | 115 |
|
116 | 116 |
DistortedNode object = mObjectControl.getObject(); |
... | ... | |
126 | 126 |
|
127 | 127 |
private void removeRotateObjects() |
128 | 128 |
{ |
129 |
DistortedScreen screen = getScreen();
|
|
129 |
DistortedFramebuffer frame = getFramebuffer();
|
|
130 | 130 |
DistortedNode[] screenNodes = mRotate.returnScreenNodes(); |
131 | 131 |
|
132 |
if( screen!=null && screenNodes!=null )
|
|
132 |
if( frame!=null && screenNodes!=null )
|
|
133 | 133 |
{ |
134 |
for (DistortedNode node : screenNodes) screen.detach(node);
|
|
134 |
for (DistortedNode node : screenNodes) frame.detach(node);
|
|
135 | 135 |
} |
136 | 136 |
|
137 | 137 |
DistortedNode object = mObjectControl.getObject(); |
Also available in: Unified diff
Relax objectlib's requirements: it can be displayed not only on top of a DistortedScreen, but any DistortedFramebuffer.