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

OpenGL Rendering Implemented #229

Merged
merged 103 commits into from Aug 30, 2019
Merged

OpenGL Rendering Implemented #229

merged 103 commits into from Aug 30, 2019

Conversation

@sckorpio
Copy link
Contributor

@sckorpio sckorpio commented Aug 22, 2019

Finished the OpenGL Rendering module!!!

@sckorpio sckorpio closed this Aug 23, 2019
@sckorpio sckorpio reopened this Aug 23, 2019
Copy link
Member

@feragon feragon left a comment

It's much better, but some work is still needed

Loading

lcviewernoqt/CMakeLists.txt Outdated Show resolved Hide resolved
Loading
lcUI/CMakeLists.txt Outdated Show resolved Hide resolved
Loading
lcUI/lcadviewer.cpp Outdated Show resolved Hide resolved
Loading
lcUI/lcadviewer.cpp Outdated Show resolved Hide resolved
Loading
lcviewernoqt/painters/opengl/sources/gl_font.cpp Outdated Show resolved Hide resolved
Loading
lcviewernoqt/painters/openglpainter.cpp Outdated Show resolved Hide resolved
Loading
lcviewernoqt/viewersettings.h Outdated Show resolved Hide resolved
Loading
@sckorpio sckorpio closed this Aug 24, 2019
@sckorpio sckorpio reopened this Aug 24, 2019
Copy link
Member

@feragon feragon left a comment

This is much better, but there are still some places where you left commented code and code duplication.

The fonts are still present in the PR, which means it can't be accepted because we can't redistribute those due the licenses

Loading

lcUI/lcadviewer.cpp Outdated Show resolved Hide resolved
Loading
lcUI/lcadviewer.cpp Outdated Show resolved Hide resolved
Loading
lcUI/lcadviewer.cpp Outdated Show resolved Hide resolved
Loading
lcUI/lcadviewer.h Outdated Show resolved Hide resolved
Loading
lcUI/lcadviewer.h Outdated Show resolved Hide resolved
Loading
lcviewernoqt/painters/opengl/sources/shader.cpp Outdated Show resolved Hide resolved
Loading
lcviewernoqt/painters/opengl/sources/shader.cpp Outdated Show resolved Hide resolved
Loading
lcviewernoqt/painters/opengl/sources/text_entity.cpp Outdated Show resolved Hide resolved
Loading
lcviewernoqt/painters/opengl/sources/shape_entity.cpp Outdated Show resolved Hide resolved
Loading
lcviewernoqt/painters/opengl/sources/shape_entity.cpp Outdated Show resolved Hide resolved
Loading
Copy link
Member

@feragon feragon left a comment

There are 3 things left:

  • Lower the OpenGL required version (3.0 would be good, unless you need a specific function from a newer API)
  • There is still one occurrence of commented code
  • You need to delete the two fonts that we can't redistribute

Loading

@@ -28,7 +28,7 @@ LCADViewer::LCADViewer(QWidget *parent) :

QSurfaceFormat format;
format.setMajorVersion(4);
Copy link
Member

@feragon feragon Aug 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For OpenGL, 3.0 means :
Major version: 3
Minor version: 0

Loading

@feragon feragon changed the base branch from master to opengl Aug 30, 2019
@feragon feragon merged commit ebbf7b9 into LibreCAD:opengl Aug 30, 2019
2 checks passed
Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants