CI
This commit is contained in:
		
							parent
							
								
									0ef62ebfa5
								
							
						
					
					
						commit
						4140db7e23
					
				
							
								
								
									
										2
									
								
								.github/workflows/all-builds.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/all-builds.yml
									
									
									
									
										vendored
									
									
								
							@ -31,7 +31,7 @@ jobs:
 | 
				
			|||||||
      - name: Install Qt
 | 
					      - name: Install Qt
 | 
				
			||||||
        uses: jurplel/install-qt-action@v2
 | 
					        uses: jurplel/install-qt-action@v2
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          version: '6.5.0'
 | 
					          version: '6.6.0'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      # Windows
 | 
					      # Windows
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -84,11 +84,6 @@ endif ()
 | 
				
			|||||||
set(QTK_RESOURCES "${CMAKE_SOURCE_DIR}/resources")
 | 
					set(QTK_RESOURCES "${CMAKE_SOURCE_DIR}/resources")
 | 
				
			||||||
set(QTK_OSX_ICONS ${CMAKE_SOURCE_DIR}/resources/icons/osx/kilroy.icns)
 | 
					set(QTK_OSX_ICONS ${CMAKE_SOURCE_DIR}/resources/icons/osx/kilroy.icns)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Print all QTK options and their values at the end of configuration.
 | 
					 | 
				
			||||||
get_cmake_property(VAR_NAMES VARIABLES)
 | 
					 | 
				
			||||||
list(FILTER VAR_NAMES INCLUDE REGEX "^Q[tT][kK]_.*$")
 | 
					 | 
				
			||||||
list(SORT VAR_NAMES)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
################################################################################
 | 
					################################################################################
 | 
				
			||||||
# External Dependencies
 | 
					# External Dependencies
 | 
				
			||||||
################################################################################
 | 
					################################################################################
 | 
				
			||||||
@ -103,9 +98,9 @@ set(
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Print all QTK options and their values.
 | 
					# Print all QTK options and their values at the end of configuration.
 | 
				
			||||||
get_cmake_property(VAR_NAMES VARIABLES)
 | 
					get_cmake_property(VAR_NAMES VARIABLES)
 | 
				
			||||||
list(FILTER VAR_NAMES INCLUDE REGEX "^Q[tT][kK]_.*$")
 | 
					list(FILTER VAR_NAMES INCLUDE REGEX "^[qQ][tT][kK]_.*$")
 | 
				
			||||||
list(SORT VAR_NAMES)
 | 
					list(SORT VAR_NAMES)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
################################################################################
 | 
					################################################################################
 | 
				
			||||||
 | 
				
			|||||||
@ -55,7 +55,7 @@ If the build is configured with all options enabled, we can subsequently install
 | 
				
			|||||||
individual components as needed with cmake.
 | 
					individual components as needed with cmake.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```bash
 | 
					```bash
 | 
				
			||||||
sudo apt update -y && sudo apt install libassimp-dev cmake build-essential git ccache libgl1-mesa-dev libglvnd-dev -y
 | 
					sudo apt update -y && sudo apt install libassimp-dev cmake build-essential git ccache libgl1-mesa-dev libglvnd-dev zlib1g-dev -y
 | 
				
			||||||
git clone https://github.com/shaunrd0/qtk
 | 
					git clone https://github.com/shaunrd0/qtk
 | 
				
			||||||
cd qtk
 | 
					cd qtk
 | 
				
			||||||
# Configure the build with all components enabled
 | 
					# Configure the build with all components enabled
 | 
				
			||||||
 | 
				
			|||||||
@ -23,9 +23,9 @@ void ExampleScene::init() {
 | 
				
			|||||||
  auto skybox = new Qtk::Skybox("Skybox");
 | 
					  auto skybox = new Qtk::Skybox("Skybox");
 | 
				
			||||||
  setSkybox(skybox);
 | 
					  setSkybox(skybox);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  auto spartan = new Model(
 | 
					  std::string spartanPath = QTK_EXAMPLE_SOURCE_DIR;
 | 
				
			||||||
      "spartan", std::string(QTK_EXAMPLE_SOURCE_DIR)
 | 
					  spartanPath += "/../resources/models/spartan/spartan.obj";
 | 
				
			||||||
                     + "/../resources/models/spartan/spartan.obj");
 | 
					  auto spartan = new Model("spartan", spartanPath.c_str());
 | 
				
			||||||
  addObject(spartan);
 | 
					  addObject(spartan);
 | 
				
			||||||
  spartan->getTransform().setTranslation(-4.0f, 0.0f, 0.0f);
 | 
					  spartan->getTransform().setTranslation(-4.0f, 0.0f, 0.0f);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -83,6 +83,6 @@ Qtk::QtkWidget * MainWindow::getQtkWidget(const QString & name) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void MainWindow::refreshScene(QString sceneName) {
 | 
					void MainWindow::refreshScene(QString sceneName) {
 | 
				
			||||||
  // TODO: Select TreeView using sceneName>
 | 
					  // TODO: Select TreeView using sceneName
 | 
				
			||||||
  ui_->qtk__TreeView->updateView(getQtkWidget()->getScene());
 | 
					  ui_->qtk__TreeView->updateView(getQtkWidget()->getScene());
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -84,9 +84,6 @@ void QtkWidget::initializeGL() {
 | 
				
			|||||||
    connect(
 | 
					    connect(
 | 
				
			||||||
        mDebugLogger, SIGNAL(messageLogged(QOpenGLDebugMessage)), this,
 | 
					        mDebugLogger, SIGNAL(messageLogged(QOpenGLDebugMessage)), this,
 | 
				
			||||||
        SLOT(messageLogged(QOpenGLDebugMessage)));
 | 
					        SLOT(messageLogged(QOpenGLDebugMessage)));
 | 
				
			||||||
    //    connect(
 | 
					 | 
				
			||||||
    //        mDebugLogger, SIGNAL(messageLogged(QOpenGLDebugMessage)),
 | 
					 | 
				
			||||||
    //        mConsole, SLOT(sendLog(QOpenGLDebugMessage)));
 | 
					 | 
				
			||||||
    mDebugLogger->startLogging();
 | 
					    mDebugLogger->startLogging();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -22,7 +22,6 @@ ToolBox::ToolBox(QWidget * parent) : QDockWidget(parent), ui(new Ui::ToolBox) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ToolBox::updateFocus(const QString & name) {
 | 
					void ToolBox::updateFocus(const QString & name) {
 | 
				
			||||||
  qDebug() << "Called updateFocus on Toolbox.";
 | 
					 | 
				
			||||||
  auto object =
 | 
					  auto object =
 | 
				
			||||||
      MainWindow::getMainWindow()->getQtkWidget()->getScene()->getObject(name);
 | 
					      MainWindow::getMainWindow()->getQtkWidget()->getScene()->getObject(name);
 | 
				
			||||||
  if(object != Q_NULLPTR) {
 | 
					  if(object != Q_NULLPTR) {
 | 
				
			||||||
 | 
				
			|||||||
@ -12,6 +12,7 @@
 | 
				
			|||||||
#include <QMatrix4x4>
 | 
					#include <QMatrix4x4>
 | 
				
			||||||
#include <QUrl>
 | 
					#include <QUrl>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <unordered_map>
 | 
				
			||||||
#include <queue>
 | 
					#include <queue>
 | 
				
			||||||
#include <utility>
 | 
					#include <utility>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user