Commit [r1037] Maximize Restore History

- remove animation code and revert to old colorcycle, because animation makes the game VERY slow on mobile platforms

- use Sint8, Uint8, Sint16 and Uint16 for file-format, fixing problems of endian and making data files smaller

protoman 2014-05-17

1 2 3 > >> (Page 1 of 3)
added /v2/class_colorcycle.h
added /v2/editor/mainwindow_tab/colorcycle.h
added /v2/class_colorcycle.cpp
added /v2/editor/mainwindow_tab/colorcycle_map_preview.cpp
added /v2/editor/mainwindow_tab/colorcycle.cpp
removed /v2/ports/ps2/BAK_cdvd.irx
removed /v2/build/data/images/map_backgrounds/cloud_sky.png
removed /v2/editor/animationpreview.h
changed /v2/build/data/images/sprites/p1.png
changed /v2/build/data/images/sprites/p2.png
changed /v2/editor/mediator.cpp
changed /v2/Makefile
changed /v2/build/data/stages_v3.dat
changed /v2/editor/mainwindow.cpp
changed /v2/stage.cpp
changed /v2/graphic/draw.cpp
changed /v2/character/classplayer.cpp
changed /v2/build/data/game_v3.dat
changed /v2/editor/common.h
changed /v2/scenes/ending.cpp
changed /v2/editor/mainwindow_tab/map_tab.ui
changed /v2/editor/mainwindow_tab/player_edit.cpp
changed /v2/editor/mainwindow_tab/map_tab.cpp
copied /v2/editor/mainwindow_tab/animation.h -> /v2/editor/mainwindow_tab/colorcycle_map_preview.h
/v2/class_colorcycle.h Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow_tab/colorcycle.h Diff Switch to side-by-side view
Loading...
/v2/class_colorcycle.cpp Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow_tab/colorcycle_map_preview.cpp Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow_tab/colorcycle.cpp Diff Switch to side-by-side view
Loading...
/v2/ports/ps2/BAK_cdvd.irx
File was removed.
/v2/editor/animationpreview.h
File was removed.
/v2/build/data/images/sprites/p1.png Diff Switch to side-by-side view
Loading...
/v2/build/data/images/sprites/p2.png Diff Switch to side-by-side view
Loading...
/v2/editor/mediator.cpp Diff Switch to side-by-side view
Loading...
/v2/Makefile Diff Switch to side-by-side view
Loading...
/v2/build/data/stages_v3.dat Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow.cpp Diff Switch to side-by-side view
Loading...
/v2/stage.cpp Diff Switch to side-by-side view
Loading...
/v2/graphic/draw.cpp Diff Switch to side-by-side view
Loading...
/v2/character/classplayer.cpp Diff Switch to side-by-side view
Loading...
/v2/build/data/game_v3.dat Diff Switch to side-by-side view
Loading...
/v2/editor/common.h Diff Switch to side-by-side view
Loading...
/v2/scenes/ending.cpp Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow_tab/map_tab.ui Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow_tab/player_edit.cpp Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow_tab/map_tab.cpp Diff Switch to side-by-side view
Loading...
/v2/editor/mainwindow_tab/animation.h to /v2/editor/mainwindow_tab/colorcycle_map_preview.h
--- a/v2/editor/mainwindow_tab/animation.h
+++ b/v2/editor/mainwindow_tab/colorcycle_map_preview.h
@@ -1,43 +1,52 @@
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef COLORCYCLE_MAP_PREVIEW_H
+#define COLORCYCLE_MAP_PREVIEW_H
 
 #include <QWidget>
+#include "mediator.h"
 
-namespace Ui {
-class animation;
-}
+#ifndef EDITORTILEPALLETE
+	#include "editortilepallete.h"
+#endif
 
-class animation : public QWidget
+#ifndef FILE_GAME
+	#include "../file/format.h"
+#endif
+
+class colorcycle_map_preview : public QWidget
 {
-    Q_OBJECT
-    
+	Q_OBJECT
 public:
-    explicit animation(QWidget *parent = 0);
-    ~animation();
-    void reload();
+	explicit colorcycle_map_preview(QWidget *parent = 0);
+
 
 private:
-    void load_data();
+	int get_colorn_from_rgb(QImage &image, int r, int g, int b);
+    bool color1_next(unsigned int now_time);
+    bool color2_next(unsigned int now_time);
+    bool color3_next(unsigned int now_time);
+    void apply_colorcycle(QImage&image);
 
-public slots:
-    void frame_changed();
-
-private slots:
-    void on_filename_currentIndexChanged(const QString &arg1);
-
-    void on_animation_select_currentIndexChanged(int index);
-
-    void on_width_valueChanged(int arg1);
-
-    void on_heigth_valueChanged(int arg1);
-
-    void on_frameDelay_valueChanged(int arg1);
-
-    void on_name_textChanged(const QString &arg1);
 
 private:
-    Ui::animation *ui;
-    bool _data_loading;
+    QWidget *myParent;
+    int _current_color1;
+    int _current_color2;
+    int _current_color3;
+    QTimer *_timer;
+    short _zoom;
+    unsigned int _timer1;
+    unsigned int _timer2;
+    unsigned int _timer3;
+
+
+protected:
+	void paintEvent(QPaintEvent *);
+
+signals:
+	
+public slots:
+    void timer_check();
+
 };
 
-#endif // ANIMATION_H
+#endif // COLORCYCLE_MAP_PREVIEW_H
1 2 3 > >> (Page 1 of 3)