Improve UI #13

Merged
shaunrd0 merged 28 commits from ui into master 2023-03-12 02:02:28 +00:00
6 changed files with 15 additions and 15 deletions
Showing only changes of commit 4bc0ae22c6 - Show all commits

View File

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

View File

@ -31,7 +31,6 @@ namespace Qtk {
~ToolBox(); ~ToolBox();
private: private:
/************************************************************************* /*************************************************************************
* Private Members * Private Members
************************************************************************/ ************************************************************************/

View File

@ -19,7 +19,7 @@ using namespace Qtk;
* Static Helper Structs * Static Helper Structs
******************************************************************************/ ******************************************************************************/
/** /**
* Struct to hold key input state. When a key is pressed we construct this and * 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). * store it within a KeyContainer (or ButtonContainer for mouse buttons).
* *

View File

@ -97,7 +97,8 @@ namespace Qtk {
* @param location The uniform location * @param location The uniform location
* @param value The value to assign to the uniform * @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) { for(auto & mesh : mMeshes) {
mesh.mProgram->bind(); mesh.mProgram->bind();
mesh.mProgram->setUniformValue(location, value); mesh.mProgram->setUniformValue(location, value);

View File

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