Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt Rewrite #69

Open
wants to merge 100 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
f62fa83
cleanup electron and web files
njbrown Sep 3, 2022
2211298
update gitignore to target cmake files and folders
njbrown Sep 3, 2022
6feef88
initial qt setup
njbrown Sep 3, 2022
f10c857
add ads submodule
njbrown Sep 3, 2022
d5a7024
setup docks
njbrown Sep 3, 2022
73ce04e
add toolbar
njbrown Sep 3, 2022
1a03050
add basic models and props
njbrown Sep 4, 2022
c162b23
add main widgets
njbrown Sep 17, 2022
8267839
add nodegraph project
njbrown Sep 17, 2022
6ecddff
add nodegraph to texturelab project
njbrown Sep 17, 2022
4997804
add scene, node, port and connection classes
njbrown Sep 18, 2022
e7e862b
add port rendering
njbrown Sep 18, 2022
004e508
add connection rendering
njbrown Sep 18, 2022
2b384b0
fix nodegraph dragging issue
njbrown Sep 18, 2022
a096d66
add connections to connected ports
njbrown Sep 28, 2022
da6793d
add connection dragging
njbrown Sep 29, 2022
8b2ac6c
add new colors for connection and node outline
njbrown Sep 30, 2022
330cc35
add port snapping
njbrown Sep 30, 2022
b8d0a0c
set individual node names
njbrown Sep 30, 2022
5513b87
cleanup graph on destructor to prevent segfault
njbrown Oct 6, 2022
a1b6e5c
add node deletion
njbrown Oct 6, 2022
af54446
add ids to nodes, connections and ports
njbrown Oct 6, 2022
39f3f6b
add node connection removal via dragging from in ports
njbrown Oct 6, 2022
bf62e60
add library class
njbrown Oct 7, 2022
d9ff225
add bevel node to assets qrc
njbrown Oct 7, 2022
2d2bbc1
display items in library list widgets
njbrown Oct 7, 2022
de2c4c8
move library to texturelab project
njbrown Oct 7, 2022
d986420
add uuid utils
njbrown Oct 7, 2022
3bfaaed
begin work on parser
njbrown Oct 7, 2022
65a2f32
add basic project parsing
njbrown Oct 8, 2022
790fa3e
add formating config
njbrown Oct 8, 2022
71aee19
generate nodes in basic project loading
njbrown Oct 8, 2022
23594ff
generate nodegraph from loaded texture
njbrown Oct 8, 2022
e174571
add stroutrup brace formatting
njbrown Oct 8, 2022
c9b2bb7
add dropping from library to graph
njbrown Oct 8, 2022
8e3baa3
detach scene items from parent on deletion to prevent segfaulting
njbrown Oct 8, 2022
6d5124f
add new project action
njbrown Oct 9, 2022
6afdc18
add icons for other nodes
njbrown Oct 9, 2022
5841d49
add test renderer
njbrown Oct 23, 2022
438c782
add shader compilaton
njbrown Oct 29, 2022
822609b
fix rendering between nodes
njbrown Oct 30, 2022
14087ab
add node prop function declaratons
njbrown Oct 30, 2022
0d16c80
pass node props to shader
njbrown Oct 31, 2022
161696f
emit node selection change event
njbrown Nov 6, 2022
1a90a94
add prop display for float props
njbrown Nov 6, 2022
d9b62aa
mark nodes in sequence as dirty on node update
njbrown Nov 6, 2022
1bf65cf
enable opengl rendering in node graphics item
njbrown Nov 6, 2022
5e7000f
render node thumbnails directly with texture ids
njbrown Nov 6, 2022
2059c68
move properties widget to its own folder
njbrown Nov 7, 2022
3ca1745
add bool, enum and int prop widgets
njbrown Nov 7, 2022
34dc1aa
add normal and circle node
njbrown Nov 7, 2022
b9455e2
add 2d node preview
njbrown Nov 20, 2022
11f4d29
setup preview on double click
njbrown Nov 20, 2022
f974e21
zoom viewer to preview item
njbrown Nov 20, 2022
280b2a5
add basic viewer
njbrown Nov 28, 2022
58014ba
add basic model loader
njbrown Nov 29, 2022
9299193
add trackball rotation
njbrown Nov 29, 2022
c69c9f9
add sample cube
njbrown Nov 29, 2022
5d7af5d
add ibl sampler class
njbrown Dec 4, 2022
e038936
add texture creation functions to ibl sampler
njbrown Dec 4, 2022
67d4c92
add shader cache and filtering shaders
njbrown Dec 5, 2022
59496c6
add panorma to cubemap conversion
njbrown Dec 20, 2022
5cb66e4
add lambertian, ggx and sheen conversion
njbrown Dec 20, 2022
d155b3d
add lut filtering
njbrown Dec 20, 2022
f25ad73
add pbr shaders
njbrown Dec 20, 2022
3d912ea
add primitive shader
njbrown Dec 20, 2022
df8d788
add basic albedo rendering
njbrown Dec 25, 2022
06a5161
fix missing normal render bug
njbrown Dec 25, 2022
652d32e
fix pbr texture generation
njbrown Dec 25, 2022
09bbf66
fix tonemapping
njbrown Dec 25, 2022
e0e23c1
test other maps
njbrown Dec 25, 2022
2be66af
add external functions to viewer
njbrown Dec 25, 2022
31ae3c0
refactor renderer
njbrown Dec 27, 2022
94c46fe
add sphere geometry generation
njbrown Dec 27, 2022
0133c13
split roughness and metalness maps in pbr shader
njbrown Dec 27, 2022
32935fa
test metallic roughness textures
njbrown Dec 27, 2022
eb61e7b
fix viewport cutoff bug
njbrown Dec 27, 2022
d9a07d7
make renderer works with texture ids
njbrown Dec 29, 2022
20b60ff
add 3d preview of textures based on texture channels
njbrown Dec 29, 2022
bb5ee99
make fbo wrap
njbrown Dec 29, 2022
9917b5f
add new env
njbrown Dec 29, 2022
a58f387
reset gamma to 2.2
njbrown Jan 1, 2023
1be2436
fix banding in lambertian filter caused by seams in cubemap
njbrown Jan 1, 2023
3c8132d
add roughness test render
njbrown Jan 1, 2023
75be5cb
add brickgenerator node
njbrown Jan 4, 2023
565687d
add some nodes
njbrown Jan 4, 2023
235620f
add node assets to qrc
njbrown Jan 8, 2023
f81a47b
add v1 nodes
njbrown Jan 8, 2023
9fb6125
add libv1 nodes to libv2
njbrown Jan 8, 2023
133d5a0
add sources for v2 nodes
njbrown Jan 15, 2023
abc4ed9
make bevel and floodfill nodes behave like copy
njbrown Jan 22, 2023
ef6951b
move rest of v2 to individual files
njbrown Jan 22, 2023
ac56831
add node files to cmake
njbrown Jan 22, 2023
6c5e6e1
fix errors on node classes
njbrown Jan 22, 2023
9cbe60c
fix all node compilation issues
njbrown Jan 22, 2023
44099bc
register remaining nodes to libv2
njbrown Feb 2, 2023
844fac9
add color picker saturation-value widget
njbrown Feb 2, 2023
f07d53a
add hue slider to color picker
njbrown Sep 29, 2024
b60b874
fix hue slider redraw
njbrown Sep 29, 2024
692a26d
tidy up color picker widgets
njbrown Oct 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .browserslistrc

This file was deleted.

8 changes: 8 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# https://github.com/microsoft/vscode-cpptools/issues/932
NamespaceIndentation: None
IndentWidth: 4
AccessModifierOffset: -4
PointerAlignment: Left

# https://stackoverflow.com/questions/29477654/how-to-make-clang-format-add-new-line-before-opening-brace-of-a-function
BreakBeforeBraces: Stroustrup
24 changes: 0 additions & 24 deletions .eslintrc.js

This file was deleted.

38 changes: 13 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
.DS_Store
node_modules
/dist

# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

#Electron-builder output
/dist_electron
/build/icons
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps

build/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "public/assets"]
path = public/assets
url = https://github.com/njbrown/texturelabdata.git
[submodule "src/ads"]
path = src/ads
url = https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
3 changes: 0 additions & 3 deletions .prettierrc

This file was deleted.

20 changes: 20 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
cmake_minimum_required(VERSION 3.5)

project(qtcompleteapp VERSION 0.1 LANGUAGES CXX)

# Advanced Docking System
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/ads)
set_target_properties(qtadvanceddocking PROPERTIES BUILD_STATIC TRUE)

# Node Graph
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/nodegraph)

# 3D Viewer
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/viewer3d)

# 3D Viewer
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/colorpicker)

# Main App
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/texturelab)

21 changes: 12 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


<h1 align="center">
TextureLab
</h1>
Expand All @@ -17,22 +15,27 @@
![Screenshot](https://user-images.githubusercontent.com/1708550/123368911-4ceb9f00-d542-11eb-87b5-b0fc3ea3cc3d.png)

# NOTE!

Texturelab will soon be converted to a qt project. All issues will be addressed after the conversion is complete.

## Building

Building is done with `yarn`. Install it [here](https://classic.yarnpkg.com/en/docs/install) if you havent already.
Prerequisites

```
git clone https://github.com/njbrown/texturelab.git
install qt

cd texturelab
//apt-get install libmesa-dev
sudo apt install libgl1-mesa-dev

# if you want to pull down assets (textures and node icons)
git submodule update --init
```

Building is done with `yarn`. Install it [here](https://classic.yarnpkg.com/en/docs/install) if you havent already.

yarn install
yarn electron:serve
```
git clone https://github.com/njbrown/texturelab.git
cd texturelab
git submodule update --init --recursive
```

## Feedback
Expand Down
3 changes: 0 additions & 3 deletions babel.config.js

This file was deleted.

27 changes: 0 additions & 27 deletions jest.config.js

This file was deleted.

80 changes: 0 additions & 80 deletions package.json

This file was deleted.

5 changes: 0 additions & 5 deletions postcss.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion public/assets
33 changes: 0 additions & 33 deletions public/css/scrollbar.css

This file was deleted.

Binary file removed public/icon.png
Binary file not shown.
26 changes: 0 additions & 26 deletions public/index.html

This file was deleted.

Loading
Loading