mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-22 23:15:14 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Luis Ángel San Martín
2014-12-02 14:48:36 +01:00
parent 6f9af74151
commit 9ee4bef957
4 changed files with 166 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
common/yacreader_flow_gl.h
View File

@ -7,9 +7,10 @@
#include <string.h>
#include <math.h>
#include <QtOpenGL>
#include <QGLWidget>
#include <QMutex>
#include <QOpenGLWidget>
#include <QOpenGLFunctions>
#include <QOpenGLTexture>
#include <QtWidgets>
#include "pictureflow.h" //TODO mover los tipos de flow de sitio
@ -27,16 +28,16 @@ enum Performance
};
//Cover Vector
struct RVect{
struct YACReader3DVector{
float x;
float y;
float z;
float rot;
};
//the cover info struct
struct CFImage{
GLuint img;
//the image/texture info struct
struct YACReader3DImage{
QOpenGLTexture * texture;
//char name[256];
float width;
@ -44,8 +45,8 @@ struct CFImage{
int index;
RVect current;
RVect animEnd;
YACReader3DVector current;
YACReader3DVector animEnd;
};
struct Preset{
@ -103,22 +104,22 @@ extern struct Preset presetYACReaderFlowOverlappedStripeConfig;
extern struct Preset pressetYACReaderFlowUpConfig;
extern struct Preset pressetYACReaderFlowDownConfig;
class YACReaderFlowGL : public QGLWidget
class YACReaderFlowGL : public QOpenGLWidget
{
Q_OBJECT
protected:
int timerId;
/*** System variables ***/
CFImage dummy;
YACReader3DImage dummy;
int viewRotateActive;
float stepBackup;
/*functions*/
void calcPos(CFImage *CF,int pos);
void calcRV(RVect *RV,int pos);
void calcPos(YACReader3DImage & image, int pos);
void calcVector(YACReader3DVector & vector, int pos);
//returns true if the animation is finished for Current
bool animate(RVect *Current,RVect to);
void drawCover(CFImage *CF);
bool animate(YACReader3DVector &currentVector, YACReader3DVector &toVector);
void drawCover(const YACReader3DImage & image);
void udpatePerspective(int width, int height);
@ -126,9 +127,9 @@ protected:
WidgetLoader * loader;
int fontSize;
GLuint defaultTexture;
GLuint markTexture;
GLuint readingTexture;
QOpenGLTexture * defaultTexture;
QOpenGLTexture * markTexture;
QOpenGLTexture * readingTexture;
void initializeGL();
void paintGL();
void timerEvent(QTimerEvent *);
@ -140,7 +141,9 @@ protected:
QVector<bool> loaded;
QVector<YACReaderComicReadStatus> marks;
QList<QString> paths;
CFImage * cfImages;
QVector<YACReader3DImage> images;
bool hasBeenInitialized;
Performance performance;
@ -153,7 +156,7 @@ protected:
int currentSelected;
//defines the position of the centered cover
RVect centerPos;
YACReader3DVector centerPos;
/*** Style ***/
//sets the amount of shading of the covers in the back (0-1)
@ -201,17 +204,17 @@ public:
//inserts a new item to the coverflow
//if item is set to a value > -1 it updates a already set value
//otherwise a new entry is set
void insert(char *name, GLuint Tex, float x, float y,int item = -1);
void insert(char *name, QOpenGLTexture * texture, float x, float y, int item = -1);
//removes a item
virtual void remove(int item);
//replaces the texture of the item 'item' with Tex
void replace(char *name, GLuint Tex, float x, float y,int item);
void replace(char *name, QOpenGLTexture * texture, float x, float y, int item);
//create n covers with the default nu
void populate(int n);
/*Info*/
//retuns the CFImage Struct of the current selected item
//retuns the YACReader3DImage Struct of the current selected item
//to read title or textures
CFImage getCurrentSelected();
YACReader3DImage getCurrentSelected();
public slots:
void setCF_RX(int value);
@ -282,17 +285,6 @@ signals:
void selected(unsigned int);
};
//class WidgetLoader : public QGLWidget
//{
// Q_OBJECT
//public:
// WidgetLoader(QWidget *parent, QGLWidget * shared);
// YACReaderFlowGL * flow;
//public slots:
// void loadTexture(int index);
//
//};
class YACReaderComicFlowGL : public YACReaderFlowGL
{
public:
@ -329,8 +321,8 @@ public:
// returns FALSE if worker is still busy and can't take the task
bool busy() const;
void generate(int index, const QString& fileName);
void reset(){idx = -1;fileName="";};
int index() const { return idx; };
void reset(){idx = -1;fileName="";}
int index() const { return idx; }
void lock();
void unlock();
QImage result();
@ -362,8 +354,8 @@ public:
// returns FALSE if worker is still busy and can't take the task
bool busy() const;
void generate(int index, const QByteArray& raw);
void reset(){idx = -1; rawData.clear();};
int index() const { return idx; };
void reset(){idx = -1; rawData.clear();}
int index() const { return idx; }
QImage result();
YACReaderFlowGL * flow;
GLuint resultTexture;
@ -385,18 +377,4 @@ private:
QImage img;
};
//class TextureLoader : public QThread
//{
//public:
// TextureLoader();
// ~TextureLoader();
// // returns FALSE if worker is still busy and can't take the task
//
// YACReaderFlow * flow;
// ImageLoader * worker;
//protected:
// void run();
//
//};
#endif