Skip to content

[MP-6]: Adding code style to project #34

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

Merged
Pesterenan merged 2 commits into from
Feb 20, 2025
Merged

[MP-6]: Adding code style to project #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeb3ce9
[MP-6]: Adding code style to project
Pesterenan Feb 20, 2025
5b30d87
[MP-6]: Applying linting rules to project files
Pesterenan Feb 20, 2025
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.shelf/
.idea/
.settings/
bin/
tmp/
*.tmp
Expand Down
2 changes: 0 additions & 2 deletions .settings/org.eclipse.core.runtime.prefs
View file
Open in desktop

This file was deleted.

28 changes: 19 additions & 9 deletions .settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
# Java Version
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8

# Indentation
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.indentation.size=4

# Braces
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

# Line Wrapping
org.eclipse.jdt.core.formatter.lineSplit=120
org.eclipse.jdt.core.formatter.join_wrapped_lines=false

# Other
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=true
3 changes: 3 additions & 0 deletions .settings/org.eclipse.jdt.ui.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eclipse.preferences.version=1
formatter_profile=_custom
formatter_settings_version=12
59 changes: 36 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<version>3.11.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -25,10 +25,10 @@
<archive>
<manifest>
<mainClass>com.pesterenan.MechPeste</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand All @@ -37,53 +37,66 @@
<archive>
<manifest>
<mainClass>com.pesterenan.MechPeste</mainClass>
</manifest>
</archive>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</descriptorRefs>
<finalName>MechPeste-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.37.0</version>
<configuration>
<java>
<eclipse>
<version>4.19</version>
<file>${project.basedir}/.settings/org.eclipse.jdt.core.prefs</file>
</eclipse>
</java>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.3.9</version>
</dependency>
</dependency>
<dependency>
<groupId>io.github.krpc</groupId>
<artifactId>krpc-java</artifactId>
<version>0.5.2</version>
</dependency>
</dependency>
<dependency>
<groupId>org.javatuples</groupId>
<artifactId>javatuples</artifactId>
<version>1.2</version>
</dependency>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.22.1</version>
</dependency>
</dependencies>
</dependency>
</dependencies>

</project>
</project>
18 changes: 6 additions & 12 deletions src/main/java/com/pesterenan/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ public static void main(String[] args) {
currentZAxisSpeed = (targetPosition.z - lastZTargetPos) * sleepTime;

// Calcular a aceleração para cada eixo no RCS:
float forwardsError = calculateThrottle(5, 10, currentYAxisSpeed,
targetPosition.y, SPEED_LIMIT);
float forwardsError = calculateThrottle(5, 10, currentYAxisSpeed, targetPosition.y, SPEED_LIMIT);
float sidewaysError = calculateThrottle(-1, 10, currentXAxisSpeed, targetPosition.x, SPEED_LIMIT);
float upwardsError = calculateThrottle(-1, 10, currentZAxisSpeed, targetPosition.z, SPEED_LIMIT);
control.setForward((float) forwardsError);
Expand Down Expand Up @@ -190,17 +189,12 @@ private static float calculateThrottle(double minDistance, double maxDistance, d

private static void createLines(Vector start, Vector end) {
try {
distanceLine = drawing.addLine(start.toTriplet(),
end.toTriplet(), vesselRefFrame, true);
distLineXAxis = drawing.addLine(start.toTriplet(),
new Vector(end.x, 0.0, 0.0).toTriplet(),
vesselRefFrame, true);
distLineYAxis = drawing.addLine(start.toTriplet(),
new Vector(end.x, end.y, 0.0).toTriplet(),
vesselRefFrame, true);
distLineZAxis = drawing.addLine(start.toTriplet(),
end.toTriplet(),
distanceLine = drawing.addLine(start.toTriplet(), end.toTriplet(), vesselRefFrame, true);
distLineXAxis = drawing.addLine(start.toTriplet(), new Vector(end.x, 0.0, 0.0).toTriplet(), vesselRefFrame,
true);
distLineYAxis = drawing.addLine(start.toTriplet(), new Vector(end.x, end.y, 0.0).toTriplet(),
vesselRefFrame, true);
distLineZAxis = drawing.addLine(start.toTriplet(), end.toTriplet(), vesselRefFrame, true);
distanceLine.setThickness(0.5f);
distLineXAxis.setThickness(0.25f);
distLineYAxis.setThickness(0.25f);
Expand Down
Loading