some minor refresh
This commit is contained in:
parent
7d17df39b3
commit
d65aba4d68
8 changed files with 278 additions and 768 deletions
7
.vscode/launch.json
vendored
Normal file
7
.vscode/launch.json
vendored
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
// Use IntelliSense to learn about possible attributes.
|
||||||
|
// Hover to view descriptions of existing attributes.
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": []
|
||||||
|
}
|
20
.vscode/settings.json
vendored
20
.vscode/settings.json
vendored
|
@ -1,4 +1,22 @@
|
||||||
{
|
{
|
||||||
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
|
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
|
||||||
"cmake.configureOnOpen": true
|
"cmake.configureOnOpen": true,
|
||||||
|
"files.associations": {
|
||||||
|
"array": "cpp",
|
||||||
|
"cwchar": "cpp",
|
||||||
|
"unordered_map": "cpp",
|
||||||
|
"vector": "cpp",
|
||||||
|
"exception": "cpp",
|
||||||
|
"functional": "cpp",
|
||||||
|
"initializer_list": "cpp",
|
||||||
|
"iosfwd": "cpp",
|
||||||
|
"istream": "cpp",
|
||||||
|
"new": "cpp",
|
||||||
|
"ostream": "cpp",
|
||||||
|
"stdexcept": "cpp",
|
||||||
|
"streambuf": "cpp",
|
||||||
|
"type_traits": "cpp",
|
||||||
|
"tuple": "cpp"
|
||||||
|
},
|
||||||
|
"mesonbuild.configureOnOpen": false
|
||||||
}
|
}
|
28
.vscode/tasks.json
vendored
Normal file
28
.vscode/tasks.json
vendored
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
{
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "cppbuild",
|
||||||
|
"label": "C/C++: g++ build active file",
|
||||||
|
"command": "/usr/bin/g++",
|
||||||
|
"args": [
|
||||||
|
"-fdiagnostics-color=always",
|
||||||
|
"-g",
|
||||||
|
"${file}",
|
||||||
|
"-o",
|
||||||
|
"${fileDirname}/${fileBasenameNoExtension}"
|
||||||
|
],
|
||||||
|
"options": {
|
||||||
|
"cwd": "${fileDirname}"
|
||||||
|
},
|
||||||
|
"problemMatcher": [
|
||||||
|
"$gcc"
|
||||||
|
],
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
},
|
||||||
|
"detail": "Task generated by Debugger."
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"version": "2.0.0"
|
||||||
|
}
|
|
@ -7,9 +7,9 @@ cmake_minimum_required(VERSION 3.8)
|
||||||
project(pixwerx)
|
project(pixwerx)
|
||||||
|
|
||||||
#
|
#
|
||||||
# pixwerx ist C++17
|
# pixwerx ist C++20
|
||||||
#
|
#
|
||||||
set (CMAKE_CXX_STANDARD 23)
|
set (CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
# internal cmake modules
|
# internal cmake modules
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/etc/cmake ${CMAKE_MODULE_PATH})
|
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/etc/cmake ${CMAKE_MODULE_PATH})
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required (VERSION 2.6)
|
cmake_minimum_required (VERSION 3.20)
|
||||||
|
|
||||||
project (lua)
|
project (lua)
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@ struct renderer::impl {
|
||||||
this->_change_count = m.change_count();
|
this->_change_count = m.change_count();
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
#if 1
|
||||||
// get errors
|
// get errors
|
||||||
auto error = glGetError();
|
auto error = glGetError();
|
||||||
if (error != GL_NO_ERROR) {
|
if (error != GL_NO_ERROR) {
|
||||||
|
|
|
@ -159,17 +159,17 @@ struct shader::impl
|
||||||
|
|
||||||
void bind(int location,const matrix3x3f& m)
|
void bind(int location,const matrix3x3f& m)
|
||||||
{
|
{
|
||||||
glUniformMatrix3fv(location,1,GL_FALSE,m.data);
|
glUniformMatrix3fv(location,1,GL_FALSE,m.ptr());
|
||||||
}
|
}
|
||||||
|
|
||||||
void bind(int location,const matrix4x4f& m)
|
void bind(int location,const matrix4x4f& m)
|
||||||
{
|
{
|
||||||
glUniformMatrix4fv(location,1,GL_FALSE,m.data);
|
glUniformMatrix4fv(location,1,GL_FALSE,m.ptr());
|
||||||
}
|
}
|
||||||
|
|
||||||
void bind(int location,const vector4f& v)
|
void bind(int location,const vector4f& v)
|
||||||
{
|
{
|
||||||
glUniform4fv(location,1,v.data);
|
glUniform4fv(location,1,v.ptr());
|
||||||
}
|
}
|
||||||
|
|
||||||
void bind(int location,const float& v)
|
void bind(int location,const float& v)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue