Skip to content
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

fix: move default config to class #617

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: move default config to class #617

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
3716a03
fix: default config
marcozzxx810 Mar 1, 2023
ad538fe
refactor: kotlin override java
marcozzxx810 Mar 2, 2023
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 server/src/main/java/dev/slimevr/config/OSCConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ public class OSCConfig {
private boolean enabled = false;

// Port to receive OSC messages from
private int portIn;
private int portIn = 9002;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The class gets extended and the fields get used in children, make it protected or rewrite in kotlin and make public.


// Port to send out OSC messages at
private int portOut;
private int portOut = 9000;

// Address to send out OSC messages at
private String address = "127.0.0.1";
Expand Down
20 changes: 20 additions & 0 deletions server/src/main/java/dev/slimevr/config/VMCConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,27 @@ package dev.slimevr.config
class VMCConfig : // Address of the VRM to be used
OSCConfig() {
// Anchor the tracking at the hip?

private var portIn: Int = 39540
private var portOut: Int = 39539

var anchorHip = true

var vrmJson: String? = null

override fun getPortIn(): Int {
return portIn
}

override fun setPortIn(portIn: Int) {
this.portIn = portIn
}

override fun getPortOut(): Int {
return portOut
}

override fun setPortOut(portOut: Int) {
this.portOut = portOut
}
Comment on lines +7 to +28
Copy link
Member

@ButterscotchV ButterscotchV Mar 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't these getters and setters just be override properties?
https://kotlinlang.org/docs/inheritance.html#overriding-properties

Suggested change
private var portIn: Int = 39540
private var portOut: Int = 39539
var anchorHip = true
var vrmJson: String? = null
override fun getPortIn(): Int {
return portIn
}
override fun setPortIn(portIn: Int) {
this.portIn = portIn
}
override fun getPortOut(): Int {
return portOut
}
override fun setPortOut(portOut: Int) {
this.portOut = portOut
}
override var portIn: Int = 39540
override var portOut: Int = 39539
var anchorHip = true
var vrmJson: String? = null

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does VMCConfig overrides all the same from OSCConfig... also just rewrite it all in kotlin without getters and setters.

}
5 changes: 5 additions & 0 deletions server/src/main/java/dev/slimevr/config/VRCOSCConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ public class VRCOSCConfig extends OSCConfig {
public Map<String, Boolean> trackers = new HashMap<>();

public VRCOSCConfig() {
super.setPortIn(9001);
super.setPortOut(9000);
getOSCTrackerRole(TrackerRole.WAIST, getOSCTrackerRole(TrackerRole.WAIST, true));
getOSCTrackerRole(TrackerRole.LEFT_FOOT, getOSCTrackerRole(TrackerRole.WAIST, true));
getOSCTrackerRole(TrackerRole.RIGHT_FOOT, getOSCTrackerRole(TrackerRole.WAIST, true));
}

public boolean getOSCTrackerRole(TrackerRole role, boolean def) {
Expand Down
28 changes: 1 addition & 27 deletions server/src/main/java/dev/slimevr/config/VRConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import dev.slimevr.config.serializers.BridgeConfigMapDeserializer;
import dev.slimevr.config.serializers.TrackerConfigMapDeserializer;
import dev.slimevr.tracking.trackers.Tracker;
import dev.slimevr.tracking.trackers.TrackerRole;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -51,32 +50,7 @@ public class VRConfig {
private final OverlayConfig overlay = new OverlayConfig();

public VRConfig() {
// Initialize default settings for OSC Router
oscRouter.setPortIn(9002);
oscRouter.setPortOut(9000);

// Initialize default settings for VRC OSC
vrcOSC.setPortIn(9001);
vrcOSC.setPortOut(9000);
vrcOSC
.setOSCTrackerRole(
TrackerRole.WAIST,
vrcOSC.getOSCTrackerRole(TrackerRole.WAIST, true)
);
vrcOSC
.setOSCTrackerRole(
TrackerRole.LEFT_FOOT,
vrcOSC.getOSCTrackerRole(TrackerRole.WAIST, true)
);
vrcOSC
.setOSCTrackerRole(
TrackerRole.RIGHT_FOOT,
vrcOSC.getOSCTrackerRole(TrackerRole.WAIST, true)
);

// Initialize default settings for VMC
vmc.setPortIn(39540);
vmc.setPortOut(39539);

}


Expand Down