Devyatovskaya task3 #35

Lexxsage · 2021-03-22T07:34:23Z

No description provided.

Lexxsage · 2021-04-05T04:50:11Z

Оно работает:)

sadads1337 · 2021-04-25T07:01:32Z

src/devyatovskaya/Task3/CMakeLists.txt

+
+include_directories( ${OPENGL_INCLUDE_DIRS})
+
+qt5_wrap_ui(UI_HEADERS PhongLighting.ui RenderDialog.ui MorphingDialog.ui)


Нужно поправить cmake аналогично тому, как это сделано в Task2

поправила

sadads1337 · 2021-05-24T03:46:38Z

src/devyatovskaya/Task3/ShaderData.h

+  std::string vertex;
+  std::string fragment;
+  std::shared_ptr<GLMeshRendererGenerator> renderer_generator;
+  std::shared_ptr<QOpenGLShaderProgram> shader_program{nullptr};


Suggested change

std::shared_ptr<QOpenGLShaderProgram> shader_program{nullptr};

std::shared_ptr<QOpenGLShaderProgram> shader_program;

sadads1337 · 2021-05-24T03:48:13Z

src/devyatovskaya/Task3/Shaders/Lighting/f_phong_lighting_wo_normal_mapping.glsl

+    float shininess;
+};
+
+uniform Material material;


Шейдеры лучше не копировать (чревато ошибками), можно просто вынести общий код в отдельный шейдер и перед компиляцией склеить все шейдеры вместе (как C++ строки)

Можно не исправлять.

sadads1337 · 2021-05-24T03:48:52Z

src/devyatovskaya/Task3/ShaderCollection.h

+
+class ShaderCollection final {
+public:
+  inline static std::map<std::string, ShaderData> shaders = {


Это не java :) Зачем вам класс с одной статической переменной :)

sadads1337 · 2021-05-24T03:50:34Z

src/devyatovskaya/Task3/PreparedScenes.h

+  void init();
+
+private:
+  GLScene default_morphing(ShaderData &data);


Если эти методы не модифицируют ShaderData, то лучше сделать метод константным и данные передавать по const ссылке

Suggested change

GLScene default_morphing(ShaderData &data);

[[nodiscard]] GLScene default_morphing(const ShaderData &data);

sadads1337 · 2021-05-24T03:51:15Z

src/devyatovskaya/Task3/PhongLighting.h

+  Q_OBJECT
+
+public:
+  PhongLighting(QWidget *parent = Q_NULLPTR);


Suggested change

PhongLighting(QWidget *parent = Q_NULLPTR);

PhongLighting(QWidget *parent = nullptr);

sadads1337 · 2021-05-24T03:52:01Z

src/devyatovskaya/Task3/MeshGeneratorCollecrion.h

+
+class MeshGeneratorCollection final {
+public:
+  inline static std::map<std::string, std::shared_ptr<GLMeshGenerator>>


Опять класс с одной статической переменной

sadads1337 · 2021-05-24T03:52:32Z

src/devyatovskaya/Task3/GLTexture.h

+#include <string>
+
+struct GLTexture {
+  std::string type;


Лучше использовать enum class

sadads1337 · 2021-05-24T03:52:43Z

src/devyatovskaya/Task3/GLTexture.h

+
+struct GLTexture {
+  std::string type;
+  std::string path;


std::filesystem::path

И поле вообще не используется

sadads1337 · 2021-05-24T03:54:31Z

src/devyatovskaya/Task3/GLMeshRenderer.cpp

+  shader_program_ = std::move(shader_program);
+}
+
+void GLMeshRenderer::render_wireframe(QOpenGLFunctions_3_0 &functions,


Просите интерфейс для 3.0 версии, а в шейдерах 450 ставите. Все еще проблема с несколькими точками входа.

sadads1337 · 2021-05-24T03:55:17Z

src/devyatovskaya/Task3/GLMaterial.h

+  float shininess;
+  bool is_light_source;
+
+  GLMaterial(QColor _ambient = {}, QColor _diffuse = {}, QColor _specular = {},


Нуууу, это какая-то "жесть", задавайте значения полям. А объект создавайте через фигурные скобки.

sadads1337

Почитайте замечания, исправить вы их очевидно не успеете.

sadads1337 · 2021-05-24T04:00:37Z

src/devyatovskaya/Task3/GLTexture.h

+
+struct GLTexture {
+  std::string type;
+  std::string path;


И поле вообще не используется

sadads1337 · 2021-05-24T04:01:41Z

src/devyatovskaya/Task3/FPSCounter.h

+
+  Q_OBJECT
+signals:
+  void emit_fps(const QString &);


Сигнал не реализован

sadads1337 · 2021-05-24T04:02:02Z

src/devyatovskaya/Task3/FPSCounter.h

+public:
+  void calculate_fps();
+
+  float delta_time() const;


Suggested change

float delta_time() const;

[[nodiscard]] float delta_time() const;

sadads1337 · 2021-05-24T04:02:13Z

src/devyatovskaya/Task3/FPSCounter.h

+  float delta_time() const;
+
+private:
+  QString fps_to_str() const;


Suggested change

QString fps_to_str() const;

[[nodiscard]] QString fps_to_str() const;

sadads1337 · 2021-05-24T04:03:03Z

src/devyatovskaya/Task3/FPSCounter.cpp

+  elapsed_frame_time_ += frame_time;
+
+  // update fps every half second
+  if (elapsed_frame_time_ >= 0.5f) {


0.5f лучше вынести в отдельную compile-time константу с понятным названием.

sadads1337 · 2021-05-24T04:42:14Z

src/devyatovskaya/Task3/PhongLightingWidget.h

+  void set_morph_factor(int morph_factor);
+
+signals:
+  void send_fps(const QString &);


нереализован сигнал

sadads1337 · 2021-05-24T04:42:33Z

src/devyatovskaya/Task3/PhongLightingWidget.h

+  PreparedScenes prep_scenes_;
+
+  std::size_t scene_count_{0};
+  bool is_morphing_{false};


Никогда не читается

sadads1337 · 2021-05-24T04:42:41Z

src/devyatovskaya/Task3/PhongLightingWidget.h

+  void update_framerate();
+
+public:
+  PreparedScenes prep_scenes_;


Снова публичные поля

sadads1337 · 2021-05-24T04:43:14Z

src/devyatovskaya/Task3/PreparedScenes.h

+  GLScene default_scene_sphere(ShaderData &);
+  GLScene default_scene_cube(ShaderData &);
+
+  GLScene mesh_earth(ShaderData &);


Методы ниже не реализованы

sadads1337 · 2021-05-24T04:45:09Z

src/devyatovskaya/Task3/main.cpp

+
+  QSurfaceFormat format;
+  format.setSamples(16);
+  format.setVersion(2, 1);


Тут 2.1 версию OpenGL просите, в коде создаете контекст и интерфейс для 3.0, в шейдерах просите 4.1+. Странное, что оно вообще не падает

Lexxsage requested a review from sadads1337 March 22, 2021 07:35

Lexxsage self-assigned this Mar 22, 2021

Lexxsage changed the title ~~task3~~ Devyatovskaya task3 Mar 22, 2021

sadads1337 added the task-3 label Mar 27, 2021

sadads1337 requested changes Apr 25, 2021

View reviewed changes

sadads1337 force-pushed the feature-devyatovskaya-task-3 branch from d1e0a73 to 1b955bb Compare May 17, 2021 01:58

Lexxsage and others added 15 commits May 24, 2021 10:42

task3

e171a17

update Task3

7b05d0a

update Task3

e39cfb9

cmake changes

2923fb2

finally

7a0f445

change cmake

6b60ead

task3

1f42dd4

like task2

51818c3

task3

3b92dcf

task3

d5c7649

task3

9268ba9

task3

ebb6d1e

task3

f481778

Added lost task2

f00d30c

Code-style

a0285a6

sadads1337 approved these changes May 24, 2021

View reviewed changes

sadads1337 force-pushed the feature-devyatovskaya-task-3 branch from 1b955bb to 7f50dae Compare May 24, 2021 03:55

sadads1337 approved these changes May 24, 2021

View reviewed changes

Added missed header

a1549d0

sadads1337 force-pushed the feature-devyatovskaya-task-3 branch from 7f50dae to a1549d0 Compare May 24, 2021 04:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Devyatovskaya task3 #35

Devyatovskaya task3 #35

Lexxsage commented Mar 22, 2021

Lexxsage commented Apr 5, 2021

sadads1337 Apr 25, 2021

Lexxsage Apr 25, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 left a comment

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021

sadads1337 May 24, 2021


		include_directories( ${OPENGL_INCLUDE_DIRS})

		qt5_wrap_ui(UI_HEADERS PhongLighting.ui RenderDialog.ui MorphingDialog.ui)

	std::shared_ptr<QOpenGLShaderProgram> shader_program{nullptr};
	std::shared_ptr<QOpenGLShaderProgram> shader_program;

	GLScene default_morphing(ShaderData &data);
	[[nodiscard]] GLScene default_morphing(const ShaderData &data);

	PhongLighting(QWidget *parent = Q_NULLPTR);
	PhongLighting(QWidget *parent = nullptr);

	float delta_time() const;
	[[nodiscard]] float delta_time() const;

	QString fps_to_str() const;
	[[nodiscard]] QString fps_to_str() const;

Devyatovskaya task3 #35

Are you sure you want to change the base?

Devyatovskaya task3 #35

Conversation

Lexxsage commented Mar 22, 2021

Lexxsage commented Apr 5, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sadads1337 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment