Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mappevurderingprog2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tam Minh Le
mappevurderingprog2
Merge requests
!35
Finished the menu
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Finished the menu
Menu
into
dev
Overview
0
Commits
1
Pipelines
0
Changes
10
Merged
Edvard Granheim Harbo
requested to merge
Menu
into
dev
1 year ago
Overview
0
Commits
1
Pipelines
0
Changes
10
Expand
0
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
7ee73ca2
1 commit,
1 year ago
10 files
+
310
−
280
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
10
Search (e.g. *.vue) (Ctrl+P)
src/main/java/edu/ntnu/idatt2003/mappevurderingprog2/controllers/GameController.java
+
2
−
9
Options
@@ -34,12 +34,6 @@ public class GameController {
return
ChaosGame
.
getInstance
().
getDescription
().
getTransforms
();
}
public
void
setMinCoords
(
double
minX0
,
double
minX1
)
{
ChaosGame
.
getInstance
().
getDescription
().
setMinCoords
(
new
Vector2D
(
minX0
,
minX1
));
}
public
void
setMaxCoords
(
double
maxX0
,
double
maxX1
)
{
ChaosGame
.
getInstance
().
getDescription
().
setMaxCoords
(
new
Vector2D
(
maxX0
,
maxX1
));
}
public
void
setChaosGameDescription
(
ChaosGameDescription
description
)
{
ChaosGame
.
getInstance
().
setDescription
(
description
);
}
@@ -56,12 +50,11 @@ public class GameController {
ChaosGame
.
getInstance
().
runSteps
();
}
public
void
setJuliaTransformation
(
Complex
point
)
{
public
void
setJuliaTransformation
(
Complex
point
,
Vector2D
minCoords
,
Vector2D
maxCoords
)
{
List
<
Transform2D
>
transforms
=
new
ArrayList
<>();
// Add the JuliaTransform to the list of transforms
transforms
.
add
(
new
JuliaTransform
(
point
,
-
1
));
transforms
.
add
(
new
JuliaTransform
(
point
,
1
));
ChaosGame
.
getInstance
().
setDescription
(
ChaosGameDescription
.
createWithTransforms
(
transforms
,
new
Vector2D
(-
1.6
,
-
1.0
),
new
Vector2D
(
1.6
,
1.0
)
));
ChaosGame
.
getInstance
().
setDescription
(
ChaosGameDescription
.
createWithTransforms
(
transforms
,
minCoords
,
maxCoords
));
}
public
void
setAffineTransformation
(
List
<
Transform2D
>
transforms
,
Vector2D
minCoords
,
Vector2D
maxCoords
)
{
Loading