Revision 15420

View differences:

import/ext3D/branches/ext3D_v1.1/extAnimationGUI/src/com/iver/ai2/animationgui/gui/MenuAnimation3D.java
13 13
import com.iver.cit.gvsig.animation.AnimationPlayer;
14 14
import com.iver.cit.gvsig.animation.interval.AnimationKeyFrameInterval;
15 15
import com.iver.cit.gvsig.animation.test.AnimationLayer2D;
16
import com.iver.cit.gvsig.animation.test.AnimationTypeFactoryLayer2D;
17
import com.iver.cit.gvsig.animation.test.Interpolator2D;
16 18
import com.iver.cit.gvsig.animation.test.KeyFrame2D;
17 19
import com.iver.cit.gvsig.animation.traks.AnimationTimeTrack;
18 20
import com.iver.cit.gvsig.fmap.MapControl;
......
20 22
import com.iver.cit.gvsig.project.ProjectExtent;
21 23
import com.iver.cit.gvsig.project.ProjectFactory;
22 24
import com.iver.cit.gvsig.project.documents.view.gui.BaseView;
25
import com.iver.cit.gvsig.project.documents.view.gui.View;
23 26
import com.iver.utiles.extensionPoints.ExtensionPoint;
24 27
import com.iver.utiles.extensionPoints.ExtensionPoints;
25 28
import com.iver.utiles.extensionPoints.ExtensionPointsSingleton;
......
55 58

  
56 59
			AnimationContainer ac = project.getAnimationContainer();
57 60
			AnimationPlayer ap = ac.getAnimationPlayer();
61
			ap.setAnimationContainer(ac);
58 62
			AnimationContol3D fp = new AnimationContol3D(ap);
59 63
			PluginServices.getMDIManager().addWindow((IWindow) fp);
60 64
		} else if (actionCommand.equals("ENCUADRECAP")) {// button capture
......
89 93
			for (int i = 0; i < extentsList.length; i++) {
90 94
				ProjectExtent projectExtent = extentsList[i];
91 95
				KeyFrame2D kf2D = new KeyFrame2D();
96
				double fin = AKFinterval.getEndTime();
97
				double ini = AKFinterval.getInitialTime();
98
				double size = extentsList.length;
92 99
				// Calcular el tiempo de insercion
93
				double tiempo = i
94
						* ((AKFinterval.getEndTime() - AKFinterval
95
								.getInitialTime()) / extentsList.length);
100
				double tiempo = 0.0;
101
				if (i != 0)
102
					tiempo = i * ((fin - ini) / (size - 1.0));
103
				// (AKFinterval.getEndTime() - AKFinterval
104
				// .getInitialTime()) / extentsList.length);
96 105
				kf2D.setTime(tiempo);
97 106
				// hacer funcion de insercion o adapter
98
				kf2D.CapturesProperties(projectExtent);
107
				// kf2D.CapturesProperties(projectExtent);
108
				kf2D.setAnimatedObject(projectExtent);
99 109
				keyFrameList.add(kf2D);
100
				
110

  
101 111
			}
102 112
			AKFinterval.setKeyFrameList(keyFrameList);
103
			
113

  
104 114
			System.out.println(ac);
105 115

  
106 116
		} else if (actionCommand.equals("CAPACAP")) {// button capture layer
......
131 141
				e.printStackTrace();
132 142
			}
133 143
			at = (AnimationTimeTrack) ac.CreateTimeTrack(animationLayer2D);
144
			at.setName(name);
145
			com.iver.andami.ui.mdiManager.IWindow f = PluginServices
146
					.getMDIManager().getActiveWindow();
147
			View view = (View) f;
148
			at.setAnimatedObject(view);
149
			Interpolator2D inter2D = new Interpolator2D();
150
			inter2D.setAnimatedObject(view);
151
			animationLayer2D.setInterpolator(inter2D);
152
			at.setAnimationType(animationLayer2D);
153
			animationLayer2D.setAnimatedObject(view);
134 154
		}
135 155
		return at;
136 156

  
......
148 168
				.getExtension(com.iver.cit.gvsig.ProjectExtension.class);
149 169
		ProjectExtension pe = (ProjectExtension) extension;
150 170
		project = pe.getProject();
171

  
172
		// Register types
173
		AnimationTypeFactoryLayer2D.register();
151 174
	}
152 175

  
153 176
	public boolean isEnabled() {

Also available in: Unified diff