This commit is contained in:
Shaun Reed 2023-01-02 22:19:38 -05:00
parent faa9fe28f7
commit 4bc0ae22c6
6 changed files with 15 additions and 15 deletions

View File

@ -23,8 +23,7 @@ using namespace Qtk;
* Constructors, Destructors
******************************************************************************/
QtkWidget::QtkWidget(QWidget * parent) :
QtkWidget(parent, "QtkWidget") {}
QtkWidget::QtkWidget(QWidget * parent) : QtkWidget(parent, "QtkWidget") {}
QtkWidget::QtkWidget(QWidget * parent, const QString & name) :
QtkWidget(parent, name, Q_NULLPTR) {}
@ -246,7 +245,8 @@ void QtkWidget::messageLogged(const QOpenGLDebugMessage & msg) {
* Private Methods
******************************************************************************/
void QtkWidget::teardownGL() { /* Nothing to teardown yet... */ }
void QtkWidget::teardownGL() { /* Nothing to teardown yet... */
}
void QtkWidget::updateCameraInput() {
Input::update();

View File

@ -23,15 +23,14 @@ namespace Qtk {
public:
/*************************************************************************
* Contructors / Destructors
*************************************************************************/
* Contructors / Destructors
*************************************************************************/
explicit ToolBox(QWidget * parent = nullptr);
~ToolBox();
private:
/*************************************************************************
* Private Members
************************************************************************/

View File

@ -12,7 +12,7 @@
ExampleWidget::ExampleWidget(QWidget * parent) :
QOpenGLWidget(parent), mScene(new ExampleScene) {
QSurfaceFormat format;
QSurfaceFormat format;
format.setRenderableType(QSurfaceFormat::OpenGL);
format.setProfile(QSurfaceFormat::CoreProfile);
format.setVersion(4, 6);

View File

@ -19,12 +19,12 @@ using namespace Qtk;
* Static Helper Structs
******************************************************************************/
/**
* Struct to hold key input state. When a key is pressed we construct this and
* store it within a KeyContainer (or ButtonContainer for mouse buttons).
*
* @tparam T Qt::Key or Qt::MouseButton input type for this instance.
*/
/**
* Struct to hold key input state. When a key is pressed we construct this and
* store it within a KeyContainer (or ButtonContainer for mouse buttons).
*
* @tparam T Qt::Key or Qt::MouseButton input type for this instance.
*/
template <typename T> struct InputInstance : std::pair<T, Input::InputState> {
typedef std::pair<T, Input::InputState> base_class;

View File

@ -97,7 +97,8 @@ namespace Qtk {
* @param location The uniform location
* @param value The value to assign to the uniform
*/
template <typename T> inline void setUniform(const char * location, T value) {
template <typename T>
inline void setUniform(const char * location, T value) {
for(auto & mesh : mMeshes) {
mesh.mProgram->bind();
mesh.mProgram->setUniformValue(location, value);

View File

@ -6,8 +6,8 @@
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
##############################################################################*/
#include "scene.h"
#include "modelmesh.h"
#include "scene.h"
using namespace Qtk;