Skip to content

Add horizontal FOV subcommand to cfov #777

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
xpple wants to merge 1 commit into
base: fabric
Choose a base branch
from
Open

Add horizontal FOV subcommand to cfov #777

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
24 changes: 19 additions & 5 deletions src/main/java/net/earthcomputer/clientcommands/command/FovCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.earthcomputer.clientcommands.command;

import com.mojang.brigadier.Command;
import com.mojang.blaze3d.platform.Window;
import com.mojang.brigadier.CommandDispatcher;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.minecraft.network.chat.Component;
Expand All @@ -12,12 +12,16 @@ public class FovCommand {

public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
dispatcher.register(literal("cfov")
.then(argument("fov", integer(0, 360))
.executes(ctx -> setFov(ctx.getSource(), getInteger(ctx, "fov"))))
.then(literal("vertical")
.then(argument("fov", integer(0, 360))
.executes(ctx -> setFov(ctx.getSource(), getInteger(ctx, "fov")))))
.then(literal("normal")
.executes(ctx -> setFov(ctx.getSource(), 70)))
.then(literal("quakePro")
.executes(ctx -> setFov(ctx.getSource(), 110))));
.executes(ctx -> setFov(ctx.getSource(), 110)))
.then(literal("horizontal")
.then(argument("fov", integer(0, 360))
.executes(ctx -> setHorizontalFov(ctx.getSource(), getInteger(ctx, "fov"))))));
}

private static int setFov(FabricClientCommandSource source, int fov) {
Expand All @@ -26,7 +30,17 @@ private static int setFov(FabricClientCommandSource source, int fov) {
Component feedback = Component.translatable("commands.cfov.success", fov);
source.sendFeedback(feedback);

return Command.SINGLE_SUCCESS;
return fov;
}

private static int setHorizontalFov(FabricClientCommandSource source, int fov) {
Window window = source.getClient().getWindow();

double fovRad = Math.toRadians(fov);
double aspectRatio = (double) window.getGuiScaledWidth() / window.getGuiScaledHeight();
double verticalFovRad = 2 * Math.atan(Math.tan(fovRad / 2) / aspectRatio);
int verticalFov = (int) Math.round(Math.toDegrees(verticalFovRad));

return setFov(source, verticalFov);
}
}