mirror of
https://github.com/YACReader/yacreader
synced 2026-03-01 10:22:58 -05:00
More cleaning
This commit is contained in:
@ -23,7 +23,6 @@ YACReaderFlow3D::YACReaderFlow3D(QWidget *parent, struct Preset p)
|
|||||||
hasBeenInitialized(false),
|
hasBeenInitialized(false),
|
||||||
backgroundColor(Qt::black),
|
backgroundColor(Qt::black),
|
||||||
textColor(Qt::white),
|
textColor(Qt::white),
|
||||||
shadingColor(Qt::black),
|
|
||||||
flowRightToLeft(false)
|
flowRightToLeft(false)
|
||||||
{
|
{
|
||||||
updateCount = 0;
|
updateCount = 0;
|
||||||
@ -612,8 +611,6 @@ void YACReaderFlow3D::prepareDrawData(const YACReader3DImageRHI &image, bool isR
|
|||||||
outUniformData.backgroundColor[2] = backgroundColor.blueF();
|
outUniformData.backgroundColor[2] = backgroundColor.blueF();
|
||||||
outUniformData._pad0 = 0.0f;
|
outUniformData._pad0 = 0.0f;
|
||||||
|
|
||||||
// shadingColor removed from uniform buffer; keep CPU-side shadingColor member intact
|
|
||||||
|
|
||||||
outUniformData.reflectionUp = reflectionUp;
|
outUniformData.reflectionUp = reflectionUp;
|
||||||
outUniformData.reflectionDown = reflectionBottom;
|
outUniformData.reflectionDown = reflectionBottom;
|
||||||
outUniformData.isReflection = isReflection ? 1.0f : 0.0f;
|
outUniformData.isReflection = isReflection ? 1.0f : 0.0f;
|
||||||
@ -1176,12 +1173,6 @@ void YACReaderFlow3D::setTextColor(const QColor &color)
|
|||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
void YACReaderFlow3D::setShadingColor(const QColor &color)
|
|
||||||
{
|
|
||||||
shadingColor = color;
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Event handlers
|
// Event handlers
|
||||||
void YACReaderFlow3D::wheelEvent(QWheelEvent *event)
|
void YACReaderFlow3D::wheelEvent(QWheelEvent *event)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -115,11 +115,10 @@ protected:
|
|||||||
float viewProjectionMatrix[16]; // column-major 4x4
|
float viewProjectionMatrix[16]; // column-major 4x4
|
||||||
float backgroundColor[3];
|
float backgroundColor[3];
|
||||||
float _pad0; // pad to vec4
|
float _pad0; // pad to vec4
|
||||||
|
|
||||||
float reflectionUp;
|
float reflectionUp;
|
||||||
float reflectionDown;
|
float reflectionDown;
|
||||||
float isReflection;
|
float isReflection;
|
||||||
float _pad2;
|
float _pad1;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Pending texture uploads (for async image loading)
|
// Pending texture uploads (for async image loading)
|
||||||
@ -215,7 +214,6 @@ protected:
|
|||||||
/*** Theme Colors ***/
|
/*** Theme Colors ***/
|
||||||
QColor backgroundColor;
|
QColor backgroundColor;
|
||||||
QColor textColor;
|
QColor textColor;
|
||||||
QColor shadingColor;
|
|
||||||
|
|
||||||
/*** System info ***/
|
/*** System info ***/
|
||||||
float viewRotate;
|
float viewRotate;
|
||||||
@ -295,7 +293,6 @@ public slots:
|
|||||||
// Theme color setters
|
// Theme color setters
|
||||||
void setBackgroundColor(const QColor &color);
|
void setBackgroundColor(const QColor &color);
|
||||||
void setTextColor(const QColor &color);
|
void setTextColor(const QColor &color);
|
||||||
void setShadingColor(const QColor &color);
|
|
||||||
|
|
||||||
virtual void updateImageData() = 0;
|
virtual void updateImageData() = 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user