From 0e56698d6cf151aff8265ddedd30642cf49e03df Mon Sep 17 00:00:00 2001 From: Arjan Boschman Date: Mon, 30 Nov 2015 23:40:19 +0100 Subject: [PATCH] Fixed liscence headers. --- .../src/main/java/robotrace/Lighting.java | 7 ++++--- .../src/main/java/robotrace/Material.java | 6 ++++++ .../src/main/java/robotrace/RaceTrack.java | 12 +++++++++--- .../src/main/java/robotrace/Robot.java | 6 ++++++ .../src/main/java/robotrace/RobotFactory.java | 6 ++++++ .../src/main/java/robotrace/RobotRace.java | 6 ++++++ .../src/main/java/robotrace/Terrain.java | 12 +++++++++--- .../src/main/java/robotrace/bender/Bender.java | 6 ++++++ .../src/main/java/robotrace/bender/Body.java | 6 ++++++ .../src/main/java/robotrace/bender/Limb.java | 6 ++++++ .../bender/bodyassembly/Assembler.java | 18 +++++++++++++----- .../bender/bodyassembly/IndexedVertex.java | 6 ++++++ .../robotrace/bender/bodyassembly/Surface.java | 9 ++++++++- .../bodyassembly/SurfaceCompilation.java | 9 ++++++++- .../robotrace/bender/bodyassembly/Vertex.java | 6 ++++++ .../src/main/java/utility/GsUtils.java | 9 +++++---- 16 files changed, 110 insertions(+), 20 deletions(-) diff --git a/RobotRaceGradle/src/main/java/robotrace/Lighting.java b/RobotRaceGradle/src/main/java/robotrace/Lighting.java index 0b05ac5..42f3aeb 100644 --- a/RobotRaceGradle/src/main/java/robotrace/Lighting.java +++ b/RobotRaceGradle/src/main/java/robotrace/Lighting.java @@ -1,7 +1,8 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen */ package robotrace; diff --git a/RobotRaceGradle/src/main/java/robotrace/Material.java b/RobotRaceGradle/src/main/java/robotrace/Material.java index 369fb9b..0ab9ad2 100644 --- a/RobotRaceGradle/src/main/java/robotrace/Material.java +++ b/RobotRaceGradle/src/main/java/robotrace/Material.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace; /** diff --git a/RobotRaceGradle/src/main/java/robotrace/RaceTrack.java b/RobotRaceGradle/src/main/java/robotrace/RaceTrack.java index 5395f27..21a0e5b 100644 --- a/RobotRaceGradle/src/main/java/robotrace/RaceTrack.java +++ b/RobotRaceGradle/src/main/java/robotrace/RaceTrack.java @@ -1,8 +1,14 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace; -import com.jogamp.opengl.util.gl2.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.util.gl2.GLUT; +import javax.media.opengl.GL2; +import javax.media.opengl.glu.GLU; /** Implementation of a race track that is made from Bezier segments. diff --git a/RobotRaceGradle/src/main/java/robotrace/Robot.java b/RobotRaceGradle/src/main/java/robotrace/Robot.java index aefb572..95eaca6 100644 --- a/RobotRaceGradle/src/main/java/robotrace/Robot.java +++ b/RobotRaceGradle/src/main/java/robotrace/Robot.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace; import com.jogamp.opengl.util.gl2.GLUT; diff --git a/RobotRaceGradle/src/main/java/robotrace/RobotFactory.java b/RobotRaceGradle/src/main/java/robotrace/RobotFactory.java index c8e6c34..e708b6e 100644 --- a/RobotRaceGradle/src/main/java/robotrace/RobotFactory.java +++ b/RobotRaceGradle/src/main/java/robotrace/RobotFactory.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace; import javax.media.opengl.GL2; diff --git a/RobotRaceGradle/src/main/java/robotrace/RobotRace.java b/RobotRaceGradle/src/main/java/robotrace/RobotRace.java index 9140bbd..fd2ab1b 100644 --- a/RobotRaceGradle/src/main/java/robotrace/RobotRace.java +++ b/RobotRaceGradle/src/main/java/robotrace/RobotRace.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace; import javax.media.opengl.GL; diff --git a/RobotRaceGradle/src/main/java/robotrace/Terrain.java b/RobotRaceGradle/src/main/java/robotrace/Terrain.java index 7a9bed1..0e7b326 100644 --- a/RobotRaceGradle/src/main/java/robotrace/Terrain.java +++ b/RobotRaceGradle/src/main/java/robotrace/Terrain.java @@ -1,8 +1,14 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace; -import com.jogamp.opengl.util.gl2.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.util.gl2.GLUT; +import javax.media.opengl.GL2; +import javax.media.opengl.glu.GLU; /** Implementation of the terrain. diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/Bender.java b/RobotRaceGradle/src/main/java/robotrace/bender/Bender.java index a099cb1..dc6fb13 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/Bender.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/Bender.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender; import com.jogamp.opengl.util.gl2.GLUT; diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/Body.java b/RobotRaceGradle/src/main/java/robotrace/bender/Body.java index 24227e4..90da581 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/Body.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/Body.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender; import java.nio.DoubleBuffer; diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/Limb.java b/RobotRaceGradle/src/main/java/robotrace/bender/Limb.java index c3d6fb9..57921ad 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/Limb.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/Limb.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender; import java.nio.DoubleBuffer; diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Assembler.java b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Assembler.java index a5dc984..a3c62f4 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Assembler.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Assembler.java @@ -1,16 +1,24 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender.bodyassembly; -import com.jogamp.common.nio.*; +import com.jogamp.common.nio.Buffers; +import java.nio.DoubleBuffer; +import java.nio.IntBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import static java.lang.Math.PI; import static java.lang.Math.atan; import static java.lang.Math.cos; import static java.lang.Math.sin; import static java.lang.Math.toRadians; - -import java.nio.*; -import java.util.*; - import static robotrace.bender.bodyassembly.Vertex.COORD_COUNT; import static robotrace.bender.bodyassembly.Vertex.IND_X; import static robotrace.bender.bodyassembly.Vertex.IND_Y; diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/IndexedVertex.java b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/IndexedVertex.java index a531c14..3516d1b 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/IndexedVertex.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/IndexedVertex.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender.bodyassembly; /** diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Surface.java b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Surface.java index 1021b1f..70e111c 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Surface.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Surface.java @@ -1,6 +1,13 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender.bodyassembly; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/SurfaceCompilation.java b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/SurfaceCompilation.java index 64772b0..adceb83 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/SurfaceCompilation.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/SurfaceCompilation.java @@ -1,6 +1,13 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender.bodyassembly; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** diff --git a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Vertex.java b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Vertex.java index 47cc4a0..7e7c502 100644 --- a/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Vertex.java +++ b/RobotRaceGradle/src/main/java/robotrace/bender/bodyassembly/Vertex.java @@ -1,3 +1,9 @@ +/* + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen + */ package robotrace.bender.bodyassembly; /** diff --git a/RobotRaceGradle/src/main/java/utility/GsUtils.java b/RobotRaceGradle/src/main/java/utility/GsUtils.java index 2ce4d18..c59e222 100644 --- a/RobotRaceGradle/src/main/java/utility/GsUtils.java +++ b/RobotRaceGradle/src/main/java/utility/GsUtils.java @@ -1,11 +1,12 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * Course: Computer Graphics + * Course Code: 2IV60 + * Assignment: RobotRace + * Students: Arjan Boschman & Robke Geenen */ package utility; -import robotrace.*; +import robotrace.GlobalState; /** Static utility class. Contains some utility methods that aid in using the