Uni/CGI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

conflict v2

Browse source
This commit is contained in:
fruitstaa 2018-11-27 18:32:07 +01:00
parent 3cd3b20600
commit efb21993c9
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
exercise1/glsl/shader.vert
View file

@ -18,9 +18,6 @@ void main()
gl_Position = proj * view * in_position; gl_Position = proj * view * in_position;
fragment_color = in_color; fragment_color = in_color;
<<<<<<< HEAD
=======
julia_position = julia_positions[gl_VertexID % 3]; julia_position = julia_positions[gl_VertexID % 3];
>>>>>>> 8b4276f6ab9ed1d7d6e1909f36944eaa9a8964da
} }

3
exercise1/include/Viewer.h
View file

@ -26,8 +26,6 @@ class Viewer : public nse::gui::AbstractViewer
nanogui::Slider *sldJuliaCY; nanogui::Slider *sldJuliaCY;
nanogui::Slider *sldJuliaZoom; //Zoom factor for the Julia fractal nanogui::Slider *sldJuliaZoom; //Zoom factor for the Julia fractal
<<<<<<< HEAD
=======
nanogui::Slider *point1X; nanogui::Slider *point1X;
nanogui::Slider *point1Y; nanogui::Slider *point1Y;
nanogui::Slider *point2X; nanogui::Slider *point2X;
@ -35,7 +33,6 @@ class Viewer : public nse::gui::AbstractViewer
nanogui::Slider *point3X; nanogui::Slider *point3X;
nanogui::Slider *point3Y; nanogui::Slider *point3Y;
>>>>>>> 8b4276f6ab9ed1d7d6e1909f36944eaa9a8964da
// The following variables hold OpenGL object IDs // The following variables hold OpenGL object IDs
GLuint vertex_shader_id, // ID of the vertex shader GLuint vertex_shader_id, // ID of the vertex shader
fragment_shader_id, // ID of the fragment shader fragment_shader_id, // ID of the fragment shader

3
exercise1/src/Viewer.cpp
View file

@ -50,8 +50,6 @@ void Viewer::SetupGUI()
sldJuliaCY = nse::gui::AddLabeledSliderWithDefaultDisplay(mainWindow, "JuliaC.Y", std::make_pair(-1.0f, 1.0f), -0.3f, 2); sldJuliaCY = nse::gui::AddLabeledSliderWithDefaultDisplay(mainWindow, "JuliaC.Y", std::make_pair(-1.0f, 1.0f), -0.3f, 2);
sldJuliaZoom = nse::gui::AddLabeledSliderWithDefaultDisplay(mainWindow, "Julia Zoom", std::make_pair(0.01f, 10.0f), 1.0f, 2); sldJuliaZoom = nse::gui::AddLabeledSliderWithDefaultDisplay(mainWindow, "Julia Zoom", std::make_pair(0.01f, 10.0f), 1.0f, 2);
<<<<<<< HEAD
=======
point1X = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point1.X", std::make_pair(-3.0f, 3.0f), -0.8f, 2); point1X = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point1.X", std::make_pair(-3.0f, 3.0f), -0.8f, 2);
point1Y = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point1.Y", std::make_pair(-3.0f, 3.0f), 0.6f, 2); point1Y = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point1.Y", std::make_pair(-3.0f, 3.0f), 0.6f, 2);
point2X = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point2.X", std::make_pair(-3.0f, 3.0f), 0.5f, 2); point2X = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point2.X", std::make_pair(-3.0f, 3.0f), 0.5f, 2);
@ -59,7 +57,6 @@ void Viewer::SetupGUI()
point3X = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point3.X", std::make_pair(-3.0f, 3.0f), 0.8f, 2); point3X = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point3.X", std::make_pair(-3.0f, 3.0f), 0.8f, 2);
point3Y = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point3.Y", std::make_pair(-3.0f, 3.0f), 1.0f, 2); point3Y = AddLabeledSliderWithDefaultDisplay(mainWindow, "Point3.Y", std::make_pair(-3.0f, 3.0f), 1.0f, 2);
>>>>>>> 8b4276f6ab9ed1d7d6e1909f36944eaa9a8964da
performLayout(); performLayout();
} }