Compare commits
8 Commits
5389901c82
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 79c6ed928a | |||
| b912a664e7 | |||
| b23345b273 | |||
| 1e20533f10 | |||
| 2ad99a9d3b | |||
| 074b34dd24 | |||
| d7c541fcc5 | |||
| 16b901fab7 |
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"total": 73071,
|
||||
"total": 75390,
|
||||
"sessions": [
|
||||
{
|
||||
"begin": "2026-03-11T23:50:47+01:00",
|
||||
@@ -70,6 +70,11 @@
|
||||
"begin": "2026-03-15T21:00:39+01:00",
|
||||
"end": "2026-03-15T23:04:35+01:00",
|
||||
"duration": 7435
|
||||
},
|
||||
{
|
||||
"begin": "2026-03-28T03:48:55+01:00",
|
||||
"end": "2026-03-28T04:27:34+01:00",
|
||||
"duration": 2319
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -6,6 +6,8 @@ public sealed class Config
|
||||
|
||||
public bool HoldKey { get; set; } = true;
|
||||
|
||||
public bool BillboardIgnoreFront { get; set; } = false;
|
||||
|
||||
public int BillboardColumnsPerBlock { get; set; } = 4;
|
||||
|
||||
public int ColumnsUnderCursor { get; set; } = 10;
|
||||
|
||||
@@ -117,8 +117,20 @@ internal class CardRenderer(ICoreClientAPI api, Config config) : IDisposable
|
||||
if (heldBag == null)
|
||||
continue;
|
||||
|
||||
ItemStack[]? bagContents;
|
||||
try
|
||||
{
|
||||
bagContents = heldBag.GetContents(bagStack, api.World);
|
||||
}
|
||||
catch
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (bagContents == null)
|
||||
continue;
|
||||
|
||||
contents = [];
|
||||
ItemStack[] bagContents = heldBag.GetContents(bagStack, api.World);
|
||||
foreach (ItemStack contentStack in bagContents)
|
||||
{
|
||||
if (contentStack == null || contentStack.StackSize <= 0)
|
||||
|
||||
@@ -11,12 +11,13 @@ using Vintagestory.GameContent;
|
||||
|
||||
namespace ChestPreview.Rendering;
|
||||
|
||||
internal class WorldBillboardPresenter(ICoreClientAPI api)
|
||||
internal class WorldBillboardPresenter(ICoreClientAPI api, Config config)
|
||||
{
|
||||
private const int multiblock_scan_radius = 2;
|
||||
private static readonly float front_face_offset = 0.01f;
|
||||
private static readonly float front_face_offset = 0.05f;
|
||||
|
||||
private readonly ICoreClientAPI api = api;
|
||||
private readonly Config config = config;
|
||||
private readonly List<BillboardTarget> frameBillboards = [];
|
||||
|
||||
public IReadOnlyList<BillboardTarget> FrameBillboards => frameBillboards;
|
||||
@@ -162,7 +163,7 @@ internal class WorldBillboardPresenter(ICoreClientAPI api)
|
||||
right = new Vec3f(1f, 0f, 0f);
|
||||
up = new Vec3f(0f, 1f, 0f);
|
||||
|
||||
if (TryGetMeshAngle(blockEntity, out float meshAngleRadians))
|
||||
if (!config.BillboardIgnoreFront && TryGetMeshAngle(blockEntity, out float meshAngleRadians))
|
||||
{
|
||||
// MeshAngle is around Y axis in radians.
|
||||
forward = new Vec3f(MathF.Sin(meshAngleRadians), 0f, MathF.Cos(meshAngleRadians));
|
||||
@@ -171,7 +172,7 @@ internal class WorldBillboardPresenter(ICoreClientAPI api)
|
||||
return true;
|
||||
}
|
||||
|
||||
if (TryGetBlockSideFacing(block, out forward))
|
||||
if (!config.BillboardIgnoreFront && TryGetBlockSideFacing(block, out forward))
|
||||
{
|
||||
BuildBasisFromForward(forward, out right, out up);
|
||||
return true;
|
||||
@@ -260,16 +261,16 @@ internal class WorldBillboardPresenter(ICoreClientAPI api)
|
||||
switch (side.ToLowerInvariant())
|
||||
{
|
||||
case "north":
|
||||
facing = new Vec3f(0f, 0f, -1f);
|
||||
return true;
|
||||
case "south":
|
||||
facing = new Vec3f(0f, 0f, 1f);
|
||||
return true;
|
||||
case "south":
|
||||
facing = new Vec3f(0f, 0f, -1f);
|
||||
return true;
|
||||
case "east":
|
||||
facing = new Vec3f(1f, 0f, 0f);
|
||||
facing = new Vec3f(-1f, 0f, 0f);
|
||||
return true;
|
||||
case "west":
|
||||
facing = new Vec3f(-1f, 0f, 0f);
|
||||
facing = new Vec3f(1f, 0f, 0f);
|
||||
return true;
|
||||
case "up":
|
||||
facing = new Vec3f(0f, 1f, 0f);
|
||||
|
||||
@@ -19,7 +19,7 @@ internal class WorldBillboardRenderer(ICoreClientAPI api, Config config, CardRen
|
||||
private readonly List<PreviewTarget> frameTargets = [];
|
||||
private readonly CardRenderer cardRenderer = cardRenderer;
|
||||
private readonly PreviewTargetProvider targetProvider = new(api, config);
|
||||
private readonly WorldBillboardPresenter worldBillboardPresenter = new(api);
|
||||
private readonly WorldBillboardPresenter worldBillboardPresenter = new(api, config);
|
||||
private readonly MeshRef quadMeshRef = api.Render.UploadMesh(
|
||||
QuadMeshUtil.GetCustomQuadModelData(
|
||||
1f,
|
||||
|
||||
@@ -27,6 +27,13 @@
|
||||
"default": true,
|
||||
"clientSide": true
|
||||
},
|
||||
{
|
||||
"code": "BillboardIgnoreFront",
|
||||
"comment": "config-desc-BillboardIgnoreFront",
|
||||
"type": "boolean",
|
||||
"default": false,
|
||||
"clientSide": true
|
||||
},
|
||||
{
|
||||
"code": "BillboardColumnsPerBlock",
|
||||
"comment": "config-desc-BillboardColumnsPerBlock",
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"hotkey-preview-containers-nearby": "Preview containers nearby",
|
||||
"config-desc-Mode": "Preview mode. Valid values: None, UnderCursor, OnHoveredContainer, OnNearbyContainers.",
|
||||
"config-desc-HoldKey": "Previews only show while the \"Preview containers\" key is held.",
|
||||
"config-desc-BillboardIgnoreFront": "With this set to false, in-world previews show on the front side of containers. By setting this to true, the previews show on the side determined to be most visible.",
|
||||
"config-desc-BillboardColumnsPerBlock": "Columns per block width used for world billboards. For containers 2 blocks wide it's doubled.",
|
||||
"config-desc-ColumnsUnderCursor": "Columns in the UnderCursor mode.",
|
||||
"config-desc-PreviewNearbyRadius": "Radius for \"Preview containers nearby\".",
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"OrekiWoof"
|
||||
],
|
||||
"description": "see containers' contents without having to open them",
|
||||
"version": "1.1.0",
|
||||
"version": "1.2.0",
|
||||
"dependencies": {
|
||||
"game": "1.21.0"
|
||||
},
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
|
||||
<Configurations>Debug;Release;Version22</Configurations>
|
||||
<VS_CONFIGLIB Condition="'$(VS_CONFIGLIB)' == ''">$([System.Environment]::GetEnvironmentVariable('VS_CONFIGLIB'))</VS_CONFIGLIB>
|
||||
<ConfigLibAvailable Condition="'$(VS_CONFIGLIB)' != '' and Exists('$(VS_CONFIGLIB)')">true</ConfigLibAvailable>
|
||||
<DefineConstants Condition="'$(ConfigLibAvailable)' == 'true'">$(DefineConstants);CONFIGLIB</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -17,4 +20,15 @@
|
||||
<HintPath>$(VINTAGE_STORY)/VintagestoryAPI.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="configlib" Condition="'$(ConfigLibAvailable)' == 'true'">
|
||||
<HintPath>$(VS_CONFIGLIB)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="WarnWithoutConfigLib" BeforeTargets="CoreCompile" Condition="'$(ConfigLibAvailable)' != 'true'">
|
||||
<Warning Text="No VS_CONFIGLIB - will compile without supporting ConfigLib. Set VS_CONFIGLIB env var to a path that contains the configlib's dlls." />
|
||||
</Target>
|
||||
</Project>
|
||||
0
ChestPreview/build.sh
Normal file → Executable file
0
ChestPreview/build.sh
Normal file → Executable file
21
LICENSE
Normal file
21
LICENSE
Normal file
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2026 OrekiWoof
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
Reference in New Issue
Block a user