DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replay Timeline doesn't draw blue Spectator Keyframes connections anymore

Browse Source 
Keyframe Timeline doesn't have the Marker hover texts anymore
This commit is contained in:
CrushedPixel
2015-06-18 12:04:42 +02:00
parent 7f93a119be
commit cd996dcf3b
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java
View File

@@ -116,11 +116,13 @@ public class GuiKeyframeTimeline extends GuiTimeline {
double segmentLength = timelineLength * zoom; double segmentLength = timelineLength * zoom;
//iterate over keyframes to find spectator segments //iterate over keyframes to find spectator segments
if(placeKeyframes) {
ListIterator<Keyframe> iterator = ReplayHandler.getKeyframes().listIterator(); ListIterator<Keyframe> iterator = ReplayHandler.getKeyframes().listIterator();
while(iterator.hasNext()) { while(iterator.hasNext()) {
Keyframe kf = iterator.next(); Keyframe kf = iterator.next();
if(!(kf instanceof PositionKeyframe) || ((PositionKeyframe)kf).getSpectatedEntityID() == null) continue; if(!(kf instanceof PositionKeyframe) || ((PositionKeyframe) kf).getSpectatedEntityID() == null)
continue;
int i = iterator.nextIndex(); int i = iterator.nextIndex();
int nextSpectatorKeyframeRealTime = -1; int nextSpectatorKeyframeRealTime = -1;
@@ -152,12 +154,13 @@ public class GuiKeyframeTimeline extends GuiTimeline {
drawGradientRect(keyframeX + 2, positionY + BORDER_TOP + 1, nextX - 2, positionY + BORDER_TOP + 4, 0xFF0080FF, 0xFF0080FF); drawGradientRect(keyframeX + 2, positionY + BORDER_TOP + 1, nextX - 2, positionY + BORDER_TOP + 4, 0xFF0080FF, 0xFF0080FF);
} }
} }
}
drawTimelineCursor(leftTime, rightTime, bodyWidth); drawTimelineCursor(leftTime, rightTime, bodyWidth);
//Draw Keyframe logos //Draw Keyframe logos
iterator = ReplayHandler.getKeyframes().listIterator(); ListIterator<Keyframe> iterator = ReplayHandler.getKeyframes().listIterator();
while(iterator.hasNext()) { while(iterator.hasNext()) {
Keyframe kf = iterator.next(); Keyframe kf = iterator.next();
@@ -185,7 +188,7 @@ public class GuiKeyframeTimeline extends GuiTimeline {
long leftTime = Math.round(timeStart * timelineLength); long leftTime = Math.round(timeStart * timelineLength);
double segmentLength = timelineLength * zoom; double segmentLength = timelineLength * zoom;
if(markerKeyframes) {
for(MarkerKeyframe marker : ReplayHandler.getMarkers()) { for(MarkerKeyframe marker : ReplayHandler.getMarkers()) {
int keyframeX = getKeyframeX(marker.getRealTimestamp(), leftTime, bodyWidth, segmentLength); int keyframeX = getKeyframeX(marker.getRealTimestamp(), leftTime, bodyWidth, segmentLength);
@@ -196,6 +199,7 @@ public class GuiKeyframeTimeline extends GuiTimeline {
drawn = true; drawn = true;
} }
} }
}
if(!drawn) { if(!drawn) {
super.drawOverlay(mc, mouseX, mouseY); super.drawOverlay(mc, mouseX, mouseY);