Skip to content

finish all #5

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.

Sign up for GitHub

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

Open
DolmaMan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

finish all #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CoopRay3DProject/Figures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ void Ellipse::DrawEllipse(Ellipse* ellipse, int segments)
Vector3 point = rotatePoint(0, (*ellipse).Properties.radius.y * cosf(angle), (*ellipse).Properties.radius.z * sinf(angle));

if (!firstPointX) {
if((*ellipse).Properties.isHighlightedInMenu)
if(!(*ellipse).Properties.isHighlightedInMenu)
DrawLine3D(prevPointX, point, (*ellipse).Properties.color);
else
DrawLine3D(prevPointX, point, RED);
Expand All @@ -187,7 +187,7 @@ void Ellipse::DrawEllipse(Ellipse* ellipse, int segments)
Vector3 point = rotatePoint((*ellipse).Properties.radius.x * cosf(angle), 0, (*ellipse).Properties.radius.z * sinf(angle));

if (!firstPointY) {
if ((*ellipse).Properties.isHighlightedInMenu)
if (!(*ellipse).Properties.isHighlightedInMenu)
DrawLine3D(prevPointY, point, (*ellipse).Properties.color);
else
DrawLine3D(prevPointY, point, RED);
Expand Down
2 changes: 2 additions & 0 deletions CoopRay3DProject/Source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ int main()
bigRect = { 0.0f ,50.0f, (float)screenWidth, (float)screenHeight - 80 };
listFiguresRect = { (float)screenWidth - 300, 135, 300, (float)screenHeight - 165 };

UI::LoadUiControls();

InitAudioDevice();
LoadSounds();
LoadFonts();
Expand Down
Loading