Skip to content

Commit

Permalink
rename gfni package to translucent_sorting
Browse files Browse the repository at this point in the history
gfni is not appropriate as a name for the whole system as it's just a part of the whole thing
  • Loading branch information
douira committed Nov 16, 2023
1 parent 88b6c09 commit 90462a9
Show file tree
Hide file tree
Showing 33 changed files with 42 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.SerializedName;
import me.jellysquid.mods.sodium.client.gui.options.TextProvider;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.SortType;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.SortType;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.option.GraphicsMode;
import net.minecraft.text.Text;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.jellysquid.mods.sodium.client.model.quad;

import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFlags;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentSorting;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentSorting;
import net.caffeinemc.mods.sodium.api.util.NormI8;
import net.minecraft.client.texture.Sprite;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderMatrices;
import me.jellysquid.mods.sodium.client.render.chunk.RenderSectionManager;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.CameraMovement;
import me.jellysquid.mods.sodium.client.render.chunk.lists.ChunkRenderList;
import me.jellysquid.mods.sodium.client.render.chunk.lists.SortedRenderLists;
import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTracker;
import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTrackerHolder;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.DefaultTerrainRenderPasses;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.CameraMovement;
import me.jellysquid.mods.sodium.client.render.viewport.Viewport;
import me.jellysquid.mods.sodium.client.util.NativeBuffer;
import me.jellysquid.mods.sodium.client.world.WorldRendererExtended;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package me.jellysquid.mods.sodium.client.render.chunk;

import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionInfo;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.occlusion.GraphDirection;
import me.jellysquid.mods.sodium.client.render.chunk.occlusion.GraphDirectionSet;
import me.jellysquid.mods.sodium.client.render.chunk.occlusion.VisibilityEncoding;
import me.jellysquid.mods.sodium.client.render.chunk.region.RenderRegion;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentData;
import me.jellysquid.mods.sodium.client.util.task.CancellationToken;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.texture.Sprite;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
import me.jellysquid.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderSortingTask;
import me.jellysquid.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderTask;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionInfo;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.CameraMovement;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentSorting;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.lists.ChunkRenderList;
import me.jellysquid.mods.sodium.client.render.chunk.lists.SortedRenderLists;
import me.jellysquid.mods.sodium.client.render.chunk.lists.VisibleChunkCollector;
Expand All @@ -32,6 +29,9 @@
import me.jellysquid.mods.sodium.client.render.chunk.region.RenderRegion;
import me.jellysquid.mods.sodium.client.render.chunk.region.RenderRegionManager;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.CameraMovement;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentSorting;
import me.jellysquid.mods.sodium.client.render.chunk.vertex.format.ChunkMeshFormats;
import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
import me.jellysquid.mods.sodium.client.render.viewport.CameraTransform;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import me.jellysquid.mods.sodium.client.render.chunk.RenderSection;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.PresentTranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionMeshParts;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.PresentTranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionInfo;

import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package me.jellysquid.mods.sodium.client.render.chunk.compile;

import me.jellysquid.mods.sodium.client.render.chunk.RenderSection;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.DynamicData;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.PresentTranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.DynamicData;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.PresentTranslucentData;

public class ChunkSortOutput extends BuilderTaskOutput implements OutputWithIndexData {
public final DynamicData dynamicData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.jellysquid.mods.sodium.client.render.chunk.compile;

import me.jellysquid.mods.sodium.client.render.chunk.gfni.PresentTranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.PresentTranslucentData;

public interface OutputWithIndexData {
PresentTranslucentData getTranslucentData();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline;

import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentGeometryCollector;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentGeometryCollector;
import me.jellysquid.mods.sodium.client.world.WorldSlice;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import me.jellysquid.mods.sodium.client.model.color.DefaultColorProviders;
import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildBuffers;
import me.jellysquid.mods.sodium.client.render.chunk.compile.buffers.ChunkModelBuilder;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentGeometryCollector;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.material.DefaultMaterials;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.material.Material;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentGeometryCollector;
import me.jellysquid.mods.sodium.client.render.chunk.vertex.format.ChunkVertexEncoder;
import me.jellysquid.mods.sodium.client.world.WorldSlice;
import me.jellysquid.mods.sodium.client.util.DirectionUtil;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderContext;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionInfo;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionMeshParts;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentGeometryCollector;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.SortType;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.DefaultTerrainRenderPasses;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.SortType;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentGeometryCollector;
import me.jellysquid.mods.sodium.client.util.task.CancellationToken;
import me.jellysquid.mods.sodium.client.world.WorldSlice;
import me.jellysquid.mods.sodium.client.world.cloned.ChunkRenderContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import me.jellysquid.mods.sodium.client.render.chunk.RenderSection;
import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildContext;
import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkSortOutput;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.DynamicData;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.DynamicData;
import me.jellysquid.mods.sodium.client.util.task.CancellationToken;

public class ChunkBuilderSortingTask extends ChunkBuilderTask<ChunkSortOutput> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildOutput;
import me.jellysquid.mods.sodium.client.render.chunk.compile.OutputWithIndexData;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionMeshParts;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.PresentTranslucentData;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.DefaultTerrainRenderPasses;
import me.jellysquid.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.PresentTranslucentData;

import org.jetbrains.annotations.NotNull;

import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import org.joml.Vector3fc;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import me.jellysquid.mods.sodium.client.gl.util.VertexRange;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionMeshParts;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import org.joml.Vector3dc;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import java.nio.IntBuffer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import org.joml.Vector3d;
import org.joml.Vector3dc;

import it.unimi.dsi.fastutil.doubles.Double2ObjectRBTreeMap;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentSorting.SectionTriggers;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentSorting.SectionTriggers;
import net.minecraft.util.math.ChunkSectionPos;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import java.nio.IntBuffer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import org.joml.Vector3dc;
import org.joml.Vector3fc;

import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
import me.jellysquid.mods.sodium.client.render.chunk.gfni.TranslucentSorting.SectionTriggers;
import me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting.TranslucentSorting.SectionTriggers;
import net.minecraft.util.math.ChunkSectionPos;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import com.lodborg.intervaltree.DoubleInterval;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import me.jellysquid.mods.sodium.client.gl.util.VertexRange;
import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFacing;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import net.minecraft.util.math.ChunkSectionPos;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import java.util.Collection;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import me.jellysquid.mods.sodium.client.gl.util.VertexRange;
import me.jellysquid.mods.sodium.client.util.NativeBuffer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

/**
* What type of sorting to use for a section. Calculated by a heuristic after
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import me.jellysquid.mods.sodium.client.gl.util.VertexRange;
import me.jellysquid.mods.sodium.client.util.NativeBuffer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import java.nio.IntBuffer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import me.jellysquid.mods.sodium.client.gl.util.VertexRange;
import me.jellysquid.mods.sodium.client.render.chunk.data.BuiltSectionMeshParts;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import java.util.Arrays;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import java.nio.IntBuffer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import org.joml.Vector3f;
import org.joml.Vector3fc;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jellysquid.mods.sodium.client.render.chunk.gfni;
package me.jellysquid.mods.sodium.client.render.chunk.translucent_sorting;

import java.util.List;
import java.util.function.BiConsumer;
Expand Down

0 comments on commit 90462a9

Please sign in to comment.