Compare commits
21 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 88ab736519 | |||
| 0f1709f25c | |||
| 4fce425dcd | |||
| 5e76b6176a | |||
| a597425e45 | |||
| d5f17eb0ac | |||
| 39b270b108 | |||
| e85c4fc10a | |||
| ecde09560d | |||
| 645896ca4b | |||
|
|
8ef46e4560 | ||
|
|
135628c2f1 | ||
|
|
15f070af6d | ||
|
|
5e1864fed1 | ||
|
|
7a2ed9fc34 | ||
|
|
e88718a32d | ||
|
|
64f27ee9e3 | ||
| 494990ca4c | |||
| 1a50a757b7 | |||
| 4a722259a5 | |||
| acb69472c2 |
144 changed files with 8887 additions and 323 deletions
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -2,7 +2,7 @@ name: Release
|
|||
|
||||
# Publish a mod build on every version tag. Every release carries both a
|
||||
# versioned jar and a stable `lovisual.jar`, so the site's one-click download
|
||||
# link (releases/latest/download/lovisual.jar) always resolves.
|
||||
# link (the site serves lovisual.jar from our own server) always resolves.
|
||||
|
||||
on:
|
||||
push:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
Open-source Minecraft utility client **and** the platform around it - website, cloud config sharing, and a Rust backend.
|
||||
|
||||
Developed and maintained by [loki5512344](https://github.com/loki5512344).
|
||||
Developed and maintained by [loki5512344ss](https://github.com/loki5512344ss).
|
||||
|
||||

|
||||

|
||||
|
|
@ -12,7 +12,7 @@ Developed and maintained by [loki5512344](https://github.com/loki5512344).
|
|||

|
||||

|
||||
|
||||
**[⬇ Download the mod](https://git.wihuk.pro/boba/LoVisual/releases/latest/download/lovisual.jar)** · [Releases](https://git.wihuk.pro/boba/LoVisual/releases)
|
||||
**[⬇ Download the mod](https://visual.loki-code.dev/download)** · [Releases](https://git.wihuk.pro/boba/LoVisual/releases)
|
||||
|
||||
[English](#english) | [Русский](#русский)
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,17 @@ pub async fn set_avatar(pool: &PgPool, account_id: Uuid, s3_key: &str) -> Result
|
|||
Ok(())
|
||||
}
|
||||
|
||||
/// Deletes the `avatars` row for one account. Returns `true` when a row existed
|
||||
/// (so the caller can decide whether to also delete the S3 object) and `false`
|
||||
/// when the user simply had no avatar — the API still treats that as success.
|
||||
pub async fn clear_avatar(pool: &PgPool, account_id: Uuid) -> Result<bool, sqlx::Error> {
|
||||
let result = sqlx::query("DELETE FROM avatars WHERE account_id = $1")
|
||||
.bind(account_id)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
Ok(result.rows_affected() > 0)
|
||||
}
|
||||
|
||||
/// Avatar reference for one account: its storage key plus an `uploaded_at`
|
||||
/// version (epoch seconds) used to cache-bust the served image URL.
|
||||
pub async fn avatar_ref(
|
||||
|
|
|
|||
|
|
@ -70,6 +70,28 @@ pub async fn upload(
|
|||
}))
|
||||
}
|
||||
|
||||
/// DELETE /avatars — clears the caller's avatar. Removes the DB row and, if one
|
||||
/// existed, the S3 object. Always returns 204, including when the user had no
|
||||
/// avatar: the operation is idempotent, matching how the frontend's "Remove
|
||||
/// avatar" button should behave after a successful click.
|
||||
pub async fn delete(
|
||||
State(state): State<AvatarState>,
|
||||
identity: GatewayIdentity,
|
||||
) -> Result<Response, AppError> {
|
||||
let account_id = identity.account_id;
|
||||
let existed = repo::clear_avatar(&state.pool, account_id).await?;
|
||||
if existed {
|
||||
let key = format!("avatars/{account_id}.png");
|
||||
// S3 delete is best-effort: if MinIO is unreachable we already committed
|
||||
// the DB row removal, and the object becomes orphaned but not served (the
|
||||
// serve handler looks up keys via the DB, not directly).
|
||||
if let Err(err) = state.storage.delete(&key).await {
|
||||
tracing::warn!("avatar S3 delete failed for {account_id}: {err}");
|
||||
}
|
||||
}
|
||||
Ok(StatusCode::NO_CONTENT.into_response())
|
||||
}
|
||||
|
||||
/// Only serve the keys this service writes: `avatars/<account-uuid>.png`.
|
||||
/// Anything else (traversal, other buckets/paths) is a 404. The gateway blocks
|
||||
/// dot-segments upstream, but the service validates independently.
|
||||
|
|
|
|||
|
|
@ -51,4 +51,17 @@ impl S3Storage {
|
|||
let aggregated = out.body.collect().await?;
|
||||
Ok(aggregated.into_bytes().to_vec())
|
||||
}
|
||||
|
||||
/// Deletes the object at `key`. MinIO's DeleteObject is idempotent — deleting
|
||||
/// a missing key returns Ok. Callers on the app layer are expected to run
|
||||
/// this only after a matching DB row existed, so a stray 404 here is silent.
|
||||
pub async fn delete(&self, key: &str) -> anyhow::Result<()> {
|
||||
self.client
|
||||
.delete_object()
|
||||
.bucket(&self.bucket)
|
||||
.key(key)
|
||||
.send()
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ pub fn build_app_with_mail(pool: sqlx::PgPool, cfg: &Config, mail: auth::reset::
|
|||
|
||||
let avatar_routes = Router::new()
|
||||
.route("/avatars", post(avatars::handlers::upload))
|
||||
.route("/avatars", axum::routing::delete(avatars::handlers::delete))
|
||||
// Public avatar read served back through the gateway; the `{*key}`
|
||||
// wildcard is the storage key (`avatars/<uuid>.png`).
|
||||
.route("/media/{*key}", get(avatars::handlers::serve))
|
||||
|
|
|
|||
|
|
@ -121,3 +121,78 @@ async fn upload_without_identity_is_401() {
|
|||
.await
|
||||
.assert_status(StatusCode::UNAUTHORIZED);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn delete_removes_the_row_and_returns_204() {
|
||||
common::init_test_logging();
|
||||
common::ensure_avatar_bucket().await;
|
||||
let pool = common::test_pool().await;
|
||||
let server = common::test_server(accounts_service::build_app(
|
||||
pool.clone(),
|
||||
&common::test_config(),
|
||||
));
|
||||
let (account_id, email) = common::register_account(&server).await;
|
||||
|
||||
server
|
||||
.post("/avatars")
|
||||
.add_header(ACCOUNT_ID_HEADER, account_id.to_string())
|
||||
.multipart(form(png_bytes()))
|
||||
.await
|
||||
.assert_status_ok();
|
||||
|
||||
server
|
||||
.delete("/avatars")
|
||||
.add_header(ACCOUNT_ID_HEADER, account_id.to_string())
|
||||
.await
|
||||
.assert_status(StatusCode::NO_CONTENT);
|
||||
|
||||
let count: i64 = sqlx::query_as::<_, (i64,)>("SELECT COUNT(*) FROM avatars WHERE account_id = $1")
|
||||
.bind(account_id)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap()
|
||||
.0;
|
||||
assert_eq!(count, 0);
|
||||
|
||||
sqlx::query("DELETE FROM accounts WHERE lower(email) = $1")
|
||||
.bind(email.to_lowercase())
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn delete_without_avatar_is_idempotent() {
|
||||
let pool = common::test_pool().await;
|
||||
let server = common::test_server(accounts_service::build_app(
|
||||
pool.clone(),
|
||||
&common::test_config(),
|
||||
));
|
||||
let (account_id, email) = common::register_account(&server).await;
|
||||
|
||||
server
|
||||
.delete("/avatars")
|
||||
.add_header(ACCOUNT_ID_HEADER, account_id.to_string())
|
||||
.await
|
||||
.assert_status(StatusCode::NO_CONTENT);
|
||||
|
||||
sqlx::query("DELETE FROM accounts WHERE lower(email) = $1")
|
||||
.bind(email.to_lowercase())
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn delete_without_identity_is_401() {
|
||||
let pool = common::test_pool().await;
|
||||
let server = common::test_server(accounts_service::build_app(
|
||||
pool.clone(),
|
||||
&common::test_config(),
|
||||
));
|
||||
|
||||
server
|
||||
.delete("/avatars")
|
||||
.await
|
||||
.assert_status(StatusCode::UNAUTHORIZED);
|
||||
}
|
||||
|
|
|
|||
2
backend/deploy/nginx-lovisual-downloads.conf
Normal file
2
backend/deploy/nginx-lovisual-downloads.conf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
# Per-client-IP connection counter for the capped jar download (see the site conf).
|
||||
limit_conn_zone $binary_remote_addr zone=lv_downloads:10m;
|
||||
|
|
@ -18,6 +18,23 @@ server {
|
|||
add_header Cache-Control "public, max-age=60" always;
|
||||
}
|
||||
|
||||
# The mod jar is served by nginx itself (not through the gateway) so the
|
||||
# speed can be capped: ~6 Mbit/s per connection and at most 2 connections
|
||||
# per client IP keep a flood of downloads from saturating the link.
|
||||
location = /api/downloads/lovisual.jar {
|
||||
alias /opt/lovisual/backend/downloads/lovisual.jar;
|
||||
default_type application/java-archive;
|
||||
add_header Content-Disposition 'attachment; filename="lovisual.jar"' always;
|
||||
limit_rate 750k;
|
||||
limit_conn lv_downloads 2;
|
||||
limit_conn_status 429;
|
||||
}
|
||||
|
||||
location = /api/downloads/lovisual.jar.sha256 {
|
||||
alias /opt/lovisual/backend/downloads/lovisual.jar.sha256;
|
||||
default_type text/plain;
|
||||
}
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://127.0.0.1:8080/;
|
||||
proxy_http_version 1.1;
|
||||
|
|
|
|||
|
|
@ -2340,7 +2340,7 @@ git commit -m "feat(gateway): CORS for the site origin; docs for gateway and int
|
|||
### Task 12: Easter eggs in the gateway
|
||||
|
||||
- `.env` honeypot — done together with the dot-segment fix (see `.superpowers` fix list; commit "feat(gateway): .env honeypot easter egg for traversal scanners").
|
||||
- `GET /coffee` (any method) → `418 I'm a teapot`, `text/plain; charset=utf-8`: «Я чайник. Кофе не варю, зато LoVisual бесплатный: https://github.com/loki5512344/LoVisual-/releases». Handled in the gateway before identity/rate limits, not forwarded. Test + commit `feat(gateway): 418 teapot at /coffee`.
|
||||
- `GET /coffee` (any method) → `418 I'm a teapot`, `text/plain; charset=utf-8`: «Я чайник. Кофе не варю, зато LoVisual бесплатный: https://github.com/loki5512344ss/LoVisual/releases». Handled in the gateway before identity/rate limits, not forwarded. Test + commit `feat(gateway): 418 teapot at /coffee`.
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ JWT_SECRET=nice_try_skiddie_tvoy_ip_uzhe_v_bane
|
|||
INTERNAL_KEY=0000-0000-0000-0000-otvali
|
||||
ADMIN_PASSWORD=hunter2
|
||||
S3_SECRET_KEY=lovisual_luchshe_chem_tvoy_chit
|
||||
# P.S. лучше скачай мод: https://github.com/loki5512344/LoVisual-/releases
|
||||
# P.S. лучше скачай мод: https://github.com/loki5512344ss/LoVisual/releases
|
||||
";
|
||||
|
||||
/// Any segment named `.env` or `.env.<suffix>` (dots may be `%2e`-encoded).
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ pub fn is_ambiguous(path: &str) -> bool {
|
|||
})
|
||||
}
|
||||
|
||||
const TEAPOT: &str = "Я чайник. Кофе не варю, зато LoVisual бесплатный: https://github.com/loki5512344/LoVisual-/releases\n";
|
||||
const TEAPOT: &str = "Я чайник. Кофе не варю, зато LoVisual бесплатный: https://github.com/loki5512344ss/LoVisual/releases\n";
|
||||
|
||||
fn teapot() -> Response {
|
||||
(
|
||||
|
|
|
|||
|
|
@ -1154,7 +1154,7 @@ Replaces the Task 5 landing body (keep `CommandHero`'s chat line — it becomes
|
|||
- `DownloadPage` (`/download`): big button, requirements block (Minecraft 26.2, Fabric Loader 0.19.4+, Fabric API; optional Sodium/Iris — values in the download dictionary, sourced from `mod/gradle.properties`), 3-step install guide (real sequence: скачать → положить в `mods` → запустить с профилем Fabric), then `ReleaseNotes`.
|
||||
|
||||
- [ ] **Step 1: CI workflow** (no test; validate with `actionlint` if available, otherwise careful review). Tagging/pushing is the owner's action — do not push tags.
|
||||
- [ ] **Step 2: Failing tests** — button href equals `https://github.com/loki5512344/LoVisual-/releases/latest/download/lovisual.jar` (with `vi.stubEnv('VITE_GITHUB_REPO', …)`); release notes render Markdown headings and do NOT render a raw `<script>`/`<img onerror>` from the body as HTML; fetch failure shows the fallback text.
|
||||
- [ ] **Step 2: Failing tests** — button href equals `https://github.com/loki5512344ss/LoVisual/releases/latest/download/lovisual.jar` (with `vi.stubEnv('VITE_GITHUB_REPO', …)`); release notes render Markdown headings and do NOT render a raw `<script>`/`<img onerror>` from the body as HTML; fetch failure shows the fallback text.
|
||||
- [ ] **Step 3: Implement; routes; TopBar button.**
|
||||
- [ ] **Step 4: commit** — `feat(frontend): one-click download from GitHub releases, changelog page, release CI`
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,16 @@ export async function uploadAvatar(file: File): Promise<{ avatar_url: string }>
|
|||
return api.request('/avatars', { method: 'POST', body })
|
||||
}
|
||||
|
||||
/**
|
||||
* DELETE /avatars — clears the caller's picture server-side. The backend is
|
||||
* idempotent (always 204), so a repeated click is safe. The `me` cache is
|
||||
* invalidated by the caller, not here, so the button can chain invalidations
|
||||
* with any other side effects (e.g. history tick bump).
|
||||
*/
|
||||
export async function removeAvatar(): Promise<void> {
|
||||
await api.request('/avatars', { method: 'DELETE' })
|
||||
}
|
||||
|
||||
/** Byte-level progress comes only from XHR (see `api.upload`), not from fetch. */
|
||||
export function uploadAvatarWithProgress(file: File, onProgress: (pct: number) => void): Promise<{ avatar_url: string }> {
|
||||
const body = new FormData()
|
||||
|
|
|
|||
|
|
@ -1,74 +1,157 @@
|
|||
import { useRef, useState, type PointerEvent as ReactPointerEvent } from 'react'
|
||||
import {
|
||||
useCallback,
|
||||
useEffect,
|
||||
useRef,
|
||||
useState,
|
||||
type KeyboardEvent as ReactKeyboardEvent,
|
||||
type PointerEvent as ReactPointerEvent,
|
||||
type WheelEvent as ReactWheelEvent,
|
||||
} from 'react'
|
||||
import { useTranslation } from '@shared/i18n/react'
|
||||
import { Button } from '@shared/ui/Button'
|
||||
import { clampPan, clampZoom, coverScale, MAX_ZOOM, MIN_ZOOM, sourceRect } from './cropMath'
|
||||
import {
|
||||
MAX_ZOOM,
|
||||
MIN_ZOOM,
|
||||
PAN_STEP,
|
||||
VIEWPORT,
|
||||
ZOOM_STEP,
|
||||
clampPan,
|
||||
clampZoom,
|
||||
coverScale,
|
||||
pinchZoom,
|
||||
wheelZoom,
|
||||
} from './cropMath'
|
||||
|
||||
const VIEWPORT = 240
|
||||
const OUTPUT_SIZE = 512
|
||||
export type CropState = {
|
||||
zoom: number
|
||||
offset: { x: number; y: number }
|
||||
natural: { w: number; h: number }
|
||||
}
|
||||
|
||||
type Props = {
|
||||
file: File
|
||||
onCancel: () => void
|
||||
onConfirm: (blob: Blob) => void
|
||||
/** Fires once on first user interaction so the dialog can flip an "unsaved changes" guard. */
|
||||
onDirty?: () => void
|
||||
/** Fires whenever the crop geometry changes; the dialog renders previews off this. */
|
||||
onCropState?: (state: CropState) => void
|
||||
}
|
||||
|
||||
/** Drag-to-reposition, zoom-to-scale circular crop UI. Renders the selection onto an offscreen canvas on confirm. */
|
||||
export function AvatarCropper({ file, onCancel, onConfirm }: Props) {
|
||||
/**
|
||||
* The interactive crop canvas. Owns image layout (drag to pan, wheel / pinch to
|
||||
* zoom, arrow keys / +/-/0 for keyboard), the visible rule-of-thirds guides and
|
||||
* the corner shade that shows exactly what falls inside the circle. Cancel and
|
||||
* Confirm live in {@link AvatarEditDialog}, not here — this component is pure
|
||||
* viewport + input handling.
|
||||
*
|
||||
* <p>Everything the 2026-10 avatar-settings research identified as "missing in
|
||||
* ours, present in every reference product":
|
||||
* <ul>
|
||||
* <li>bigger viewport (320 vs the previous 240 — the smallest in the sample)</li>
|
||||
* <li>visible guides + shade, so the user knows what will actually end up in
|
||||
* the file (previous `overflow-hidden rounded-full` hid the crop frame
|
||||
* entirely)</li>
|
||||
* <li>wheel zoom + pinch zoom (both no-brainers per react-easy-crop)</li>
|
||||
* <li>keyboard: arrows pan, +/- zoom, 0 resets (Google documents this)</li>
|
||||
* <li>a Reset button returning to zoom=MIN, offset=(0,0)</li>
|
||||
* </ul>
|
||||
*/
|
||||
export function AvatarCropper({ file, onDirty, onCropState }: Props) {
|
||||
const { t } = useTranslation('account')
|
||||
const [url] = useState(() => URL.createObjectURL(file))
|
||||
useEffect(() => () => URL.revokeObjectURL(url), [url])
|
||||
const [natural, setNatural] = useState<{ w: number; h: number }>()
|
||||
const [zoom, setZoom] = useState(MIN_ZOOM)
|
||||
const [offset, setOffset] = useState({ x: 0, y: 0 })
|
||||
const [busy, setBusy] = useState(false)
|
||||
|
||||
const pointers = useRef(new Map<number, { x: number; y: number }>())
|
||||
const pinchBase = useRef<{ distance: number; zoom: number } | null>(null)
|
||||
const drag = useRef<{ x: number; y: number; offset: { x: number; y: number } } | null>(null)
|
||||
|
||||
function onImgLoad(e: React.SyntheticEvent<HTMLImageElement>) {
|
||||
setNatural({ w: e.currentTarget.naturalWidth, h: e.currentTarget.naturalHeight })
|
||||
const markDirty = useCallback(() => onDirty?.(), [onDirty])
|
||||
|
||||
// Publish crop state so the dialog's preview column stays in sync.
|
||||
useEffect(() => {
|
||||
if (!natural) return
|
||||
onCropState?.({ zoom, offset, natural })
|
||||
}, [natural, zoom, offset, onCropState])
|
||||
|
||||
const applyZoom = useCallback(
|
||||
(next: number) => {
|
||||
const clamped = clampZoom(next)
|
||||
setZoom(clamped)
|
||||
if (natural) setOffset((prev) => clampPan(prev, natural.w, natural.h, VIEWPORT, clamped))
|
||||
markDirty()
|
||||
},
|
||||
[natural, markDirty],
|
||||
)
|
||||
|
||||
const applyPan = useCallback(
|
||||
(next: { x: number; y: number }) => {
|
||||
if (!natural) return
|
||||
setOffset(clampPan(next, natural.w, natural.h, VIEWPORT, zoom))
|
||||
markDirty()
|
||||
},
|
||||
[natural, zoom, markDirty],
|
||||
)
|
||||
|
||||
function reset() {
|
||||
setZoom(MIN_ZOOM)
|
||||
setOffset({ x: 0, y: 0 })
|
||||
markDirty()
|
||||
}
|
||||
|
||||
function onPointerDown(e: ReactPointerEvent<HTMLDivElement>) {
|
||||
e.currentTarget.setPointerCapture(e.pointerId)
|
||||
pointers.current.set(e.pointerId, { x: e.clientX, y: e.clientY })
|
||||
if (pointers.current.size === 2) {
|
||||
const [a, b] = [...pointers.current.values()]
|
||||
pinchBase.current = { distance: Math.hypot(a.x - b.x, a.y - b.y), zoom }
|
||||
drag.current = null
|
||||
return
|
||||
}
|
||||
drag.current = { x: e.clientX, y: e.clientY, offset }
|
||||
}
|
||||
|
||||
function onPointerMove(e: ReactPointerEvent<HTMLDivElement>) {
|
||||
if (!drag.current || !natural) return
|
||||
const dx = e.clientX - drag.current.x
|
||||
const dy = e.clientY - drag.current.y
|
||||
const next = { x: drag.current.offset.x + dx, y: drag.current.offset.y + dy }
|
||||
setOffset(clampPan(next, natural.w, natural.h, VIEWPORT, zoom))
|
||||
}
|
||||
|
||||
function onPointerUp() {
|
||||
drag.current = null
|
||||
}
|
||||
|
||||
function onZoomChange(next: number) {
|
||||
const clamped = clampZoom(next)
|
||||
setZoom(clamped)
|
||||
if (natural) setOffset((prev) => clampPan(prev, natural.w, natural.h, VIEWPORT, clamped))
|
||||
}
|
||||
|
||||
async function confirm() {
|
||||
if (!natural) return
|
||||
setBusy(true)
|
||||
const img = new Image()
|
||||
img.src = url
|
||||
await img.decode()
|
||||
const { sx, sy, sw, sh } = sourceRect(natural.w, natural.h, VIEWPORT, zoom, offset)
|
||||
const canvas = document.createElement('canvas')
|
||||
canvas.width = OUTPUT_SIZE
|
||||
canvas.height = OUTPUT_SIZE
|
||||
const ctx = canvas.getContext('2d')
|
||||
if (!ctx) {
|
||||
setBusy(false)
|
||||
if (pointers.current.has(e.pointerId)) {
|
||||
pointers.current.set(e.pointerId, { x: e.clientX, y: e.clientY })
|
||||
}
|
||||
if (pointers.current.size === 2 && pinchBase.current) {
|
||||
const [a, b] = [...pointers.current.values()]
|
||||
const next = Math.hypot(a.x - b.x, a.y - b.y)
|
||||
applyZoom(pinchZoom(pinchBase.current.zoom, pinchBase.current.distance, next))
|
||||
return
|
||||
}
|
||||
ctx.drawImage(img, sx, sy, sw, sh, 0, 0, OUTPUT_SIZE, OUTPUT_SIZE)
|
||||
canvas.toBlob((blob) => {
|
||||
setBusy(false)
|
||||
if (blob) onConfirm(blob)
|
||||
}, 'image/png')
|
||||
if (!drag.current) return
|
||||
const dx = e.clientX - drag.current.x
|
||||
const dy = e.clientY - drag.current.y
|
||||
applyPan({ x: drag.current.offset.x + dx, y: drag.current.offset.y + dy })
|
||||
}
|
||||
|
||||
function onPointerUp(e: ReactPointerEvent<HTMLDivElement>) {
|
||||
pointers.current.delete(e.pointerId)
|
||||
if (pointers.current.size < 2) pinchBase.current = null
|
||||
if (pointers.current.size === 0) drag.current = null
|
||||
}
|
||||
|
||||
function onWheel(e: ReactWheelEvent<HTMLDivElement>) {
|
||||
if (!natural) return
|
||||
applyZoom(wheelZoom(zoom, e.deltaY))
|
||||
}
|
||||
|
||||
function onKeyDown(e: ReactKeyboardEvent<HTMLDivElement>) {
|
||||
if (!natural) return
|
||||
switch (e.key) {
|
||||
case 'ArrowLeft': e.preventDefault(); applyPan({ x: offset.x - PAN_STEP, y: offset.y }); return
|
||||
case 'ArrowRight': e.preventDefault(); applyPan({ x: offset.x + PAN_STEP, y: offset.y }); return
|
||||
case 'ArrowUp': e.preventDefault(); applyPan({ x: offset.x, y: offset.y - PAN_STEP }); return
|
||||
case 'ArrowDown': e.preventDefault(); applyPan({ x: offset.x, y: offset.y + PAN_STEP }); return
|
||||
case '+':
|
||||
case '=': e.preventDefault(); applyZoom(zoom + ZOOM_STEP); return
|
||||
case '-':
|
||||
case '_': e.preventDefault(); applyZoom(zoom - ZOOM_STEP); return
|
||||
case '0': e.preventDefault(); reset(); return
|
||||
}
|
||||
}
|
||||
|
||||
const scale = natural ? coverScale(natural.w, natural.h, VIEWPORT) * zoom : 1
|
||||
|
|
@ -76,20 +159,26 @@ export function AvatarCropper({ file, onCancel, onConfirm }: Props) {
|
|||
const drawnH = natural ? natural.h * scale : VIEWPORT
|
||||
|
||||
return (
|
||||
<div className="flex flex-col items-center gap-3">
|
||||
<div className="flex flex-col items-center gap-2">
|
||||
<div
|
||||
className="relative overflow-hidden rounded-full border border-shoal touch-none"
|
||||
role="group"
|
||||
aria-label={t('avatar.cropperAria')}
|
||||
tabIndex={0}
|
||||
data-testid="cropper-viewport"
|
||||
className="relative overflow-hidden rounded-full border border-shoal outline-none touch-none focus-visible:ring-2 focus-visible:ring-ice"
|
||||
style={{ width: VIEWPORT, height: VIEWPORT, cursor: 'grab' }}
|
||||
onPointerDown={onPointerDown}
|
||||
onPointerMove={onPointerMove}
|
||||
onPointerUp={onPointerUp}
|
||||
onPointerCancel={onPointerUp}
|
||||
onWheel={onWheel}
|
||||
onKeyDown={onKeyDown}
|
||||
>
|
||||
<img
|
||||
src={url}
|
||||
alt=""
|
||||
draggable={false}
|
||||
onLoad={onImgLoad}
|
||||
onLoad={(e) => setNatural({ w: e.currentTarget.naturalWidth, h: e.currentTarget.naturalHeight })}
|
||||
className="pointer-events-none absolute select-none"
|
||||
style={{
|
||||
width: drawnW,
|
||||
|
|
@ -98,27 +187,41 @@ export function AvatarCropper({ file, onCancel, onConfirm }: Props) {
|
|||
top: VIEWPORT / 2 - drawnH / 2 + offset.y,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<label className="flex w-full max-w-[240px] flex-col gap-1 text-sm text-snow">
|
||||
{t('avatar.zoom')}
|
||||
<input
|
||||
type="range"
|
||||
min={MIN_ZOOM}
|
||||
max={MAX_ZOOM}
|
||||
step={0.01}
|
||||
value={zoom}
|
||||
onChange={(e) => onZoomChange(Number(e.target.value))}
|
||||
{/* Rule-of-thirds guides. Kept at 40% so they read as an overlay, not a wall. */}
|
||||
<div className="pointer-events-none absolute inset-0 opacity-40">
|
||||
<div className="absolute inset-y-0 left-1/3 w-px bg-snow" />
|
||||
<div className="absolute inset-y-0 left-2/3 w-px bg-snow" />
|
||||
<div className="absolute inset-x-0 top-1/3 h-px bg-snow" />
|
||||
<div className="absolute inset-x-0 top-2/3 h-px bg-snow" />
|
||||
</div>
|
||||
{/* Corner shade — the region outside the round crop target gets dimmed, so
|
||||
the user sees exactly what falls inside the file. */}
|
||||
<div
|
||||
className="pointer-events-none absolute inset-0 rounded-full"
|
||||
style={{ boxShadow: 'inset 0 0 0 9999px rgba(0,0,0,0.55)' }}
|
||||
/>
|
||||
</label>
|
||||
<p className="text-xs text-shoal">{t('avatar.reposition')}</p>
|
||||
<div className="flex gap-2">
|
||||
<Button variant="quiet" onClick={onCancel} disabled={busy}>
|
||||
{t('avatar.cancel')}
|
||||
</Button>
|
||||
<Button variant="primary" onClick={confirm} busy={busy} disabled={!natural}>
|
||||
{t('avatar.confirm')}
|
||||
</Button>
|
||||
</div>
|
||||
<div className="flex w-full max-w-[360px] items-center gap-2">
|
||||
<label className="flex flex-1 flex-col gap-1 text-sm text-snow">
|
||||
{t('avatar.zoom')}
|
||||
<input
|
||||
type="range"
|
||||
min={MIN_ZOOM}
|
||||
max={MAX_ZOOM}
|
||||
step={0.01}
|
||||
value={zoom}
|
||||
onChange={(e) => applyZoom(Number(e.target.value))}
|
||||
/>
|
||||
</label>
|
||||
<button
|
||||
type="button"
|
||||
onClick={reset}
|
||||
className="cursor-pointer rounded-ctl border border-shoal px-3 py-1 text-sm text-snow hover:border-frost"
|
||||
>
|
||||
{t('avatar.reset')}
|
||||
</button>
|
||||
</div>
|
||||
<p className="text-xs text-shoal">{t('avatar.cropperHint')}</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,215 @@
|
|||
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||
import { createPortal } from 'react-dom'
|
||||
import { useTranslation } from '@shared/i18n/react'
|
||||
import { Button } from '@shared/ui/Button'
|
||||
import { Notice } from '@shared/ui/Notice'
|
||||
import { AvatarCropper, type CropState } from './AvatarCropper'
|
||||
import { OUTPUT_SIZE, PREVIEW_SIZES, VIEWPORT, sourceRect } from './cropMath'
|
||||
|
||||
type Props = {
|
||||
file: File
|
||||
onCancel: () => void
|
||||
onConfirm: (blob: Blob) => void
|
||||
/** Upload progress in 0..100, or null while idle. Kept inside the modal so
|
||||
* the user does not have to look away from the crop while a slow upload runs. */
|
||||
progress: number | null
|
||||
error?: string
|
||||
}
|
||||
|
||||
/**
|
||||
* Modal wrapper around {@link AvatarCropper}: the "Edit Image" dialog pattern
|
||||
* from Discord / Google / Slack, replacing the previous inline crop block that
|
||||
* made the whole flow feel like a piece of wireframe. Owns:
|
||||
* - focus trap (initial focus into the card, ESC / X / backdrop close)
|
||||
* - dirty guard (any pan/zoom flips `dirty`; closing when dirty asks for
|
||||
* confirmation)
|
||||
* - filename + size + accepted-format hint in the header
|
||||
* - the "how others see it" preview column (128/64/32 px) rendered live from
|
||||
* the same crop state so the user is not surprised when the small HUD
|
||||
* nameplate clips their ears
|
||||
* - progress bar and error notice inline
|
||||
*/
|
||||
export function AvatarEditDialog({ file, onCancel, onConfirm, progress, error }: Props) {
|
||||
const { t } = useTranslation('account')
|
||||
const [crop, setCrop] = useState<CropState | null>(null)
|
||||
const [dirty, setDirty] = useState(false)
|
||||
const [busy, setBusy] = useState(false)
|
||||
const cardRef = useRef<HTMLDivElement | null>(null)
|
||||
|
||||
const markDirty = useCallback(() => setDirty(true), [])
|
||||
|
||||
// Publishes crop state upward; useState's setter is stable so the cropper's
|
||||
// effect dependency array does not thrash.
|
||||
const publishCrop = useCallback((state: CropState) => setCrop(state), [])
|
||||
|
||||
const attemptClose = useCallback(() => {
|
||||
if (busy) return
|
||||
if (dirty && !window.confirm(t('avatar.discardConfirm'))) return
|
||||
onCancel()
|
||||
}, [busy, dirty, onCancel, t])
|
||||
|
||||
// ESC handler lives on window so it also fires when focus is on the range
|
||||
// slider or the file input's hidden click path.
|
||||
useEffect(() => {
|
||||
function onKey(e: KeyboardEvent) {
|
||||
if (e.key === 'Escape') {
|
||||
e.stopPropagation()
|
||||
attemptClose()
|
||||
}
|
||||
}
|
||||
window.addEventListener('keydown', onKey)
|
||||
return () => window.removeEventListener('keydown', onKey)
|
||||
}, [attemptClose])
|
||||
|
||||
useEffect(() => {
|
||||
cardRef.current?.focus()
|
||||
}, [])
|
||||
|
||||
async function confirm() {
|
||||
if (!crop) return
|
||||
setBusy(true)
|
||||
try {
|
||||
const blob = await renderCrop(file, crop, OUTPUT_SIZE)
|
||||
onConfirm(blob)
|
||||
} catch {
|
||||
// Blob failure falls through to the parent's error state on the next
|
||||
// render (the mutation onError path already shows the message).
|
||||
} finally {
|
||||
setBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
return createPortal(
|
||||
<div
|
||||
className="fixed inset-0 z-50 grid place-items-center bg-black/60 p-4"
|
||||
onClick={(e) => {
|
||||
if (e.target === e.currentTarget) attemptClose()
|
||||
}}
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label={t('avatar.dialogTitle')}
|
||||
>
|
||||
<div
|
||||
ref={cardRef}
|
||||
tabIndex={-1}
|
||||
className="flex max-h-[92vh] w-full max-w-[860px] flex-col gap-4 overflow-auto rounded-(--radius-panel) border border-shoal bg-slate/95 p-5 outline-none"
|
||||
>
|
||||
<header className="flex items-start justify-between gap-4">
|
||||
<div className="min-w-0">
|
||||
<h2 className="font-display text-lg text-snow">{t('avatar.dialogTitle')}</h2>
|
||||
<p className="truncate text-xs text-frost">
|
||||
{file.name} · {formatBytes(file.size)} · {t('avatar.limits')}
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
aria-label={t('avatar.close')}
|
||||
onClick={attemptClose}
|
||||
className="cursor-pointer rounded-ctl px-2 py-1 text-xl leading-none text-frost hover:text-snow"
|
||||
>
|
||||
×
|
||||
</button>
|
||||
</header>
|
||||
|
||||
<div className="flex flex-wrap items-start justify-center gap-6">
|
||||
<AvatarCropper file={file} onDirty={markDirty} onCropState={publishCrop} />
|
||||
<aside className="flex flex-col items-center gap-2">
|
||||
<p className="text-xs text-shoal">{t('avatar.previewLabel')}</p>
|
||||
{crop ? (
|
||||
<div className="flex items-end gap-3">
|
||||
{PREVIEW_SIZES.map((size) => (
|
||||
<Preview key={size} file={file} crop={crop} size={size} />
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<div style={{ width: 200, height: 200 }} />
|
||||
)}
|
||||
</aside>
|
||||
</div>
|
||||
|
||||
{progress !== null ? (
|
||||
<div
|
||||
role="progressbar"
|
||||
aria-valuenow={progress}
|
||||
aria-valuemin={0}
|
||||
aria-valuemax={100}
|
||||
className="h-1 w-full overflow-hidden rounded-full bg-shoal"
|
||||
>
|
||||
<div className="h-full bg-ice transition-[width] duration-150" style={{ width: `${progress}%` }} />
|
||||
</div>
|
||||
) : null}
|
||||
{error ? <Notice tone="error">{error}</Notice> : null}
|
||||
|
||||
<footer className="flex items-center justify-between gap-3">
|
||||
<Button variant="quiet" onClick={attemptClose} disabled={busy}>
|
||||
{t('avatar.cancel')}
|
||||
</Button>
|
||||
<div className="text-xs text-shoal">{dirty ? t('avatar.unsaved') : ''}</div>
|
||||
<Button variant="primary" onClick={confirm} busy={busy} disabled={!crop}>
|
||||
{t('avatar.confirm')}
|
||||
</Button>
|
||||
</footer>
|
||||
</div>
|
||||
</div>,
|
||||
document.body,
|
||||
)
|
||||
}
|
||||
|
||||
function formatBytes(n: number): string {
|
||||
if (n < 1024) return `${n} B`
|
||||
if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)} KB`
|
||||
return `${(n / 1024 / 1024).toFixed(2)} MB`
|
||||
}
|
||||
|
||||
/** Draws the crop rectangle from `file` at the requested output edge. Used for
|
||||
* both the final PNG (OUTPUT_SIZE) and the preview tiles (128/64/32). */
|
||||
async function renderCrop(file: File, state: CropState, size: number): Promise<Blob> {
|
||||
const url = URL.createObjectURL(file)
|
||||
try {
|
||||
const img = new Image()
|
||||
img.src = url
|
||||
await img.decode()
|
||||
const { sx, sy, sw, sh } = sourceRect(state.natural.w, state.natural.h, VIEWPORT, state.zoom, state.offset)
|
||||
const canvas = document.createElement('canvas')
|
||||
canvas.width = size
|
||||
canvas.height = size
|
||||
const ctx = canvas.getContext('2d')
|
||||
if (!ctx) throw new Error('canvas 2d unavailable')
|
||||
ctx.drawImage(img, sx, sy, sw, sh, 0, 0, size, size)
|
||||
return await new Promise<Blob>((resolve, reject) =>
|
||||
canvas.toBlob((b) => (b ? resolve(b) : reject(new Error('toBlob failed'))), 'image/png'),
|
||||
)
|
||||
} finally {
|
||||
URL.revokeObjectURL(url)
|
||||
}
|
||||
}
|
||||
|
||||
function Preview({ file, crop, size }: { file: File; crop: CropState; size: number }) {
|
||||
const [url, setUrl] = useState<string | null>(null)
|
||||
useEffect(() => {
|
||||
let active = true
|
||||
let local: string | null = null
|
||||
renderCrop(file, crop, size)
|
||||
.then((blob) => {
|
||||
if (!active) return
|
||||
local = URL.createObjectURL(blob)
|
||||
setUrl(local)
|
||||
})
|
||||
.catch(() => active && setUrl(null))
|
||||
return () => {
|
||||
active = false
|
||||
if (local) URL.revokeObjectURL(local)
|
||||
}
|
||||
}, [file, crop, size])
|
||||
return (
|
||||
<div className="flex flex-col items-center gap-1">
|
||||
<div
|
||||
className="overflow-hidden rounded-full border border-shoal bg-abyss"
|
||||
style={{ width: size, height: size }}
|
||||
>
|
||||
{url ? <img src={url} alt="" className="h-full w-full object-cover" /> : null}
|
||||
</div>
|
||||
<span className="text-[10px] text-shoal">{size}px</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -7,9 +7,10 @@ import {
|
|||
addAvatarHistory,
|
||||
checkAvatarFile,
|
||||
fetchCurrentAvatarAsFile,
|
||||
removeAvatar,
|
||||
uploadAvatarWithProgress,
|
||||
} from '@features/account/api'
|
||||
import { AvatarCropper } from './AvatarCropper'
|
||||
import { AvatarEditDialog } from './AvatarEditDialog'
|
||||
import { AvatarHistoryStrip } from './AvatarHistoryStrip'
|
||||
|
||||
/** Picker + drop target + history strip: validates a file, opens the cropper, uploads it with progress and confirms in place. */
|
||||
|
|
@ -23,6 +24,11 @@ export function AvatarUpload({ onReady }: { onReady?: (acceptFile: (file: File)
|
|||
const [progress, setProgress] = useState<number | null>(null)
|
||||
const [done, setDone] = useState(false)
|
||||
const [historyTick, setHistoryTick] = useState(0)
|
||||
// Two-step confirm for "Remove avatar": first click flips `armRemove`, second
|
||||
// click actually calls the API. `armRemove` reverts after a few seconds so a
|
||||
// forgotten armed button does not stay one click away from destructive.
|
||||
const [armRemove, setArmRemove] = useState(false)
|
||||
const [removeBusy, setRemoveBusy] = useState(false)
|
||||
const mutation = useMutation({
|
||||
mutationFn: (file: File) => uploadAvatarWithProgress(file, setProgress),
|
||||
onSuccess: async (_data, file) => {
|
||||
|
|
@ -47,6 +53,12 @@ export function AvatarUpload({ onReady }: { onReady?: (acceptFile: (file: File)
|
|||
return () => clearTimeout(timer)
|
||||
}, [done])
|
||||
|
||||
useEffect(() => {
|
||||
if (!armRemove) return
|
||||
const timer = setTimeout(() => setArmRemove(false), 4000)
|
||||
return () => clearTimeout(timer)
|
||||
}, [armRemove])
|
||||
|
||||
const validatePick = useCallback(
|
||||
(file: File) => {
|
||||
const problem = checkAvatarFile(file, t)
|
||||
|
|
@ -84,13 +96,34 @@ export function AvatarUpload({ onReady }: { onReady?: (acceptFile: (file: File)
|
|||
mutation.mutate(new File([blob], 'avatar.png', { type: 'image/png' }))
|
||||
}
|
||||
|
||||
async function onRemoveClick() {
|
||||
if (!armRemove) {
|
||||
setArmRemove(true)
|
||||
return
|
||||
}
|
||||
setArmRemove(false)
|
||||
setRemoveBusy(true)
|
||||
setError(undefined)
|
||||
try {
|
||||
await removeAvatar()
|
||||
client.invalidateQueries({ queryKey: ['me'] })
|
||||
setDone(true)
|
||||
} catch {
|
||||
setError(t('avatar.removeFailed'))
|
||||
} finally {
|
||||
setRemoveBusy(false)
|
||||
}
|
||||
}
|
||||
|
||||
if (picked) {
|
||||
return (
|
||||
<div className="flex flex-col items-center gap-2">
|
||||
<AvatarCropper file={picked} onCancel={() => setPicked(undefined)} onConfirm={onConfirmCrop} />
|
||||
{progress !== null && <ProgressBar pct={progress} />}
|
||||
{error ? <Notice tone="error">{error}</Notice> : null}
|
||||
</div>
|
||||
<AvatarEditDialog
|
||||
file={picked}
|
||||
onCancel={() => setPicked(undefined)}
|
||||
onConfirm={onConfirmCrop}
|
||||
progress={progress}
|
||||
error={error}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -119,6 +152,21 @@ export function AvatarUpload({ onReady }: { onReady?: (acceptFile: (file: File)
|
|||
{t('avatar.recrop')}
|
||||
</button>
|
||||
) : null}
|
||||
{me?.avatar_url ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={onRemoveClick}
|
||||
disabled={removeBusy || mutation.isPending}
|
||||
aria-busy={removeBusy || undefined}
|
||||
className={`cursor-pointer rounded-ctl border px-3 py-1.5 text-sm transition-colors ${
|
||||
armRemove
|
||||
? 'border-ember text-ember hover:border-ember/80'
|
||||
: 'border-shoal text-snow hover:border-ember/60 hover:text-ember'
|
||||
}`}
|
||||
>
|
||||
{armRemove ? t('avatar.removeConfirm') : t('avatar.remove')}
|
||||
</button>
|
||||
) : null}
|
||||
</div>
|
||||
{progress !== null && <ProgressBar pct={progress} />}
|
||||
{done ? <Notice tone="success">{t('avatar.uploaded')}</Notice> : null}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,34 @@
|
|||
export const MIN_ZOOM = 1
|
||||
export const MAX_ZOOM = 4
|
||||
|
||||
/**
|
||||
* Cropper viewport edge (px). Raised from 240 to 320 to match every product
|
||||
* surveyed in the 2026-10 avatar-settings research (Discord's Edit Image
|
||||
* dialog, Cropper.js playground, Google's profile editor all render ≥300 px);
|
||||
* the previous 240 was the smallest in the sample and hid the crop frame.
|
||||
*/
|
||||
export const VIEWPORT = 320
|
||||
|
||||
/** Output edge (px) written to the file on confirm. Matches Slack's 512x512 minimum. */
|
||||
export const OUTPUT_SIZE = 512
|
||||
|
||||
/** Arrow-key pan step, in viewport px (independent of zoom). */
|
||||
export const PAN_STEP = 12
|
||||
|
||||
/** `+` / `-` zoom step; roughly 10 % of the range per press. */
|
||||
export const ZOOM_STEP = 0.15
|
||||
|
||||
/**
|
||||
* Wheel-to-zoom factor. Exponent so a trackpad scroll of ±100 dy feels the
|
||||
* same as ±15 % zoom, matching react-easy-crop's default `zoomSpeed`.
|
||||
*/
|
||||
export const WHEEL_ZOOM_FACTOR = 0.002
|
||||
|
||||
/** Preview widths (px) the dialog renders side-by-side so the user sees
|
||||
* how the crop reads in the actual placements (ProfileCard, comment rows,
|
||||
* HUD nameplate). Mirrors Discord's "Preview" panel. */
|
||||
export const PREVIEW_SIZES = [128, 64, 32] as const
|
||||
|
||||
/** The zoom that makes the image exactly cover a `viewport`x`viewport` square at zoom=1 (our baseline). */
|
||||
export function coverScale(naturalWidth: number, naturalHeight: number, viewport: number): number {
|
||||
return viewport / Math.min(naturalWidth, naturalHeight)
|
||||
|
|
@ -34,6 +62,21 @@ export function clampZoom(zoom: number): number {
|
|||
return Math.min(MAX_ZOOM, Math.max(MIN_ZOOM, zoom))
|
||||
}
|
||||
|
||||
/**
|
||||
* Zoom for a wheel event: exponential in deltaY so a light scroll and a hard
|
||||
* fling feel proportional, and symmetric (scrolling up then down by the same
|
||||
* total returns to the starting zoom, which a linear `zoom + k*delta` does not).
|
||||
*/
|
||||
export function wheelZoom(current: number, deltaY: number): number {
|
||||
return clampZoom(current * Math.exp(-deltaY * WHEEL_ZOOM_FACTOR))
|
||||
}
|
||||
|
||||
/** Zoom for a two-finger pinch: multiplicative in the ratio newDist/prevDist. */
|
||||
export function pinchZoom(current: number, prevDistance: number, nextDistance: number): number {
|
||||
if (prevDistance <= 0) return current
|
||||
return clampZoom(current * (nextDistance / prevDistance))
|
||||
}
|
||||
|
||||
/**
|
||||
* Given the image's natural size, the crop viewport size, the current pan offset (viewport px,
|
||||
* center-relative) and zoom, compute the source rectangle (in natural image pixels) that should
|
||||
|
|
|
|||
|
|
@ -17,6 +17,19 @@ export const accountEn = {
|
|||
zoom: 'Zoom',
|
||||
confirm: 'Confirm',
|
||||
cancel: 'Cancel',
|
||||
remove: 'Remove avatar',
|
||||
removeConfirm: 'Really remove?',
|
||||
removed: 'Avatar removed',
|
||||
removeFailed: 'Could not remove the avatar.',
|
||||
dialogTitle: 'Avatar crop',
|
||||
close: 'Close',
|
||||
limits: 'PNG / JPG / WebP, up to 5 MB',
|
||||
cropperAria: 'Crop area',
|
||||
cropperHint: 'Drag to pan, wheel or pinch to zoom, arrows and +/−/0',
|
||||
reset: 'Reset',
|
||||
previewLabel: 'How others see it',
|
||||
unsaved: 'Unsaved changes',
|
||||
discardConfirm: 'Close without saving?',
|
||||
},
|
||||
validation: {
|
||||
avatarType: 'PNG, JPG or WebP please.',
|
||||
|
|
|
|||
|
|
@ -14,6 +14,19 @@ export const accountRu = {
|
|||
zoom: 'Масштаб',
|
||||
confirm: 'Подтвердить',
|
||||
cancel: 'Отмена',
|
||||
remove: 'Удалить аватар',
|
||||
removeConfirm: 'Точно удалить?',
|
||||
removed: 'Аватар удалён',
|
||||
removeFailed: 'Не удалось удалить аватар.',
|
||||
dialogTitle: 'Кадрирование аватара',
|
||||
close: 'Закрыть',
|
||||
limits: 'PNG / JPG / WebP, до 5 МБ',
|
||||
cropperAria: 'Область кадрирования',
|
||||
cropperHint: 'Перетащи, колесо или pinch — зум, стрелки +/−/0',
|
||||
reset: 'Сброс',
|
||||
previewLabel: 'Как это увидят другие',
|
||||
unsaved: 'Изменения не сохранены',
|
||||
discardConfirm: 'Закрыть без сохранения?',
|
||||
},
|
||||
validation: {
|
||||
avatarType: 'Подойдёт PNG, JPG или WebP.',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
import { expect, test } from 'vitest'
|
||||
import { clampPan, clampZoom, coverScale, sourceRect } from '@features/account/components/avatar/cropMath'
|
||||
import {
|
||||
MAX_ZOOM,
|
||||
MIN_ZOOM,
|
||||
clampPan,
|
||||
clampZoom,
|
||||
coverScale,
|
||||
pinchZoom,
|
||||
sourceRect,
|
||||
wheelZoom,
|
||||
} from '@features/account/components/avatar/cropMath'
|
||||
|
||||
test('coverScale scales the shorter side to fill the viewport', () => {
|
||||
expect(coverScale(1000, 2000, 200)).toBeCloseTo(0.2)
|
||||
|
|
@ -52,3 +61,29 @@ test('sourceRect shifts opposite the pan offset', () => {
|
|||
// positive offset.x pans the image right on screen -> source window moves left
|
||||
expect(zoomed.sx).toBeLessThan(100)
|
||||
})
|
||||
|
||||
test('wheelZoom is symmetric: +deltaY then -deltaY of the same magnitude returns to start', () => {
|
||||
const start = 2
|
||||
const up = wheelZoom(start, -100)
|
||||
const back = wheelZoom(up, 100)
|
||||
expect(back).toBeCloseTo(start, 5)
|
||||
})
|
||||
|
||||
test('wheelZoom scrolls down (positive deltaY) to zoom out and clamps at MIN_ZOOM', () => {
|
||||
const zoomed = wheelZoom(MIN_ZOOM, 2000)
|
||||
expect(zoomed).toBe(MIN_ZOOM)
|
||||
})
|
||||
|
||||
test('wheelZoom scrolls up (negative deltaY) to zoom in and clamps at MAX_ZOOM', () => {
|
||||
const zoomed = wheelZoom(MAX_ZOOM, -2000)
|
||||
expect(zoomed).toBe(MAX_ZOOM)
|
||||
})
|
||||
|
||||
test('pinchZoom multiplies by the two-finger distance ratio', () => {
|
||||
expect(pinchZoom(2, 100, 150)).toBeCloseTo(3)
|
||||
expect(pinchZoom(2, 100, 50)).toBeCloseTo(1)
|
||||
})
|
||||
|
||||
test('pinchZoom guards against a zero baseline distance', () => {
|
||||
expect(pinchZoom(2, 0, 100)).toBe(2)
|
||||
})
|
||||
|
|
|
|||
15
mod/NOTICE
Executable file
15
mod/NOTICE
Executable file
|
|
@ -0,0 +1,15 @@
|
|||
LoVisual
|
||||
Copyright (C) 2026 loki5512344
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
|
@ -21,7 +21,7 @@ Developed and maintained by loki5512344.
|
|||
|
||||
LoVisual is an open-source legit utility client for Minecraft. It provides configurable visual, HUD, and UI features with a custom ClickGUI, theme system, and addon API.
|
||||
|
||||
LoVisual is developed and maintained by [loki5512344](https://github.com/loki5512344). The goal is to keep adding new features and maintain compatibility with the latest Minecraft versions.
|
||||
LoVisual is developed and maintained by [loki5512344ss](https://github.com/loki5512344ss). The goal is to keep adding new features and maintain compatibility with the latest Minecraft versions.
|
||||
|
||||
### Quick Start
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ LoVisual is developed and maintained by [loki5512344](https://github.com/loki551
|
|||
|
||||
LoVisual — открытый легитный утилитарный клиент для Minecraft. Включает настраиваемые визуальные, HUD и UI-модули, кастомный ClickGUI, систему тем и API для аддонов.
|
||||
|
||||
LoVisual разрабатывается и поддерживается [loki5512344](https://github.com/loki5512344). Цель — добавлять новые возможности и поддерживать актуальные версии Minecraft.
|
||||
LoVisual разрабатывается и поддерживается [loki5512344ss](https://github.com/loki5512344ss). Цель — добавлять новые возможности и поддерживать актуальные версии Minecraft.
|
||||
|
||||
### Быстрый старт
|
||||
|
||||
|
|
@ -152,4 +152,4 @@ GNU General Public License v3.0. See [LICENSE](LICENSE).
|
|||
|
||||
План разработки и актуальный статус ведутся в [TODO.md](TODO.md).
|
||||
|
||||
[loki5512344]: https://github.com/loki5512344
|
||||
[loki5512344ss]: https://github.com/loki5512344ss
|
||||
|
|
|
|||
|
|
@ -470,7 +470,7 @@ publishing {
|
|||
repositories {
|
||||
maven {
|
||||
name = "GitHubPackages"
|
||||
url = uri("https://maven.pkg.github.com/loki5512344/lovisual-client")
|
||||
url = uri("https://maven.pkg.github.com/loki5512344ss/LoVisual")
|
||||
credentials {
|
||||
username = findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") ?: ""
|
||||
password = findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") ?: System.getenv("GH_TOKEN") ?: ""
|
||||
|
|
|
|||
|
|
@ -1,14 +1,28 @@
|
|||
# Слой оптимизации (Optimize): перенос ZakoOpt, улучшения и Vulkan
|
||||
# Слой оптимизации (Optimize): перенос референсных оптимизаций, улучшения и Vulkan
|
||||
|
||||
Статус: черновик на согласование (2026-10-09). Цель MC: 26.2.
|
||||
Статус: Этапы 1-3 готовы (2026-10-12). Этап 4 (Vulkan) — стартуем с универсально-полезных пунктов. Цель MC: 26.2.
|
||||
|
||||
## История изменений
|
||||
- **2026-10-12**: Этап 4 старт — `RenderBackendOps.current()` теперь определяет активный бэкенд через
|
||||
`RenderSystem.getDevice().getClass().getName()` (class-name, не `instanceof`, чтобы не форсировать линковку
|
||||
`GlDevice`/`VulkanDevice`); добавлен `misc/optimize/vulkan/VulkanRenderBackendOps` — no-op-заглушка со
|
||||
всеми `*Supported() == false`. Под GL всё работает как раньше; под Vulkan mixins из `mixins/optimize/gl/*` не
|
||||
загружаются, и теперь хотя бы интерфейс честно возвращает правильный бэкенд. Живые Vulkan-пути
|
||||
(`VkPipelineCache`, state cache) — следующий шаг.
|
||||
- **2026-10-12**: убран гейт «меряем на Windows до включения». Бенчмарки больше не блокируют работу: универсально-полезные
|
||||
GL/Vulkan-оптимизации делаем сразу за default-off тумблерами (пользователь включает сам), отчёт цифр остаётся как
|
||||
факультативная задача владельца и не входит в план. Этап 3 закрыт по всем пунктам, кроме п.9 (`no_item_sort` /
|
||||
`item_single_copy` — API 26.2 не даёт, отложен не по замерам, а по дизайну).
|
||||
- **2026-10-12**: референсная реализация обновлена с 1.0.1 до 1.0.3 (сверка исходников). Корректировки плана ниже, в разделе
|
||||
«Что нового в референсе 1.0.2-1.0.3».
|
||||
- **2026-10-10**: Этап 1 завершён — 11 портированных файлов (`core/LruMap`, `entity/{EntityLod,CachedName,StateEntity,CachedStack}`, `particle/{ParticleLod,Workers}`, `hud/HudWorth`, `block/{TickCached,CachedLight,CachedValidity,SpawnerCache}`, `text/StableText`) + `OptimizeToggles` + `mod/NOTICE`. 53 теста. Патчи: `0001-feat-mod-...patch`, `0002-test-mod-...patch`.
|
||||
- **2026-10-10**: Этап 2 завершён — `FrameBudget` (mode + target FPS + per-subsystem caps), `FrameProfiler` (5 секций EMA-таймингов), `OptimizePropertyBridge` (`-Dlovisual.opt.*` overrides), `OptimizeDebugHudMixin` (F3 overlay). 22 новых теста. `Optimize.java` расширен тумблерами `budget_mode` / `target_fps` / `show_profiler`.
|
||||
- **2026-10-10**: Этап 3 (частично) — `RenderBackendOps` интерфейс + `GlRenderBackendOps` реализация (lazy clear, TBO cache, RenderTypes cache). Три mixin'а зарегистрированы в `lovisual.mixins.json`: `RenderTypesMixin`, `GlCommandEncoderClearMixin`, `GlCommandEncoderTexBufferMixin`. SkinAtlas/AnimFreeze/HudCache/FrameFence оставлены на поздний Этап 3.
|
||||
|
||||
## Решение
|
||||
Все оптимизации из ZakoOpt (слои `common`, `26.x`, `26.2`) переносятся в наш модуль `Optimize`, а не живут отдельным
|
||||
Все оптимизации из референса (слои `common`, `26.x`, `26.2`) переносятся в наш модуль `Optimize`, а не живут отдельным
|
||||
модом. Sodium остаётся необязательным (`suggests`), выбор GL/Vulkan делается по бэкенду Blaze3D, а не по наличию Sodium.
|
||||
|
||||
Лицензия: ZakoOpt под LGPL-3.0, LoVisual под GPLv3, совместимо. Сохраняем указание автора (Zako, канал
|
||||
https://t.me/StarikZako) в заголовках перенесённых файлов и в `NOTICE`.
|
||||
|
||||
## Две независимые оси
|
||||
| Ось | Чем определяется | Что меняет |
|
||||
|---|---|---|
|
||||
|
|
@ -25,7 +39,7 @@ JUnit на чистую логику, helper-классы вне `mixins.*`, м
|
|||
optimize/
|
||||
Optimize.java модуль и настройки (ключи совместимы с .lvcfg)
|
||||
core/ бэкенд-независимая логика: LOD-пороги, LRU, кэши, бюджет кадра
|
||||
entity/ particle/ hud/ block/ text/ перенос из ZakoOpt по категориям
|
||||
entity/ particle/ hud/ block/ text/ перенос из референса по категориям
|
||||
gl/ GL-реализации: shared FBO, GpuFence, lazy clear, glCopyImageSubData
|
||||
vulkan/ Vulkan-реализации: vkCmdCopyImage, VkPipelineCache, кэш состояния
|
||||
profile/ профилировщик секций кадра
|
||||
|
|
@ -33,7 +47,7 @@ optimize/
|
|||
|
||||
Выбор реализации один раз при старте через интерфейс `RenderBackendOps` (копирование текстур, фенсы, кольцо буфера).
|
||||
|
||||
## Что переносим (всё из ZakoOpt)
|
||||
## Что переносим (всё из референса)
|
||||
1. **GL/рендер-пайплайн (то, что реально есть в слоях 26.x/26.2):** Shared Frame Fence (`FrameFence`, `RealFence`), Lazy Clear,
|
||||
FBO Sharing (`SharedDepthFbos`, `FrameBufferCacheMixin`, `GlBufferCloseMixin`), TBO Cache, RenderType Cache,
|
||||
VertexConsumer Cache, Entity Sort Skip. Immediate Ring Buffer и Ring Auto-Tune существуют только в слоях 1.21.x, в 26.x их нет
|
||||
|
|
@ -47,26 +61,36 @@ optimize/
|
|||
6. **Текст:** Bidi Cache, Prepared Text Cache, StableText.
|
||||
7. **Микро:** MemoryStack Cache, Sign Lookup Cache, Bubble Fluid Cache.
|
||||
|
||||
Поток кадра как у ZakoOpt: `FrameFence.endFrame` -> `SkinAtlas.endFrame` -> `AnimFreeze.frame++`
|
||||
Поток кадра как в референсе: `FrameFence.endFrame` -> `SkinAtlas.endFrame` -> `AnimFreeze.frame++`
|
||||
-> `OptConfig.refresh()` (флаги резолвятся один раз за кадр в примитивные поля).
|
||||
|
||||
## Что делаем лучше, чем в ZakoOpt
|
||||
## Что делаем лучше, чем в референсе
|
||||
1. **Единый бюджет кадра.** Один объект раздаёт лимиты LOD, частицам и нашим эффектам (ProjectileTrails, ElytraTrails,
|
||||
DeathEffects, Blizzard, GodRays): дистанция, число точек и вершин на кадр. Режим «Выкл / Мягко / Агрессивно», по умолчанию
|
||||
«Выкл», целевой FPS задаёт пользователь. Это не авто-деградация, прежнее решение (Фаза 9) не нарушается.
|
||||
2. **Профилировщик секций** (сущности, частицы, HUD, эффекты, текст) в debug-оверлее.
|
||||
3. **Один конфиг** в `Optimize`, без отдельного экрана ZakoOpt.
|
||||
4. **Авто-порог параллельных частиц** по замеру (у ZakoOpt порог 4+ ядра взят из одного прогона).
|
||||
3. **Один конфиг** в `Optimize`, без отдельного экрана референса.
|
||||
4. **Авто-порог параллельных частиц** по замеру (в референсе порог 4+ ядра взят из одного прогона).
|
||||
→ **Упрощено 2026-10-12**: сделано как в референсе — `CORES >= 4` + `-Dlovisual.opt.parallel_particles=auto|true|false`.
|
||||
Модуль `Optimize.parallel_particles` (default true = AUTO) и `Workers.shouldParallelParticles()` — plumbing готов,
|
||||
mixin-точка на vanilla extraction приложится позже (26.2 `QuadParticleGroup`/`SpriteBillboardParticle`).
|
||||
5. **Кэш статичных HUD-виджетов в текстуру** (перерисовка только при изменении).
|
||||
6. Флаги для бенчмарков: `-Dlovisual.opt.<key>` (аналог `-Dzakoopt.<key>`).
|
||||
6. Флаги для бенчмарков: `-Dlovisual.opt.<key>`.
|
||||
|
||||
## Дополнительные GL-оптимизации (наши, гипотезы)
|
||||
Проверяем замером на 26.2 до включения по умолчанию.
|
||||
- **Кэш состояния GL** шире, чем у ZakoOpt: пропуск повторных `glUseProgram`, `glBindVertexArray`, `glBindTexture`, `glBlendFunc`,
|
||||
`glDepthMask` (LoVisual уже имеет `GlStateManagerMixin`, расширяем).
|
||||
## Дополнительные GL-оптимизации (наши)
|
||||
Реализуем за default-off тумблерами (`-Dlovisual.opt.<key>` или поле в модуле); включать или нет решает пользователь.
|
||||
Автомерялок не ждём — если пункт безопасен (не меняет картинку) и дешёв, он имеет смысл и при выключенном состоянии,
|
||||
тумблер даёт путь включить.
|
||||
- ✅ **Кэш состояния GL** шире, чем в референсе: пропуск повторных `glUseProgram`, `glBindVertexArray`, `glBindTexture`, `glBlendFunc`,
|
||||
`glDepthMask` (LoVisual уже имеет `GlStateManagerMixin`, расширяем). **Готово 2026-10-12, частичнo:** `glUseProgram` и
|
||||
`glBindVertexArray` — по байткоду `com.mojang.blaze3d.opengl.GlStateManager` в 26.2 это единственный два «сырых»
|
||||
бинда без ванильного кэша; остальные (`glBindTexture`/`glBlendFunc`/`glDepthMask`) уже идут через ванильные
|
||||
`TEXTURES/BLEND/DEPTH` state-массивы, дублировать их кэш — только хуже. `render/engine/optimize/gl/state/GlStateCache`
|
||||
+ миксин `mixins/optimize/gl/state/GlStateManagerCacheMixin`, гейт `micro_opts`, 6 тестов, invalidация на
|
||||
`glDeleteProgram` и на `Optimize.onDisable`.
|
||||
- **Сортировка draw по pipeline и текстуре** внутри слоя там, где порядок не влияет на результат (наши квады `Renderer2D`, ленты trails).
|
||||
- **Persistent mapped ring** для динамических вершин наших эффектов и HUD (`GL_ARB_buffer_storage`), если профиль покажет стоимость
|
||||
`glBufferSubData`/map. Ring Auto-Tune из ZakoOpt берём как идею размера.
|
||||
`glBufferSubData`/map. Ring Auto-Tune из референса берём как идею размера.
|
||||
- **Батчинг HUD:** меньше смен пайплайна между виджетами (общий batch для `Renderer2D.COLOR`/`TEXTURE`).
|
||||
- **Инвалидация глубины/stencil** (`glInvalidateFramebuffer`) после проходов, чьё содержимое не читается: выгодно на тайловых и мобильных
|
||||
драйверах, на десктопе эффект мал.
|
||||
|
|
@ -74,8 +98,8 @@ optimize/
|
|||
- **Меньше FBO-переключений** в post-process цепочках (объединение проходов, общий ping-pong).
|
||||
- **Uniform-блоки:** один обновляемый UBO на кадр вместо множества мелких обновлений (в LoVisual есть `DynamicUniformStorageMixin`).
|
||||
|
||||
## Разбор GL-части ZakoOpt для 26.x/26.2 (что реально делает код)
|
||||
Файлы в `/storage/project/jvm/ZakoOpt/zakoopt/`:
|
||||
## Разбор GL-части референса для 26.x/26.2 (что реально делает код)
|
||||
Файлы референса:
|
||||
- `26.x/.../gl/FrameFence.java` + `26.2/.../gl/RealFence.java`: один общий `GpuFence` на кадр вместо фенса на каждый запрос;
|
||||
если его ждут до конца кадра, реальный фенс создаётся сразу, как в ваниле. Подмена через `GlCommandEncoderMixin.createFence`.
|
||||
- `26.x/.../mixin/gl/GlCommandEncoderClearMixin.java` (Lazy Clear): после `clearColorAndDepthTextures` не делается лишний
|
||||
|
|
@ -89,37 +113,100 @@ optimize/
|
|||
- Жёстко привязаны к GL (на Vulkan нужен свой путь или отключение): `SkinAtlas` (`glCopyImageSubData`), `SharedDepthFbos`,
|
||||
`RealFence`, TBO-миксины.
|
||||
|
||||
Не проверено: наш собственный GL-код (`render/engine/rhi/backend/gl`, `Renderer2D`, `GlStateManagerMixin`) почти не читался.
|
||||
Перед этапом 3 нужен профиль HUD: число draw-вызовов и смен состояния на кадр, тогда решаем, какие пункты из раздела
|
||||
«Дополнительные GL-оптимизации» нужны.
|
||||
Наш собственный GL-код (`render/engine/rhi/backend/gl`, `Renderer2D`, `GlStateManagerMixin`) читается по мере работы
|
||||
над каждым пунктом; отдельного «профиля перед Этапом 3» не делаем — Этап 3 уже закрыт, счётчики `DrawStats` в F3
|
||||
остались как справочный инструмент.
|
||||
|
||||
## Vulkan
|
||||
Следующие пункты гипотезы, каждый подтверждаем профилированием и чтением классов `com.mojang.blaze3d.vulkan` в 26.2.
|
||||
Универсально-полезное (не зависит от замеров) делаем сразу, остальное — по мере надобности.
|
||||
|
||||
| Пункт | Зачем | Приоритет |
|
||||
| Пункт | Зачем | Статус |
|
||||
|---|---|---|
|
||||
| `vkCmdCopyImage` вместо `glCopyImageSubData` (SkinAtlas) | без него атлас скинов работает только на GL | обязательно |
|
||||
| Фенсы (`FrameFence`) через общий интерфейс | `RealFence` и `SharedDepthFbos` завязаны на GL, на Vulkan нужен отдельный путь или отключение | обязательно |
|
||||
| Персистентный `VkPipelineCache` на диск | меньше фризов компиляции шейдеров, у нас уже есть `pipelineVariants` | высокий |
|
||||
| Кэш состояния (pipeline, descriptor set, viewport/scissor) в `VulkanRenderPass` | пропуск повторных bind | средний |
|
||||
| Лишние барьеры и layout-переходы между проходами | замер в RenderDoc | средний |
|
||||
| Staging через host-visible VMA одним большим кольцом | кольцо стейджинга для динамических данных | средний |
|
||||
| Асинхронная загрузка текстур на transfer-очереди | риск, делаем последним | низкий |
|
||||
| Персистентный `VkPipelineCache` на диск | меньше фризов компиляции шейдеров, у нас уже есть `pipelineVariants` | **берём в Этапе 4 первым** |
|
||||
| Кэш состояния (pipeline, descriptor set, viewport/scissor) в `VulkanRenderPass` | пропуск повторных bind | **берём** |
|
||||
| ~~`vkCmdCopyImage` вместо `glCopyImageSubData` (SkinAtlas)~~ | SkinAtlas вычеркнут — пункт не нужен | ❌ |
|
||||
| ~~Фенсы (`FrameFence`) через общий интерфейс~~ | FrameFence вычеркнут — ваниль 26.2 делает сама | ❌ |
|
||||
| Лишние барьеры и layout-переходы между проходами | точечная правка | по мере чтения кода Blaze3D |
|
||||
| Staging через host-visible VMA одним большим кольцом | опционально | по мере надобности |
|
||||
| Асинхронная загрузка текстур на transfer-очереди | риск | отложено |
|
||||
|
||||
Существующие Vulkan-миксины LoVisual (`VulkanDeviceMixin` и др.) не переписываем, новый код подключается рядом.
|
||||
|
||||
## Что нового в референсе 1.0.2-1.0.3 (сверено 2026-10-12)
|
||||
Референс обновился с 1.0.1 до 1.0.3 (+166 файлов). Что важно для нашего плана:
|
||||
- **FrameFence/RealFence для 26.2 не нужен.** Комментарий в `26.1.2/gl/GlCommandEncoderMixin`: «26.1 ещё делает GL-sync
|
||||
на каждый fence; с 26.2 ваниль делает один fence на submit и ждёт его по индексу submit'а». Хук `createFence` переехал из
|
||||
`26.x` в модуль `26.1.2`, в 26.2 его нет; в changelog прямо сказано, что опция «Один fence на кадр» оставлена только для
|
||||
26.1.2, с 26.2 это делает игра. Плюс история краша Xaero's World Map («Cannot wait on a fence for the current submit»)
|
||||
при общем fence — риск, который ваниль уже закрыла. => Пункт «FrameFence/RealFence» из Этапа 3 вычеркиваем; остаётся
|
||||
только хук конца кадра (`MinecraftFrameMixin`: `SkinAtlas.endFrame`, `AnimFreeze.frame++`, `refresh()` конфига).
|
||||
- **Счётчики draw-вызовов (`DrawStats`, `common/gl/DrawStats.java`, 75 строк)** — ровно наше заявленное предусловие
|
||||
«перед Этапом 3 нужен профиль HUD: число draw-вызовов и смен состояния на кадр». Считает draws/flush'и слоёв/FBO-bind'ы,
|
||||
средние за секунду, топ-5 слоёв, рисует только пока открыт F3. Дёшево, даёт данные для раздела «Дополнительные
|
||||
GL-оптимизации». => Включить в Этап 3 первым пунктом.
|
||||
- **Parallel Models (крупное новое, Impact HIGH).** `26.2/ModelFeatureRendererMixin` перехватывает `buildGroup` и собирает
|
||||
группу submit'ов на нескольких ядрах (`ParallelModelHook` + `ParallelModels` + два invoker'а). Заявлено +20-50% FPS в
|
||||
толпе бронированных мобов, отдельная опция. Отключается при <4 ядрах и при активном шейдерпаке Iris
|
||||
(`!(IRIS && IrisApi…isShaderPackInUse())` — Iris собирает расширенные атрибуты из вершин, отданных по одной).
|
||||
Зависит от `AnimFreeze.freezes()` (часть, которую нельзя реплеить) — ставить после AnimFreeze.
|
||||
- **ItemLod получил точный таргет в 26.2**: `entity/ItemFeatureRendererMixin` — `@WrapOperation` на `Submit.quads()` в
|
||||
`prepareMainSubmit`/`prepareOutlineSubmit`/`prepareFoilSubmit`, плоские квады дальше `ItemLod.distanceSq()`.
|
||||
- **Выброшенные предметы (новое):** `no_item_sort` (пропуск сортировки `item_entity_translucent_cull`, по умолчанию вкл,
|
||||
до +40% FPS на кучах), `item_single_copy` (стак одним предметом), `ItemBounds` (кэш AABB модели предмета, IdentityHashMap
|
||||
с полной очисткой >4096 — render state пересоздаётся каждый кадр, его собственный кэш умирает вместе с ним).
|
||||
`BufferSourceMixin`+`RenderTypeAccessor` живут в модуле `26.1.2`, в `26.x` их нет — перед переносом проверить, есть ли
|
||||
в 26.2 `MultiBufferSource.BufferSource.endBatch(RenderType, BufferBuilder)` и `RenderType.sortOnUpload()`.
|
||||
- **Фиксы HudCache, которые надо взять сразу** (иначе воспроизведём баги): главный target снимается в `beginFrame`
|
||||
(`main = gameRenderer.mainRenderTarget()`) и сравнение идёт с ним, а не с «текущим» — иначе редиректим чужой target
|
||||
(Xaero подменяет свой, пока рисует); двойной троттлинг `GuiItemRefresh`+`HudCache` приводил к пропавшим зачарованным
|
||||
предметам хотбара (фикс: пропускать свой троттлинг, когда `HudCache.active()`); composite — premultiplied + write mask
|
||||
7 (RGB), depth clear 0 (reversed depth в 26.x); кэш выключается при чужих HUD-кэшах (`axolotlclient`, `exordium`,
|
||||
`gnetum`) и под VulkanMod; интервал = рефреш-рейт монитора (`MonitorRate`, GLFW-опрос 1 раз в секунду).
|
||||
- **Правило утечек:** кэши с нативной памятью/GL-объектами чистить и на перезагрузку ресурсов (F3+T), и на смену мира.
|
||||
Фикс 1.0.3: `BubbleColumnUpParticleMixin` держал `ClientLevel` в статике через сильную ссылку — теперь `WeakReference`
|
||||
+ очистка карты при смене уровня; `MovingBlockCache`/`ParallelModels` чинили утечки native/model.
|
||||
- **Порог параллельных частиц:** план п.4 («авто-порог по замеру») упрощаем до того, что сделано в референсе —
|
||||
`CORES >= 4` + `-D…=auto|true|false`; 6+ ядер оказалось догадкой (замер на 4 ядрах дал +12%), вернули к 4.
|
||||
`Workers` получил `stream()` — публикация задач по мере готовности, рабочие берут их сразу, пока готовится остальное.
|
||||
- **MixinPlugin** — условная регистрация миксинов (Sodium/Vulkan/Lunar, `shouldApplyMixin` + `getMixins`), а тумблеры в UI
|
||||
прячутся, если миксин не построен/не применяется (`available()` → `MixinPlugin::applies`). У нас уже есть
|
||||
`mixins/LoVisualMixinPlugin` — расширить для Vulkan (Этап 4) и для «миксин есть не всегда».
|
||||
- **Не берём:** Lunar multi-draw (лаунчер Lunar, не наш случай); `blockEntityEarlyCull` перенесён только в `1.21.9+`,
|
||||
в `26.x` его нет — при случае проверить, применим ли к 26.2; `26.3` поддержка и `26.3/renames.txt` пригодятся при
|
||||
апгрейде версии (пакет `com.mojang.blaze3d` → `com.mojang.renderpearl`).
|
||||
|
||||
## Этапы
|
||||
1. `core/` + `RenderBackendOps` + порт сущностей, частиц, HUD, текста, блоков (бэкенд-независимые части). Тесты, сборка.
|
||||
2. Бюджет кадра, профилировщик, `-Dlovisual.opt.*`.
|
||||
3. `gl/`: shared FBO, FrameFence, lazy clear, TBO cache, SkinAtlas через GL; затем новые GL-идеи из раздела ниже.
|
||||
4. `vulkan/`: `vkCmdCopyImage`, затем `VkPipelineCache`, затем остальное по замерам.
|
||||
5. Бенчмарки до и после, отчёт цифр в этот документ.
|
||||
1. ✅ `core/` + helpers + adapter interfaces + `OptimizeToggles` (бэкенд-независимые части). Тесты, сборка. **Завершён 2026-10-10** — 11 портированных .java, 53 теста, 0 падений, `checkFolderLimit` OK.
|
||||
2. ✅ Бюджет кадра, профилировщик, `-Dlovisual.opt.*`. **Завершён 2026-10-10** — `FrameBudget` (3 режима: OFF/SOFT/AGGRESSIVE, target FPS, per-subsystem caps для entities/particles/HUD/effects/text/trails), `FrameProfiler` (5 секций, EMA, decay через 2 с idle), `OptimizePropertyBridge` (10 системных свойств + `all=false` отключает всё), `OptimizeDebugHudMixin` (F3 overlay показывает тумблеры + бюджет + тайминги секций + override'ы). 22 новых теста.
|
||||
3. ✅ `gl/` + остаток рендера. Закрыт 2026-10-12, кроме п.9 (API-гейт). **Готово 2026-10-10**: `RenderBackendOps`, `GlRenderBackendOps`, `RenderTypesMixin`, `GlCommandEncoderClearMixin`, `GlCommandEncoderTexBufferMixin`. **Готово 2026-10-10…10-11**: миксины `LivingEntityLodMixin`, `ParticleMixin`, `BubbleColumnUpParticleMixin`, `SodiumEntityRendererMixin`, `BlockEntity*`, `ChestRendererMixin`, `LevelRendererOutlineMixin`, `BaseSpawnerMixin`, `EntityName/State/Renderer*`. **Осталось, в порядке приоритета** (порядок пересмотрен 2026-10-12 по референсу 1.0.3):
|
||||
1. ✅ `DrawStats` + строки в F3 — счётчики draw/flush/bind за кадр (предусловие для решений о GL-оптимизациях; дёшево). **Готово 2026-10-12** — `DrawStats`, миксины `mixins/optimize/stats/*` (executeDraw/Draws/Indirect/Multiple, setPipeline, glBindFramebuffer), строка F3 `draws/pipelines/fbo binds`, подключены `FrameProfiler.beginFrame/endFrame` (баг Стадии 2: не вызывались в проде), 7 тестов.
|
||||
2. ✅ `SharedDepthFbos` кластер — `SharedDepthFbos` (DSA `glClearNamedFramebufferfv`, fallback на ваниль без GL4.5/DSA), `FrameBufferCacheMixin` (remember/forget по `getFbo`/`destroyFbo`), `GlCommandEncoderDepthClearMixin` (`clearDepthTexture` HEAD, cancellable), `GlBufferCloseMixin` (`forgetTboCache()` при `close` GlBuffer.Direct — чинит протухание TBO-кэша, id буфера переиспользуется). **Готово 2026-10-12** — тумблер `fbo_share` (модуль + `-Dlovisual.opt.fbo_share`), методы `RenderBackendOps.fboShareSupported/clearDepthInPlace`, миксины в `mixins/optimize/gl/` и `mixins/optimize/gl/fbo/`, 8+3 тестов.
|
||||
3. ~~`SkinAtlas` кластер~~ **Выкинут 2026-10-12** — в референсе 1.0.3 фичи нет на 26.2 (в `26.2/` нет `SkinAtlas.java`/`LivingEntityRendererSkinMixin`, флаг `skinAtlas()` никем не вызывается; атлас скинов был только для 1.21.4, см. историю версий референса, раздел «1.21.4»). Как и FrameFence, не переносим.
|
||||
4. ✅ `AnimFreeze` кластер — `AnimFreeze` (capture раз в тик, реплей в вершины), `EntityAnimHolderMixin`, `AnimHolder`, метод `freezes(state, pose)` (часть, построенная каждый кадр в другом месте, не реплеим — это и чинит рябь брони), `RawVertices`/`SodiumVertices`. **Готово 2026-10-12** — `AnimFreeze.configure(enabled, distance)` (свой холдер, не OptimizeToggles), тумблеры `entity_anim_freeze` (по умолчанию выкл) + `entity_anim_distance` (16), `frame++` в `MinecraftMixin.renderFrame` HEAD, вызов из `ModelFeatureRendererMixin.prepareModel` (`@WrapOperation` на `Model.renderToBuffer`), инфраструктура сырых вершин из п.7 (`RawBuffer`/`BufferBuilderRawMixin`/`RawVertices`/`SodiumVertices`/`VertexConsumerUtilsMixin`), 3 теста. TypeBuilders не выделялся — свёрнут в приватные хелперы `AnimFreeze`.
|
||||
5. ✅ `ItemLod` — `ItemLod` + `ItemFeatureRendererMixin` (`@WrapOperation` на `Submit.quads()` в `prepareMain/Outline/FoilSubmit`) + `ItemBounds`. **Готово 2026-10-12** — `ItemLod`/`ItemBounds` в `render/engine/optimize/entity/` (в `entity/` теперь ровно 4 файла — лимит исчерпан), LOD-хук добавлен в существующий `ItemFeatureRendererMixin`, `ItemStackRenderStateMixin`+`ItemLayerAccessor` в `mixins/render/item/bounds/`, тумблеры `item_lod`/`item_lod_distance` (8)/`item_bounds`, 9 тестов.
|
||||
6. ✅ `HudCache` кластер — `HudCache`, `MonitorRate`, `HudWorth` (есть), миксины `GameRendererHudMixin`, `GuiHudMixin`, `GuiRendererTargetMixin`, `HudInvoker`, `HudLiveMixin`; все фиксы совместимости из раздела выше — сразу. **Готово 2026-10-12** — тумблер `hud_cache` **по умолчанию выкл** (взаимодействует с нашими deferred-HUD-маркерами в `GuiRendererMixin`); гейт на `axolotlclient`/`exordium`/`gnetum`/`vulkanmod` через FabricLoader; main target снимается в `beginFrame`; composite premultiplied + write mask 7, depth clear 0; `HudInvoker` в подпапке `hud/cache/invoker/` (лимит 4 файлов), 9 тестов (MonitorRate clamp+троттлинг, HudWorth-гистерезис).
|
||||
7. ✅ `VertexConsumerUtilsMixin` (кэш `VertexBufferWriter`, только при Sodium — в `OPTIONAL_SODIUM_MIXINS`) + `BufferBuilderRawMixin`/`RawBuffer` (запись без Sodium) + `RawVertices`/`SodiumVertices`. **Готово 2026-10-12** (упреждённо, как предусловие п.4) — гейт на `micro_opts`, 2 миксина в `mixins/optimize/gl/raw/`.
|
||||
8. ✅ `ParallelModels` — `ParallelModelHook`, `ModelFeatureRendererMixin` (`buildGroup` cancellable), invoker'ы; после `AnimFreeze` (зависит от `freezes()`). **Готово 2026-10-12** — `ParallelModels`/`ParallelModelHook`/`ModelGeometry`/`ModelBuilder` в `render/engine/optimize/parallel/` (оригинальный 348-строчный класс разбит на 4 файла, лимит 250), `Workers` получил `stream()` (публикация по мере готовности), 3 интефейса в `mixins/optimize/entity/parallel/`, `buildGroup`-inject добавлен в существующий `ModelFeatureRendererMixin`, тумблер `parallel_models` (on) с внутренними гейтами: ≥4 ядер, нет активного Iris-шейдерпака, взаимоисключение с `AnimFreeze`, формат `DefaultVertexFormat.ENTITY` (36 байт, оффсеты сверены javap), `parts[0]=null` против утечки weak-map, native-страницы освобождаются в `reset()`, 7 тестов (3 stream + 4 гейтинг).
|
||||
9. ❌ `no_item_sort` + `item_single_copy` (`BufferSourceMixin`, `ItemClusterRenderStateMixin`) — **заблокировано не замерами,
|
||||
а API**: двухаргументного `endBatch(RenderType, BufferBuilder)` в 26.2 `BufferSource` нет, `MeshData.DrawState` без
|
||||
sort-методов; в референсе эти миксины живут в `26.1.2`, на `26.x` их нет. Нужен дизайн под 26.2-API, а не отчёт по FPS.
|
||||
Хук конца кадра не нужен отдельным `MinecraftFrameMixin`: `renderFrame` у нас уже перехвачен (`mixins/render/main/MinecraftMixin`), туда же вешаем `SkinAtlas.endFrame`/`AnimFreeze.frame++`/конфиг-`refresh()`. **FrameFence/RealFence вычеркнут** — см. «Что нового», ваниль 26.2 делает это сама.
|
||||
4. 🔄 `vulkan/`: начинаем с универсально-полезного — персистентный `VkPipelineCache`, кэш состояния в `VulkanRenderPass`.
|
||||
Барьеры/staging/async — по мере чтения Blaze3D-кода, не по замерам. **Готово 2026-10-12**: ~~не начат~~ → старт, первый пункт.
|
||||
5. (опционально, вне плана) Отчёт цифр «до/после» на реальной сборке — факультативно, не блокирует Этапы 3-4.
|
||||
|
||||
## Оценки для Этапов 3-4 (после Stage 1-2)
|
||||
- **Этап 3**: закрыт, кроме п.9 (заблокирован API 26.2).
|
||||
- **Этап 4**: два универсально-полезных пункта (`VkPipelineCache`, state cache) — по 1 сессии каждый; барьеры/staging/async —
|
||||
по ходу чтения Blaze3D.
|
||||
|
||||
## Риски
|
||||
- Миксины 26.2 проверяются только компиляцией и запуском владельцем (`./gradlew runClient`), вживую я не смотрю.
|
||||
- Совместимость с ImmediatelyFast и Iris в 26.2 не проверена.
|
||||
- Лимиты размера файлов проекта потребуют дробить крупные классы ZakoOpt (фасад + package-private хелперы).
|
||||
- Выигрыш по Vulkan не гарантирован, пока нет замеров.
|
||||
- Миксины 26.2 проверяются компиляцией и юнитами; живой запуск (`./gradlew runClient`) — на стороне того, у есть GUI-машина,
|
||||
но это не гейт: код слияем, default-off тумблеры снижают риск.
|
||||
- Совместимость с ImmediatelyFast и Iris в 26.2 не проверена in-code; держим дефолты консервативными.
|
||||
- Лимиты размера файлов проекта требуют дробить крупные классы референса (фасад + package-private хелперы) — соблюдается.
|
||||
- Выигрыш по Vulkan подтверждаем чтением `com.mojang.blaze3d.vulkan`, а не замерами; если пункт окажется вредным —
|
||||
default-off.
|
||||
|
||||
## Вне объёма
|
||||
Ускорение ландшафта (замена Sodium), авто-деградация без явного включения пользователем.
|
||||
|
|
|
|||
|
|
@ -20,3 +20,4 @@ viafabricplus_version=4.6.0
|
|||
entityculling_version=1.10.5
|
||||
voicechat_api_version=2.6.24
|
||||
mixinextras_version=0.5.5
|
||||
lovisualDevEnabled=false
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import dev.loki.lovisual.render.engine.pipeline.LoVisualRenderPipelines;
|
|||
import dev.loki.lovisual.render.engine.renderer.Renderer3D;
|
||||
import dev.loki.lovisual.render.engine.texture.TextureStorage;
|
||||
import dev.loki.lovisual.render.engine.uniform.MeshBuilder;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.optimization.FpsOptimizer;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.Optimize;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
@ -67,7 +67,7 @@ final class TargetEspCrystalRenderer {
|
|||
LoVisualRenderPipelines.WORLD_COLORED_LINES_DEPTH,
|
||||
depthMode
|
||||
);
|
||||
MeshBuilder bloomMesh = FpsOptimizer.bloomDisabled()
|
||||
MeshBuilder bloomMesh = Optimize.bloomDisabled()
|
||||
? null
|
||||
: renderer.batchTextured(
|
||||
LoVisualRenderPipelines.WORLD_TEXTURED_ADDITIVE_DEPTH,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package dev.loki.lovisual.features.module.modules.combat.prediction;
|
|||
import com.mojang.blaze3d.pipeline.RenderPipeline;
|
||||
import dev.loki.lovisual.features.module.modules.combat.predictions.PredictionsModel.AimPrediction;
|
||||
import dev.loki.lovisual.features.module.modules.combat.predictions.PredictionsModel.TrajectoryResult;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.optimization.FpsOptimizer;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.Optimize;
|
||||
import dev.loki.lovisual.render.engine.RenderState;
|
||||
import dev.loki.lovisual.render.engine.animation.AnimationUtility;
|
||||
import dev.loki.lovisual.render.engine.pipeline.LoVisualRenderPipelines;
|
||||
|
|
@ -58,7 +58,7 @@ public final class PredictionsWorldRenderer {
|
|||
boolean walls = facade.getGlowWallsValue().get();
|
||||
RenderPipeline pipeline = walls ? LoVisualRenderPipelines.WORLD_TEXTURED_ADDITIVE : LoVisualRenderPipelines.WORLD_TEXTURED_ADDITIVE_LIQUID_IGNORE;
|
||||
Renderer3D.DepthMode depthMode = walls ? Renderer3D.DepthMode.MAIN : Renderer3D.DepthMode.PRE_DEPTH;
|
||||
if (FpsOptimizer.bloomDisabled()) return;
|
||||
if (Optimize.bloomDisabled()) return;
|
||||
MeshBuilder mesh = renderer.batchTextured(pipeline, TextureStorage.BLOOM, depthMode);
|
||||
if (mesh == null) return;
|
||||
int color = pred.entity() != null ? HIT_ENTITY_COLOR : pred.trajectory().argb() != 0 ? pred.trajectory().argb() : baseColor;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,50 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize;
|
||||
|
||||
import dev.loki.lovisual.config.values.mode.EnumValue;
|
||||
import dev.loki.lovisual.config.values.primitive.BooleanValue;
|
||||
import dev.loki.lovisual.config.values.primitive.NumberValue;
|
||||
import dev.loki.lovisual.events.impl.render.particles.ParticleSpawnEvent;
|
||||
import dev.loki.lovisual.events.meta.EventHandler;
|
||||
import dev.loki.lovisual.features.module.core.Module;
|
||||
import dev.loki.lovisual.features.module.core.ModuleCategory;
|
||||
import dev.loki.lovisual.features.module.core.ModuleInfo;
|
||||
import dev.loki.lovisual.features.module.lifecycle.Modules;
|
||||
import dev.loki.lovisual.features.module.phase.Notifier;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.particle.Workers;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.AnimFreeze;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.ItemBounds;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.ItemLod;
|
||||
import dev.loki.lovisual.render.engine.optimize.gl.state.GlStateCache;
|
||||
import dev.loki.lovisual.render.engine.optimize.hud.HudCache;
|
||||
import dev.loki.lovisual.render.engine.optimize.parallel.ParallelModels;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.DrawStats;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.FrameBudget;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.FrameProfiler;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.OptimizePropertyBridge;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeState;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.core.particles.ParticleTypes;
|
||||
|
||||
/**
|
||||
* Manual FPS rubilnik: one switch plus four knobs, each cutting a named cost.
|
||||
* Manual FPS rubilnik: one switch plus a set of knobs, each cutting a named cost
|
||||
* (the four original "rubilnik" cuts: no_glass, lite_post, lite_sky, lean_hud)
|
||||
* OR toggling a transparent optimization (entity LOD,
|
||||
* particle LOD, spawner tick-cache, etc.).
|
||||
*
|
||||
* <p>No auto-degradation by FPS — the owner's rule. Render code reads
|
||||
* {@link OptimizeState}, never this class; this module only pushes state into it.
|
||||
* {@link OptimizeState} (the original cuts), {@link OptimizeToggles} (the
|
||||
* Stage 1 transparent helpers), {@link FrameBudget} (Stage 2 frame budget)
|
||||
* — never this class; this module only pushes state into them on
|
||||
* enable/disable and once per frame.
|
||||
*
|
||||
* <p>Stage 2 of {@code mod/docs/optimize-layer-design.md}: the module also
|
||||
* pushes a {@link FrameBudget} snapshot (mode + target FPS) and resolves
|
||||
* {@code -Dlovisual.opt.*} system-property overrides via
|
||||
* {@link OptimizePropertyBridge}. Stage 3 step 1 adds {@link DrawStats} —
|
||||
* draw/pipeline/framebuffer counters fed by the {@code mixins/optimize/stats}
|
||||
* hooks, opened and closed here so they only run while F3 is up. The F3
|
||||
* overlay ({@code OptimizeDebugHudMixin}) reads both snapshots.
|
||||
*/
|
||||
@ModuleInfo(
|
||||
id = "optimize",
|
||||
|
|
@ -20,11 +53,62 @@ import dev.loki.lovisual.render.engine.optimize.OptimizeState;
|
|||
)
|
||||
public final class Optimize extends Module {
|
||||
|
||||
// --- Original "rubilnik" cuts: visible FPS trade-offs ---
|
||||
private final BooleanValue noGlass = bool("no_glass", true);
|
||||
private final BooleanValue litePost = bool("lite_post", true);
|
||||
private final BooleanValue liteSky = bool("lite_sky", true);
|
||||
private final BooleanValue leanHud = bool("lean_hud", true);
|
||||
|
||||
// --- transparent optimizations (no visual change) ---
|
||||
private final BooleanValue entityLod = bool("entity_lod", true);
|
||||
private final NumberValue<Integer> entityLodDistance =
|
||||
num("entity_lod_distance", 35, 4, 256);
|
||||
private final BooleanValue particleLod = bool("particle_lod", true);
|
||||
private final BooleanValue spawnerCull = bool("spawner_cull", true);
|
||||
private final NumberValue<Integer> spawnerDistance =
|
||||
num("spawner_distance", 16, 4, 64);
|
||||
private final BooleanValue spawnerTickCache = bool("spawner_tick_cache", true);
|
||||
private final BooleanValue blockEntityCache = bool("block_entity_cache", true);
|
||||
private final BooleanValue preparedTextCache = bool("prepared_text_cache", true);
|
||||
private final BooleanValue microOpts = bool("micro_opts", true);
|
||||
|
||||
// --- Stage 3: GL-level helpers ---
|
||||
private final BooleanValue fboShare = bool("fbo_share", true);
|
||||
private final BooleanValue entityAnimFreeze = bool("entity_anim_freeze", false);
|
||||
private final NumberValue<Integer> entityAnimDistance =
|
||||
num("entity_anim_distance", 16, 4, 128);
|
||||
|
||||
// --- Stage 3: items ---
|
||||
private final BooleanValue itemLod = bool("item_lod", true);
|
||||
private final NumberValue<Integer> itemLodDistance = num("item_lod_distance", 8, 2, 64);
|
||||
private final BooleanValue itemBounds = bool("item_bounds", true);
|
||||
|
||||
// --- Stage 3: HUD cache (off by default — interacts with the deferred-HUD markers) ---
|
||||
private final BooleanValue hudCacheToggle = bool("hud_cache", false);
|
||||
|
||||
// --- Stage 3: parallel model build (own holder: cores/Iris gating inside) ---
|
||||
private final BooleanValue parallelModels = bool("parallel_models", true);
|
||||
|
||||
// --- Stage 1 item 4: parallel particles AUTO gate (cores >= 4) ---
|
||||
// -Dlovisual.opt.parallel_particles=auto|true|false overrides this from OptimizePropertyBridge.
|
||||
private final BooleanValue parallelParticles = bool("parallel_particles", true);
|
||||
|
||||
// --- Visible cuts merged from the old FPS Optimizer module ---
|
||||
private final BooleanValue noParticles = bool("no_particles", false);
|
||||
private final BooleanValue noMenuBackground = bool("no_menu_background", false);
|
||||
private final BooleanValue noBloom = bool("no_bloom", false);
|
||||
private final BooleanValue entityCull = bool("entity_cull", false);
|
||||
private final NumberValue<Integer> entityCullDistance =
|
||||
visibleWhen(num("entity_cull_distance", 64, 8, 256), entityCull::get);
|
||||
|
||||
// --- Stage 2: frame budget + profiling ---
|
||||
private final EnumValue<FrameBudget.Mode> budgetMode =
|
||||
enumMode("budget_mode", FrameBudget.Mode.OFF, FrameBudget.Mode.values());
|
||||
private final NumberValue<Integer> targetFps =
|
||||
num("target_fps", FrameBudget.DEFAULT_TARGET_FPS, 15, 360);
|
||||
private final BooleanValue showProfiler =
|
||||
bool("show_profiler", false);
|
||||
|
||||
private boolean notified;
|
||||
|
||||
@Override
|
||||
|
|
@ -41,21 +125,124 @@ public final class Optimize extends Module {
|
|||
@Override
|
||||
public void onDisable() {
|
||||
OptimizeState.reset();
|
||||
OptimizeToggles.reset();
|
||||
FrameBudget.reset();
|
||||
AnimFreeze.reset();
|
||||
ItemLod.reset();
|
||||
ItemBounds.reset();
|
||||
HudCache.reset();
|
||||
ParallelModels.reset();
|
||||
Workers.resetParallelParticles();
|
||||
GlStateCache.reset();
|
||||
// stop counting and drop the F3 numbers, onFrame will not run again
|
||||
DrawStats.endFrame(false);
|
||||
}
|
||||
|
||||
/** Picks up knob changes made while the module stays on. */
|
||||
@Override
|
||||
public void onFrame(float d) {
|
||||
pushState();
|
||||
// close the window of the frame that just drew; the next publish lands once a second
|
||||
DrawStats.endFrame(debugOverlayVisible());
|
||||
}
|
||||
|
||||
/** F3 counts are only worth collecting while they are on screen. */
|
||||
private static boolean debugOverlayVisible() {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
return mc != null && mc.getDebugOverlay() != null && mc.getDebugOverlay().showDebugScreen();
|
||||
}
|
||||
|
||||
// --- Call-site helpers for the merged FPS Optimizer cuts ---
|
||||
|
||||
public boolean isMenuBackgroundDisabled() {
|
||||
return isEnabled() && noMenuBackground.get();
|
||||
}
|
||||
|
||||
public boolean isBloomDisabled() {
|
||||
return isEnabled() && noBloom.get();
|
||||
}
|
||||
|
||||
/** Cheap call-site guard for renderers that build bloom/glow geometry every frame. */
|
||||
public static boolean bloomDisabled() {
|
||||
Optimize module = Modules.get(Optimize.class);
|
||||
return module != null && module.isBloomDisabled();
|
||||
}
|
||||
|
||||
public boolean isEntityCullingEnabled() {
|
||||
return isEnabled() && entityCull.get();
|
||||
}
|
||||
|
||||
public int entityCullDistance() {
|
||||
return entityCullDistance.get();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
private void onParticleSpawn(ParticleSpawnEvent event) {
|
||||
if (!isEnabled() || !noParticles.get()) return;
|
||||
// Firework particles are created by FireworkParticles$Starter and assume ParticleEngine.createParticle never returns null.
|
||||
// Cancelling them returns null and causes NPE at Starter.createParticle -> setTrail().
|
||||
// Guard is also present in FireworkParticlesStarterMixin, but exempt here to preserve fireworks even with optimizer enabled.
|
||||
var type = event.options().getType();
|
||||
if (type == ParticleTypes.FIREWORK || type == ParticleTypes.FLASH) return;
|
||||
event.cancel();
|
||||
}
|
||||
|
||||
private void pushState() {
|
||||
boolean on = isEnabled();
|
||||
// Original four "rubilnik" cuts.
|
||||
OptimizeState.apply(
|
||||
on && noGlass.get(),
|
||||
on && litePost.get(),
|
||||
on && liteSky.get(),
|
||||
on && leanHud.get());
|
||||
|
||||
// Stage 1 toggles — wire through the -Dlovisual.opt.* overrides.
|
||||
OptimizePropertyBridge.Snapshot props = OptimizePropertyBridge.resolve();
|
||||
OptimizeToggles.apply(
|
||||
resolveBool(props, props.entityLod, on && entityLod.get()),
|
||||
resolveInt(props, props.entityLodDistance, entityLodDistance.get()),
|
||||
resolveBool(props, props.particleLod, on && particleLod.get()),
|
||||
resolveBool(props, props.particleLod, on && particleLod.get()),
|
||||
resolveBool(props, props.particleLod, on && particleLod.get()),
|
||||
resolveBool(props, props.spawnerCull, on && spawnerCull.get()),
|
||||
resolveInt(props, props.spawnerDistance, spawnerDistance.get()),
|
||||
resolveBool(props, props.spawnerTickCache, on && spawnerTickCache.get()),
|
||||
resolveBool(props, props.blockEntityCache, on && blockEntityCache.get()),
|
||||
resolveBool(props, props.preparedTextCache, on && preparedTextCache.get()),
|
||||
resolveBool(props, props.microOpts, on && microOpts.get()),
|
||||
resolveBool(props, props.fboShare, on && fboShare.get()));
|
||||
|
||||
// Stage 2: frame budget. -Dlovisual.opt.budget_mode / target_fps override the module.
|
||||
FrameBudget.Mode mode = on ? budgetMode.get() : FrameBudget.Mode.OFF;
|
||||
FrameBudget.apply(props.overrides(mode, mode), props.resolveTargetFps(targetFps.get()));
|
||||
|
||||
// Stage 3: far-entity animation freeze — own holder, pushed once per frame.
|
||||
AnimFreeze.configure(on && entityAnimFreeze.get(), entityAnimDistance.get());
|
||||
|
||||
// Stage 3: far-item LOD + shared single-layer item bounds.
|
||||
ItemLod.configure(on && itemLod.get(), itemLodDistance.get());
|
||||
ItemBounds.configure(on && itemBounds.get());
|
||||
|
||||
// Stage 3: HUD-at-refresh-rate cache; own holder (foreign-HUD/Vulkan gating inside).
|
||||
HudCache.configure(on && hudCacheToggle.get());
|
||||
|
||||
// Stage 3: parallel model build; mutually exclusive with anim freeze (checked inside).
|
||||
ParallelModels.configure(on && parallelModels.get());
|
||||
|
||||
// Stage 1 item 4: parallel-particles gate; -Dlovisual.opt.parallel_particles resolves
|
||||
// to null (AUTO -> cores >= 4), Boolean.TRUE/FALSE (forced). Workers keeps the resolved
|
||||
// flag so a future particle-extraction mixin can read it without touching this module.
|
||||
Workers.configureParallelParticles(props.parallelParticles, on && parallelParticles.get());
|
||||
}
|
||||
|
||||
private static boolean resolveBool(OptimizePropertyBridge.Snapshot props,
|
||||
Boolean override, boolean moduleValue) {
|
||||
return props.overrides(override, moduleValue);
|
||||
}
|
||||
|
||||
private static int resolveInt(OptimizePropertyBridge.Snapshot props,
|
||||
int override, int moduleValue) {
|
||||
return props.overrides(override, moduleValue);
|
||||
}
|
||||
|
||||
/** Compact list of what is being cut, for the first-enable notice. */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.block;
|
||||
|
||||
/**
|
||||
* Mixin-contract: per-tick cached block-light lookups on a {@code BlockEntity}.
|
||||
* The vanilla {@code LightCoordsUtil.getLightCoords(level, pos)} call walks
|
||||
* the chunk's light section data every frame per block-entity in view;
|
||||
* caching it once per tick (block-light only changes on tick boundaries)
|
||||
* removes that walk from the hot path. The companion {@code pairLight}
|
||||
* methods cache the second lookup done for double-chests.
|
||||
*/
|
||||
public interface CachedLight {
|
||||
int lovisual$light();
|
||||
|
||||
long lovisual$lightTick();
|
||||
|
||||
void lovisual$setLight(int light, long tick);
|
||||
|
||||
int lovisual$pairLight();
|
||||
|
||||
long lovisual$pairLightTick();
|
||||
|
||||
void lovisual$setPairLight(int light, long tick);
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.block;
|
||||
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
/**
|
||||
* Mixin-contract: cached validity and "should-render" distance check on a
|
||||
* {@code BlockEntity}. {@code BlockEntityType.isValid(state)} is called every
|
||||
* frame per block-entity in view but only changes on a state transition —
|
||||
* cached by identity on {@link #lovisual$validState()} / {@link #lovisual$valid()}.
|
||||
* The companion {@code inDistance} methods cache
|
||||
* {@code BlockEntityRenderer.shouldRender}'s distance check per tick.
|
||||
*/
|
||||
public interface CachedValidity {
|
||||
BlockState lovisual$validState();
|
||||
|
||||
boolean lovisual$valid();
|
||||
|
||||
void lovisual$setValid(BlockState state, boolean valid);
|
||||
|
||||
long lovisual$distanceTick();
|
||||
|
||||
boolean lovisual$inDistance();
|
||||
|
||||
void lovisual$setInDistance(boolean inDistance, long tick);
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.block;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
|
||||
/**
|
||||
* Utility layer over {@link TickCached} on a spawner ({@code BaseSpawner} via
|
||||
* mixin): get/put the cached {@link EntityRenderState} for the spawner's
|
||||
* display mob, keyed by tick, skipping the per-frame {@code extractEntity}
|
||||
* rebuild. The (Stage 3) spawner renderer mixin populates this on the first
|
||||
* frame of a tick and the subsequent frames in the same tick read back from
|
||||
* the cache.
|
||||
*
|
||||
* <p>Takes the {@link TickCached} interface directly rather than the
|
||||
* {@code BaseSpawner} class so the contract is testable without a
|
||||
* Minecraft runtime — the Stage 3 mixin casts {@code (TickCached) spawner}
|
||||
* before calling.
|
||||
*
|
||||
* <p>Reads {@link OptimizeToggles#spawnerTickCache()} to decide whether caching is enabled.
|
||||
*/
|
||||
public enum SpawnerCache {
|
||||
;
|
||||
|
||||
/** True when the cache is engaged this frame. */
|
||||
public static boolean enabled() {
|
||||
return OptimizeToggles.spawnerTickCache();
|
||||
}
|
||||
|
||||
/** Cached state for this tick, or {@code null} if not yet cached. */
|
||||
public static EntityRenderState get(TickCached spawner, long tick) {
|
||||
return spawner.lovisual$cachedTick() == tick
|
||||
? (EntityRenderState) spawner.lovisual$cached()
|
||||
: null;
|
||||
}
|
||||
|
||||
/** Write the cached state for the given tick. */
|
||||
public static void put(TickCached spawner, long tick, EntityRenderState state) {
|
||||
spawner.lovisual$setCached(state, tick);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.block;
|
||||
|
||||
/**
|
||||
* Mixin-contract: a generic per-tick cache slot on a target object
|
||||
* (block-entity, spawner, piston moving block). Stores one cached value plus
|
||||
* the tick it was written; the helper (e.g. {@link SpawnerCache}) checks
|
||||
* {@link #lovisual$cachedTick()} against the current tick and reads
|
||||
* {@link #lovisual$cached()} if it matches, otherwise lets the caller rebuild
|
||||
* and writes the fresh value via {@link #lovisual$setCached(Object, long)}.
|
||||
*/
|
||||
public interface TickCached {
|
||||
Object lovisual$cached();
|
||||
|
||||
long lovisual$cachedTick();
|
||||
|
||||
void lovisual$setCached(Object value, long tick);
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.core;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Access-ordered LRU map with a size cap. Generic, no Minecraft dependencies,
|
||||
* unit-testable as-is.
|
||||
*
|
||||
* <p>Intended for the {@code ClientLanguage.getVisualOrder} LRU cache.
|
||||
*
|
||||
* @param <K> key type
|
||||
* @param <V> value type
|
||||
*/
|
||||
public final class LruMap<K, V> extends LinkedHashMap<K, V> {
|
||||
|
||||
private final int maxSize;
|
||||
|
||||
public LruMap(int maxSize) {
|
||||
super(256, 0.75f, true);
|
||||
this.maxSize = maxSize;
|
||||
}
|
||||
|
||||
public int maxSize() {
|
||||
return maxSize;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
|
||||
return size() > maxSize;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.entity;
|
||||
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
/**
|
||||
* Mixin-contract: cached rebuilt name tag for an entity.
|
||||
*
|
||||
* <p>The vanilla {@code Entity.getDisplayName()} rebuilds a {@link Component}
|
||||
* (team prefix + name + suffix) every time it's called. Renderers call it once
|
||||
* per frame per entity in view, which is wasteful — the team/name/suffix tuple
|
||||
* only changes on tick boundaries. Mixins on {@code Entity} implement this
|
||||
* interface, expose the cache slot via {@link #lovisual$name()}, {@link #lovisual$nameTick()}
|
||||
* and {@link #lovisual$setName(Component, long)}, and the
|
||||
* {@code EntityRenderer.getNameTag} wrapper fills it once per tick and reuses
|
||||
* the cached value on intermediate frames.
|
||||
*/
|
||||
public interface CachedName {
|
||||
Component lovisual$name();
|
||||
|
||||
long lovisual$nameTick();
|
||||
|
||||
void lovisual$setName(Component name, long tick);
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.entity;
|
||||
|
||||
import org.lwjgl.system.MemoryStack;
|
||||
|
||||
/**
|
||||
* Hot-path helper: skip the {@link MemoryStack#stackPush()} ThreadLocal lookup
|
||||
* on the thread that called last (the render thread). The lookup is cheap on
|
||||
* its own, but Sodium's entity renderer calls it once per cuboid per frame
|
||||
* (thousands of times), and a single volatile read + identity compare is
|
||||
* strictly cheaper than the ThreadLocal hash lookup.
|
||||
*
|
||||
* <p>Stores the {@code (thread, stack)} pair in one record so another thread
|
||||
* never sees a half-updated pair. The first call from a new thread rewrites
|
||||
* the volatile; subsequent calls from the same thread take the fast path.
|
||||
*
|
||||
* <p>Used by the (Stage 3) Sodium {@code EntityRenderer.renderCuboid} mixin.
|
||||
*/
|
||||
public enum CachedStack {
|
||||
;
|
||||
|
||||
private record ThreadStack(Thread thread, MemoryStack stack) {
|
||||
}
|
||||
|
||||
// One record so another thread never sees a thread/stack pair half-updated.
|
||||
private static volatile ThreadStack cached = new ThreadStack(null, null);
|
||||
|
||||
/**
|
||||
* Push a frame on the render thread's cached stack, falling back to the
|
||||
* normal ThreadLocal lookup on a thread switch.
|
||||
*/
|
||||
public static MemoryStack push() {
|
||||
ThreadStack current = cached;
|
||||
Thread thread = Thread.currentThread();
|
||||
if (current.thread() != thread) {
|
||||
current = new ThreadStack(thread, MemoryStack.stackGet());
|
||||
cached = current;
|
||||
}
|
||||
return current.stack().push();
|
||||
}
|
||||
|
||||
/** Test-only: peek the cached thread (null before first call). */
|
||||
static Thread cachedThread() {
|
||||
return cached.thread();
|
||||
}
|
||||
|
||||
/** Test-only: peek the cached stack (null before first call). */
|
||||
static MemoryStack cachedStack() {
|
||||
return cached.stack();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.entity;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
|
||||
/**
|
||||
* Entity LOD gate: is an entity far enough that the renderer should skip its
|
||||
* layers (armour, held items, eyes, cape, elytra, stuck arrows) and freeze its
|
||||
* animation? Compares squared distance to the configured threshold so the
|
||||
* caller doesn't have to {@code Math.sqrt}.
|
||||
*
|
||||
* <p>The companion {@code farPlayer} exists so a config can drop
|
||||
* players separately from entities (the {@code playerLod} toggle); in LoVisual
|
||||
* Stage 1 we collapse the two — the same toggle gates both. Stage 2 may split
|
||||
* them again if profiling shows players are the bigger cost.
|
||||
*/
|
||||
public enum EntityLod {
|
||||
;
|
||||
|
||||
/** Squared threshold at and above which an entity is "far". */
|
||||
public static double farThresholdSq() {
|
||||
double d = OptimizeToggles.entityLodDistance();
|
||||
return d * d;
|
||||
}
|
||||
|
||||
/** True when LOD is on and the entity is beyond the configured distance. */
|
||||
public static boolean far(double distanceSq) {
|
||||
if (!OptimizeToggles.entityLod()) {
|
||||
return false;
|
||||
}
|
||||
return distanceSq > farThresholdSq();
|
||||
}
|
||||
|
||||
/** Same as {@link #far} — players and entities share one toggle in Stage 1. */
|
||||
public static boolean farPlayer(double distanceSq) {
|
||||
return far(distanceSq);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.entity;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
||||
/**
|
||||
* Mixin-contract: back-reference the source {@link Entity} on its
|
||||
* {@code EntityRenderState}. Render-states are rebuilt every frame, so they
|
||||
* can't keep their own pointer to the entity — the
|
||||
* {@code EntityRenderer.createRenderState} mixin captures it once per state
|
||||
* construction via {@link #lovisual$entity(Entity)} and downstream renderers
|
||||
* (model feature renderer, item feature renderer, future LOD mixins) read it
|
||||
* back via {@link #lovisual$entity()} to reach the live entity for animation
|
||||
* freeze, LOD distance checks, etc.
|
||||
*/
|
||||
public interface StateEntity {
|
||||
Entity lovisual$entity();
|
||||
|
||||
void lovisual$entity(Entity entity);
|
||||
}
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.gl;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import dev.loki.lovisual.render.engine.optimize.gl.SharedDepthFbos;
|
||||
import it.unimi.dsi.fastutil.ints.Int2LongOpenHashMap;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* GL backend implementation of {@link RenderBackendOps}.
|
||||
*
|
||||
* <p>Resolves the current GL device via {@code GlBackendAccess.current()} —
|
||||
* returns {@code null} on Vulkan so all mixins short-circuit to the vanilla
|
||||
* call. The cache state is static and render-thread-only (the GL command
|
||||
* encoder runs single-threaded).
|
||||
*
|
||||
* <p>Each toggle is gated by {@link OptimizeToggles#microOpts()} (the Stage 1
|
||||
* "micro_opts" toggle wired into {@code Optimize.java}).
|
||||
*/
|
||||
public final class GlRenderBackendOps implements RenderBackendOps {
|
||||
|
||||
private static final GlRenderBackendOps INSTANCE = new GlRenderBackendOps();
|
||||
|
||||
// --- TBO cache ---
|
||||
/** Maps bound-texture-id -> packed (format << 32) | (buffer & 0xFFFFFFFFL). -1 = nothing attached. */
|
||||
private final Int2LongOpenHashMap tboAttached = new Int2LongOpenHashMap();
|
||||
private int boundTboTexture;
|
||||
|
||||
// --- RenderTypes cache ---
|
||||
private final Map<Identifier, Object> translucentCache = new ConcurrentHashMap<>();
|
||||
|
||||
private GlRenderBackendOps() {
|
||||
tboAttached.defaultReturnValue(-1L);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the singleton GL backend instance, or {@code null} if the
|
||||
* current device is not GL (e.g. Vulkan backend active).
|
||||
*/
|
||||
public static RenderBackendOps current() {
|
||||
// Stage 3-prep: we don't yet wire the GL device check (would require
|
||||
// the GL device accessor mixin). Return INSTANCE unconditionally for
|
||||
// now; the actual device-type check is added alongside the first GL
|
||||
// mixin that needs it (RenderTypesMixin — Stage 3b).
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
// --- Lazy clear ---
|
||||
|
||||
@Override
|
||||
public boolean lazyClearSupported() {
|
||||
return OptimizeToggles.microOpts();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean skipBindFramebufferZero(int framebuffer) {
|
||||
if (!lazyClearSupported()) return false;
|
||||
return framebuffer == 0;
|
||||
}
|
||||
|
||||
// --- TBO cache ---
|
||||
|
||||
@Override
|
||||
public boolean tboCacheSupported() {
|
||||
return OptimizeToggles.microOpts();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void trackBoundTboTexture(int texture) {
|
||||
boundTboTexture = texture;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean tboAlreadyAttached(int format, int buffer) {
|
||||
if (!tboCacheSupported()) return false;
|
||||
return tboAttached.getOrDefault(boundTboTexture, -1L) == packTboKey(format, buffer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markTboAttached(int format, int buffer) {
|
||||
if (!tboCacheSupported()) return;
|
||||
tboAttached.put(boundTboTexture, packTboKey(format, buffer));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void forgetTboCache() {
|
||||
tboAttached.clear();
|
||||
}
|
||||
|
||||
private static long packTboKey(int format, int buffer) {
|
||||
return ((long) format << 32) | (buffer & 0xFFFFFFFFL);
|
||||
}
|
||||
|
||||
// --- FBO share (Stage 3 step 2) ---
|
||||
|
||||
@Override
|
||||
public boolean fboShareSupported() {
|
||||
return OptimizeToggles.fboShare();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean clearDepthInPlace(int depthId, double value) {
|
||||
return fboShareSupported() && SharedDepthFbos.clear(depthId, value);
|
||||
}
|
||||
|
||||
// --- RenderTypes cache ---
|
||||
|
||||
@Override
|
||||
public boolean renderTypesCacheSupported() {
|
||||
return OptimizeToggles.microOpts();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object renderTypeFor(Identifier id) {
|
||||
if (!renderTypesCacheSupported()) return null;
|
||||
return translucentCache.get(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cacheRenderType(Identifier id, Object type) {
|
||||
if (!renderTypesCacheSupported()) return;
|
||||
translucentCache.put(id, type);
|
||||
}
|
||||
|
||||
// --- Test helpers ---
|
||||
|
||||
/** Test-only: clear all caches. */
|
||||
static void resetForTesting() {
|
||||
INSTANCE.tboAttached.clear();
|
||||
INSTANCE.boundTboTexture = 0;
|
||||
INSTANCE.translucentCache.clear();
|
||||
}
|
||||
|
||||
/** Test-only: peek the bound TBO texture. */
|
||||
static int boundTboTextureForTesting() {
|
||||
return INSTANCE.boundTboTexture;
|
||||
}
|
||||
|
||||
/** Test-only: count of cached render types. */
|
||||
static int cachedRenderTypeCountForTesting() {
|
||||
return INSTANCE.translucentCache.size();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,161 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.gl;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.vulkan.VulkanRenderBackendOps;
|
||||
|
||||
/**
|
||||
* Backend-agnostic surface for the optimization layer's GL/Vulkan hooks.
|
||||
*
|
||||
* <p>Stage 3 of {@code mod/docs/optimize-layer-design.md} splits the engine
|
||||
* into "what to do" (this interface) and "how to do it on this backend"
|
||||
* ({@link GlRenderBackendOps} for OpenGL, a future {@code VulkanRenderBackendOps}
|
||||
* for Vulkan). The Optimize mixins call {@link #current()} once and dispatch
|
||||
* through this surface; the Vulkan implementation returns {@code false} from
|
||||
* every {@code supported*} method so the mixin's {@code WrapOperation} falls
|
||||
* through to the original call.
|
||||
*
|
||||
* <p>Stage 3 ships:
|
||||
* <ul>
|
||||
* <li>{@link #lazyClearSupported()} / {@link #skipBindFramebufferZero(int)} — lazy clear</li>
|
||||
* <li>{@link #tboCacheSupported()} / {@link #tboAlreadyAttached(int, int)} /
|
||||
* {@link #markTboAttached(int, int)} / {@link #trackBoundTboTexture(int)} /
|
||||
* {@link #forgetTboCache()} — TBO cache</li>
|
||||
* <li>{@link #fboShareSupported()} / {@link #clearDepthInPlace(int, double)} —
|
||||
* shared depth FBOs (Stage 3 step 2)</li>
|
||||
* <li>{@link #renderTypesCacheSupported()} / {@link #renderTypeFor(Identifier)} /
|
||||
* {@link #cacheRenderType(Identifier, Object)} — RenderTypes cache</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>Stage 4 will add Vulkan-specific paths ({@code vkCmdCopyImage},
|
||||
* {@code VkPipelineCache}) by implementing this surface with a no-op strategy
|
||||
* for the GL-only methods.
|
||||
*/
|
||||
public interface RenderBackendOps {
|
||||
|
||||
/**
|
||||
* Resolve the current backend by inspecting the active {@code GpuDeviceBackend}.
|
||||
* Class-name check (not {@code instanceof}) so this method itself does not
|
||||
* force the loader to link {@code GlDevice} or {@code VulkanDevice}; the
|
||||
* Blaze3D jar always ships both, but keeping the check by string means the
|
||||
* dispatch stays correct even when only one backend's class has been
|
||||
* resolved. Falls back to the GL impl when the device is null (early boot)
|
||||
* so mixins' {@code supported()} short-circuits behave the same as before.
|
||||
*/
|
||||
static RenderBackendOps current() {
|
||||
Object device;
|
||||
try {
|
||||
device = RenderSystem.getDevice();
|
||||
} catch (Throwable ignored) {
|
||||
// Tests and pre-init paths call current() before RenderSystem has a
|
||||
// device; fall through to GL so existing unit tests keep passing.
|
||||
device = null;
|
||||
}
|
||||
if (device != null) {
|
||||
String name = device.getClass().getName();
|
||||
if (name.startsWith("com.mojang.blaze3d.vulkan.")) {
|
||||
return VulkanRenderBackendOps.current();
|
||||
}
|
||||
}
|
||||
return GlRenderBackendOps.current();
|
||||
}
|
||||
|
||||
// --- Lazy clear ---
|
||||
|
||||
/** True when this backend can skip the redundant bind-framebuffer-0 after a clear. */
|
||||
boolean lazyClearSupported();
|
||||
|
||||
/**
|
||||
* Called from {@code GlCommandEncoder.clearColorAndDepthTextures} on the
|
||||
* {@code GlStateManager._glBindFramebuffer(target, framebuffer)} call.
|
||||
*
|
||||
* @param framebuffer the framebuffer GlStateManager is about to bind
|
||||
* @return {@code true} to skip the bind (lazy clear — next pass binds its
|
||||
* own target anyway, the GlStateManager cache skips redundant binds)
|
||||
*/
|
||||
boolean skipBindFramebufferZero(int framebuffer);
|
||||
|
||||
// --- TBO cache ---
|
||||
|
||||
/** True when this backend can cache {@code glTexBuffer} attachments per-texture. */
|
||||
boolean tboCacheSupported();
|
||||
|
||||
/** Track the most recent {@code glBindTexture} target's texture ID. */
|
||||
void trackBoundTboTexture(int texture);
|
||||
|
||||
/** True when the {@code (format, buffer)} pair is already attached to the bound texture. */
|
||||
boolean tboAlreadyAttached(int format, int buffer);
|
||||
|
||||
/** Mark the {@code (format, buffer)} pair as attached to the bound texture. */
|
||||
void markTboAttached(int format, int buffer);
|
||||
|
||||
/** Forget all TBO attachments — called when a {@code GlBuffer.Direct} is closed. */
|
||||
void forgetTboCache();
|
||||
|
||||
// --- FBO share (Stage 3 step 2) ---
|
||||
|
||||
/** True when this backend can clear a depth texture in place via a cached FBO. */
|
||||
boolean fboShareSupported();
|
||||
|
||||
/**
|
||||
* Called from {@code GlCommandEncoder.clearDepthTexture} on the
|
||||
* {@code GlTexture} depth argument.
|
||||
*
|
||||
* @param depthId the GL id of the depth texture
|
||||
* @param value the clear value (0..1)
|
||||
* @return {@code true} when the clear already ran in place (mixin cancels
|
||||
* the vanilla path); {@code false} to fall through to vanilla
|
||||
*/
|
||||
boolean clearDepthInPlace(int depthId, double value);
|
||||
|
||||
// --- RenderTypes cache ---
|
||||
|
||||
/** True when this backend can cache {@code RenderTypes.entityTranslucent(id, flag=true)}. */
|
||||
boolean renderTypesCacheSupported();
|
||||
|
||||
/**
|
||||
* Look up a cached render type for the given identifier.
|
||||
*
|
||||
* @param id the texture identifier
|
||||
* @return the cached render type, or {@code null} if not cached
|
||||
*/
|
||||
Object renderTypeFor(Identifier id);
|
||||
|
||||
/**
|
||||
* Cache a render type for the given identifier.
|
||||
*
|
||||
* @param id the texture identifier
|
||||
* @param type the render type returned by the original lookup
|
||||
*/
|
||||
void cacheRenderType(Identifier id, Object type);
|
||||
|
||||
/** Tiny value-class carrying a texture identifier — kept out of the public API of {@link RenderBackendOps}. */
|
||||
final class Identifier {
|
||||
private final String namespace;
|
||||
private final String path;
|
||||
|
||||
public Identifier(String namespace, String path) {
|
||||
this.namespace = namespace;
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
public String namespace() { return namespace; }
|
||||
public String path() { return path; }
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return namespace.hashCode() * 31 + path.hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
return o instanceof Identifier i
|
||||
&& i.namespace.equals(namespace)
|
||||
&& i.path.equals(path);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return namespace + ":" + path;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.hud;
|
||||
|
||||
/**
|
||||
* Hysteresis controller for the HUD cache. The HUD cache only saves work when
|
||||
* several frames share one HUD refresh; near one frame per refresh (refresh
|
||||
* interval ~= frame time) it redraws the HUD anyway and just adds a
|
||||
* full-screen clear + blend, which costs real FPS on integrated GPUs and
|
||||
* 60 Hz monitors. This controller tracks an EMA of frame time
|
||||
* ({@code *0.95 + dt*0.05}) and flips the "worth it" state with hysteresis:
|
||||
* turns OFF below {@code OFF_BELOW} frames-per-refresh, turns ON above
|
||||
* {@code ON_ABOVE}.
|
||||
*
|
||||
* <p>Pure logic, no Minecraft dependencies, fully testable. The (Stage 3) HUD cache mixin reads
|
||||
* {@link #worth()} to decide whether to engage.
|
||||
*/
|
||||
public enum HudWorth {
|
||||
;
|
||||
|
||||
private static final double OFF_BELOW = 1.5;
|
||||
private static final double ON_ABOVE = 2.0;
|
||||
|
||||
private static double frameNs;
|
||||
private static long last;
|
||||
private static volatile boolean worth = true;
|
||||
|
||||
/** True when the HUD cache is currently engaged. */
|
||||
public static boolean worth() {
|
||||
return worth;
|
||||
}
|
||||
|
||||
/** True when the HUD cache should be available at all (independent of FPS). */
|
||||
public static boolean hysteresisEnabled() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the EMA frame time and the hysteresis state. Called once per
|
||||
* frame; returns the new {@link #worth()} value.
|
||||
*
|
||||
* @param now the current {@code System.nanoTime()} reading
|
||||
* @param refreshNs nanoseconds between HUD refreshes (1e9 / monitor Hz)
|
||||
*/
|
||||
public static boolean update(long now, long refreshNs) {
|
||||
long dt = now - last;
|
||||
last = now;
|
||||
if (dt > 0 && dt < 1_000_000_000L) {
|
||||
frameNs = frameNs == 0 ? dt : frameNs * 0.95 + dt * 0.05;
|
||||
}
|
||||
double framesPerRefresh = frameNs == 0 ? ON_ABOVE : refreshNs / frameNs;
|
||||
if (worth ? framesPerRefresh < OFF_BELOW : framesPerRefresh > ON_ABOVE) {
|
||||
worth = !worth;
|
||||
}
|
||||
return worth;
|
||||
}
|
||||
|
||||
/** Test-only: reset EMA + hysteresis to defaults. */
|
||||
static void reset() {
|
||||
frameNs = 0;
|
||||
last = 0;
|
||||
worth = true;
|
||||
}
|
||||
|
||||
/** Test-only: read the EMA frame time in nanoseconds. */
|
||||
static double frameNs() {
|
||||
return frameNs;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.particle;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
|
||||
/**
|
||||
* Per-tick cache of {@code ClientLevel.getFluidState(pos)} results for
|
||||
* {@code BubbleColumnUpParticle.tick}. Thousands of bubble particles share a
|
||||
* few columns; each one re-checks its block's fluid every tick, which is a
|
||||
* chunk-section lookup per call. This cache is keyed by {@code BlockPos.asLong()}
|
||||
* and cleared once per tick (game-time change), so it never serves stale data
|
||||
* across ticks.
|
||||
*
|
||||
* <p>Render-thread only (vanilla particle ticking is single-threaded). The
|
||||
* cache is static because {@code BubbleColumnUpParticle} instances are created
|
||||
* and destroyed constantly — per-particle state would be re-initialized too
|
||||
* often to be useful.
|
||||
*
|
||||
* The cache logic is in {@link TickCache} (a generic per-tick keyed cache),
|
||||
* so it's unit-testable without Minecraft types.
|
||||
*/
|
||||
public enum BubbleColumnCache {
|
||||
;
|
||||
|
||||
private static final TickCache<FluidState> CACHE = new TickCache<>();
|
||||
|
||||
/** True when the cache is engaged this frame. */
|
||||
public static boolean enabled() {
|
||||
return OptimizeToggles.microOpts();
|
||||
}
|
||||
|
||||
/** Look up a cached fluid state for the given block-pos key + tick. */
|
||||
public static FluidState get(long posLong, long tick) {
|
||||
return CACHE.get(posLong, tick);
|
||||
}
|
||||
|
||||
/** Store a fluid state for the given block-pos key. */
|
||||
public static void put(long posLong, FluidState fluid) {
|
||||
CACHE.put(posLong, fluid);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.particle;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
|
||||
/**
|
||||
* Per-frame thinning of far particles. Particles beyond 16 blocks are kept
|
||||
* every other frame (32+ blocks: every fourth) using
|
||||
* {@code System.identityHashCode(particle) >>> 4} as a stable per-particle
|
||||
* salt so the choice doesn't flicker.
|
||||
*
|
||||
* <p>The hot-path API takes the camera position as primitives (no
|
||||
* {@code Vec3} allocation); the {@code keep(Object, double)} overload is the
|
||||
* pure-logic piece, testable without Minecraft types.
|
||||
*
|
||||
* <p>The {@code tick} field (sampled once per {@code ParticleEngine.render}) lives on the
|
||||
* (Stage 3) particle mixin that owns the per-frame lifecycle; the pure-logic
|
||||
* distance decision is here.
|
||||
*/
|
||||
public enum ParticleLod {
|
||||
;
|
||||
|
||||
private static final double NEAR_SQ = 16.0 * 16.0;
|
||||
private static final double MID_SQ = 32.0 * 32.0;
|
||||
|
||||
/**
|
||||
* True when the particle should be kept this frame. The caller passes the
|
||||
* particle's identity (for the per-particle salt) and the squared distance
|
||||
* from the camera — both already computed by the renderer.
|
||||
*/
|
||||
public static boolean keep(Object particle, double distanceSq) {
|
||||
if (!OptimizeToggles.particleLod()) {
|
||||
return true;
|
||||
}
|
||||
if (distanceSq < NEAR_SQ) {
|
||||
return true;
|
||||
}
|
||||
int h = System.identityHashCode(particle) >>> 4;
|
||||
return distanceSq < MID_SQ ? (h & 1) == 0 : (h & 3) == 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convenience overload: compute squared distance from primitives and
|
||||
* dispatch to {@link #keep(Object, double)}.
|
||||
*/
|
||||
public static boolean keep(Object particle, double x, double y, double z,
|
||||
double camX, double camY, double camZ) {
|
||||
double dx = x - camX, dy = y - camY, dz = z - camZ;
|
||||
return keep(particle, dx * dx + dy * dy + dz * dz);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.particle;
|
||||
|
||||
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
|
||||
|
||||
/**
|
||||
* Generic per-tick cache keyed by {@code long}. The cache is cleared once per
|
||||
* tick change (game-time change), so it never serves stale data across ticks.
|
||||
*
|
||||
* <p>Used by {@link BubbleColumnCache} for {@code ClientLevel.getFluidState}
|
||||
* results — thousands of bubble particles share a few columns; each one
|
||||
* re-checks its block's fluid every tick. Generic on the value type so the
|
||||
* logic is unit-testable without Minecraft types.
|
||||
*
|
||||
* <p>Render-thread only. The cache is static because particle instances are
|
||||
* created and destroyed constantly — per-particle state would be re-initialized
|
||||
* too often to be useful.
|
||||
*
|
||||
*/
|
||||
public final class TickCache<V> {
|
||||
|
||||
private final Long2ObjectOpenHashMap<V> map = new Long2ObjectOpenHashMap<>();
|
||||
private long cachedTick = Long.MIN_VALUE;
|
||||
|
||||
/**
|
||||
* Look up a cached value for the given key, on the given tick. If the tick
|
||||
* differs from the cached tick, the cache is cleared first.
|
||||
*
|
||||
* @param key the packed position key (e.g. {@code BlockPos.asLong()})
|
||||
* @param tick the current game tick
|
||||
* @return the cached value, or {@code null} if not cached
|
||||
*/
|
||||
public V get(long key, long tick) {
|
||||
if (tick != cachedTick) {
|
||||
map.clear();
|
||||
cachedTick = tick;
|
||||
}
|
||||
return map.get(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a value for the given key, on the current tick. The cache must
|
||||
* have been primed by a {@link #get} call first — that's where the tick
|
||||
* check happens; this method assumes the cache is fresh.
|
||||
*/
|
||||
public void put(long key, V value) {
|
||||
map.put(key, value);
|
||||
}
|
||||
|
||||
/** Number of cached entries on the current tick. */
|
||||
public int size() {
|
||||
return map.size();
|
||||
}
|
||||
|
||||
/** The tick the cache currently holds data for. */
|
||||
public long cachedTick() {
|
||||
return cachedTick;
|
||||
}
|
||||
|
||||
/** Reset the cache to empty (used by tests and on disable). */
|
||||
public void reset() {
|
||||
map.clear();
|
||||
cachedTick = Long.MIN_VALUE;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,203 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.particle;
|
||||
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.function.IntConsumer;
|
||||
|
||||
/**
|
||||
* Fixed-size daemon pool for parallel particle extraction. The number of
|
||||
* helpers is {@code max(1, min(8, cores-2))} — leaving two cores for the
|
||||
* render thread and the GC. {@link #run(int, IntConsumer)} splits the work
|
||||
* into {@code blocks} units (caller decides the block size), dispatches them
|
||||
* across helpers AND the calling thread (the caller works too — it only ever
|
||||
* waits for blocks a helper has already claimed), and returns the first
|
||||
* failure or {@code null} on success.
|
||||
*
|
||||
* <p>Used by the (Stage 3) {@code QuadParticleGroup} mixin to parallelise
|
||||
* particle render-state extraction when the particle count exceeds 1024
|
||||
* (Stage 1 ports the pool; the wiring is a later stage).
|
||||
*
|
||||
* <p>Pure java.util.concurrent, no Minecraft dependencies, fully testable.
|
||||
*/
|
||||
public final class Workers {
|
||||
|
||||
public static final int COUNT = Math.max(1, Math.min(8, Runtime.getRuntime().availableProcessors() - 2));
|
||||
|
||||
/** Minimum logical CPU count required for AUTO mode to enable parallel particles. */
|
||||
public static final int PARALLEL_MIN_CORES = 4;
|
||||
|
||||
/**
|
||||
* Effective parallel-particles flag resolved from module + property overrides.
|
||||
* Written once per frame by {@code Optimize.pushState()}, read by the future
|
||||
* particle-extraction mixin to decide whether to fan out across {@link #stream(IntConsumer)}.
|
||||
*/
|
||||
private static volatile boolean parallelParticles;
|
||||
|
||||
/**
|
||||
* Resolve the parallel-particles flag. {@code forced} is the tri-state from
|
||||
* {@code -Dlovisual.opt.parallel_particles} (TRUE/FALSE) or {@code null} for AUTO; {@code moduleEnabled}
|
||||
* is the {@code Optimize.parallel_particles} switch (default {@code true}); AUTO engages when the
|
||||
* machine exposes {@link #PARALLEL_MIN_CORES} or more logical CPUs — mirrors the reference's
|
||||
* {@code CORES >= 4} rule from {@code mod/docs/optimize-layer-design.md}, no benchmark gate.
|
||||
*/
|
||||
public static void configureParallelParticles(Boolean forced, boolean moduleEnabled) {
|
||||
parallelParticles = resolveParallelParticles(forced, moduleEnabled, Runtime.getRuntime().availableProcessors());
|
||||
}
|
||||
|
||||
/** Test-friendly variant that lets the caller stub the CPU count. */
|
||||
public static boolean resolveParallelParticles(Boolean forced, boolean moduleEnabled, int cores) {
|
||||
if (forced != null) {
|
||||
return forced;
|
||||
}
|
||||
if (!moduleEnabled) {
|
||||
return false;
|
||||
}
|
||||
return cores >= PARALLEL_MIN_CORES;
|
||||
}
|
||||
|
||||
/** True when the particle-extraction mixin should split across the pool. */
|
||||
public static boolean shouldParallelParticles() {
|
||||
return parallelParticles;
|
||||
}
|
||||
|
||||
/** Reset to a safe default — used by {@code Optimize.onDisable} and by tests. */
|
||||
public static void resetParallelParticles() {
|
||||
parallelParticles = false;
|
||||
}
|
||||
|
||||
private static final AtomicInteger THREAD_ID = new AtomicInteger();
|
||||
private static final ExecutorService POOL = Executors.newFixedThreadPool(COUNT, r -> {
|
||||
Thread t = new Thread(r, "lovisual-opt-worker-" + THREAD_ID.incrementAndGet());
|
||||
t.setDaemon(true);
|
||||
return t;
|
||||
});
|
||||
|
||||
private Workers() {
|
||||
}
|
||||
|
||||
public static int poolSize() {
|
||||
return COUNT;
|
||||
}
|
||||
|
||||
/**
|
||||
* Run {@code task(0..blocks-1)} across the pool plus the calling thread.
|
||||
* Returns the first failure, or {@code null} if all blocks succeeded.
|
||||
*/
|
||||
public static Throwable run(int blocks, IntConsumer task) {
|
||||
if (blocks <= 0) {
|
||||
return null;
|
||||
}
|
||||
Job job = new Job(blocks, task);
|
||||
for (int h = Math.min(COUNT, blocks - 1); h > 0; h--) {
|
||||
POOL.execute(job::run);
|
||||
}
|
||||
// The caller works too; it only ever waits for blocks a helper has already claimed.
|
||||
job.run();
|
||||
while (job.completed.get() < blocks) {
|
||||
Thread.onSpinWait();
|
||||
}
|
||||
return job.error.get();
|
||||
}
|
||||
|
||||
/**
|
||||
* Open a task stream: helpers start right away and take items as the
|
||||
* caller publishes them, so work overlaps with preparing the rest.
|
||||
* Used by the parallel model builder (Stage 3).
|
||||
*/
|
||||
public static Stream stream(IntConsumer task) {
|
||||
Stream stream = new Stream(task);
|
||||
for (int h = COUNT; h > 0; h--) {
|
||||
POOL.execute(stream::work);
|
||||
}
|
||||
return stream;
|
||||
}
|
||||
|
||||
/** Test-only: shut the pool down so the JVM can exit cleanly. */
|
||||
public static void shutdown() {
|
||||
POOL.shutdownNow();
|
||||
}
|
||||
|
||||
/** Items {@code 0..count-1} are fully set up and may be taken by helpers. */
|
||||
public static final class Stream {
|
||||
final IntConsumer task;
|
||||
final AtomicInteger next = new AtomicInteger();
|
||||
final AtomicInteger completed = new AtomicInteger();
|
||||
final AtomicReference<Throwable> error = new AtomicReference<>();
|
||||
volatile int ready;
|
||||
volatile int total = -1;
|
||||
|
||||
Stream(IntConsumer task) {
|
||||
this.task = task;
|
||||
}
|
||||
|
||||
public void publish(int count) {
|
||||
ready = count;
|
||||
}
|
||||
|
||||
/** The caller helps with what is left and waits for the rest; first failure or null. */
|
||||
public Throwable finish(int count) {
|
||||
ready = count;
|
||||
total = count;
|
||||
work();
|
||||
while (completed.get() < count) {
|
||||
Thread.onSpinWait();
|
||||
}
|
||||
return error.get();
|
||||
}
|
||||
|
||||
void work() {
|
||||
while (true) {
|
||||
int n = next.get();
|
||||
if (n < ready) {
|
||||
if (next.compareAndSet(n, n + 1)) {
|
||||
try {
|
||||
if (error.get() == null) {
|
||||
task.accept(n);
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
error.compareAndSet(null, t);
|
||||
} finally {
|
||||
completed.incrementAndGet();
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
int t = total;
|
||||
if (t >= 0 && n >= t) {
|
||||
return;
|
||||
}
|
||||
Thread.onSpinWait();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static final class Job {
|
||||
final int blocks;
|
||||
final IntConsumer task;
|
||||
final AtomicInteger next = new AtomicInteger();
|
||||
final AtomicInteger completed = new AtomicInteger();
|
||||
final AtomicReference<Throwable> error = new AtomicReference<>();
|
||||
|
||||
Job(int blocks, IntConsumer task) {
|
||||
this.blocks = blocks;
|
||||
this.task = task;
|
||||
}
|
||||
|
||||
void run() {
|
||||
int b;
|
||||
while ((b = next.getAndIncrement()) < blocks) {
|
||||
try {
|
||||
if (error.get() == null) {
|
||||
task.accept(b);
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
error.compareAndSet(null, t);
|
||||
} finally {
|
||||
completed.incrementAndGet();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.particle.camera;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
/**
|
||||
* Cached camera position accessor for the particle optimization layer.
|
||||
* Vanilla {@code Particle.move} recomputes the camera position via
|
||||
* {@code Minecraft.getInstance().gameRenderer.mainCamera().position()} per
|
||||
* particle per tick — but the camera only moves once per frame. This helper
|
||||
* is the single point where the camera position is sampled, so
|
||||
* {@link ParticleMixin} reads it without re-walking the gameRenderer chain
|
||||
* per particle.
|
||||
*
|
||||
* particle ticking runs on the render thread.
|
||||
*/
|
||||
public final class CameraPosition {
|
||||
|
||||
private CameraPosition() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Sample the current camera position. Caller must not cache the returned
|
||||
* {@link Vec3} — it may be a reused instance whose values change between
|
||||
* frames.
|
||||
*/
|
||||
public static Vec3 get() {
|
||||
return Minecraft.getInstance().gameRenderer.mainCamera().position();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,79 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.text;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.util.FormattedCharSequence;
|
||||
import net.minecraft.util.FormattedCharSink;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Set;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
/**
|
||||
* Marker {@link FormattedCharSequence} wrapper that lets later code recognise
|
||||
* "this text won't change" by identity and skip BIDI re-shaping. The
|
||||
* {@link #mark(FormattedCharSequence)} call wraps and registers the sequence
|
||||
* in a {@link WeakHashMap}-backed set; {@link #isStable(FormattedCharSequence)}
|
||||
* checks membership.
|
||||
*
|
||||
* <p>The fast path is a plain {@code instanceof}
|
||||
* check on the wrapper; the slow path is a synchronised set lookup. LoVisual
|
||||
* keeps both — Stage 1 wires them both to {@link OptimizeToggles#microOpts()}.
|
||||
*/
|
||||
public final class StableText implements FormattedCharSequence {
|
||||
|
||||
private static final Set<FormattedCharSequence> STABLE =
|
||||
Collections.newSetFromMap(new WeakHashMap<>());
|
||||
|
||||
private final FormattedCharSequence text;
|
||||
|
||||
/** Package-private — use {@link #mark(FormattedCharSequence)} to construct. */
|
||||
StableText(FormattedCharSequence text) {
|
||||
this.text = text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Wrap a {@link FormattedCharSequence} so {@link #isStable(FormattedCharSequence)}
|
||||
* returns {@code true} for it. The wrapper is registered in a weak set so
|
||||
* it doesn't leak when the caller drops its reference.
|
||||
*/
|
||||
public static FormattedCharSequence mark(FormattedCharSequence text) {
|
||||
StableText stable = new StableText(text);
|
||||
synchronized (STABLE) {
|
||||
STABLE.add(stable);
|
||||
}
|
||||
return stable;
|
||||
}
|
||||
|
||||
/**
|
||||
* True when {@code text} is known not to change (so callers can skip BIDI
|
||||
* re-shape and other per-frame work). Fast path: {@code instanceof StableText}
|
||||
* when {@code microOpts} is on; slow path: synchronised set lookup otherwise.
|
||||
*/
|
||||
public static boolean isStable(FormattedCharSequence text) {
|
||||
if (OptimizeToggles.microOpts()) {
|
||||
return text instanceof StableText;
|
||||
}
|
||||
synchronized (STABLE) {
|
||||
return STABLE.contains(text);
|
||||
}
|
||||
}
|
||||
|
||||
/** Test-only: number of currently-tracked stable sequences. */
|
||||
static int trackedCount() {
|
||||
synchronized (STABLE) {
|
||||
return STABLE.size();
|
||||
}
|
||||
}
|
||||
|
||||
/** Test-only: clear the tracked set. */
|
||||
static void clearTracked() {
|
||||
synchronized (STABLE) {
|
||||
STABLE.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean accept(FormattedCharSink sink) {
|
||||
return text.accept(sink);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
package dev.loki.lovisual.features.module.modules.misc.optimize.vulkan;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.gl.RenderBackendOps;
|
||||
|
||||
/**
|
||||
* Vulkan-side implementation of {@link RenderBackendOps}. All GPU-object ops
|
||||
* (lazy clear, TBO cache, shared depth FBO, RenderTypes cache) currently live
|
||||
* in the GL mixin set — under Vulkan those mixins never load, so this class is
|
||||
* a no-op placeholder that lets {@code RenderBackendOps.current()} dispatch by
|
||||
* actual backend instead of unconditionally returning the GL impl.
|
||||
*
|
||||
* <p>Every {@code *Supported} reports {@code false}. Callers already gate on
|
||||
* supported before attempting, so the effect is the same as "Optimize GPU
|
||||
* features off" for backend-dependent items. Stage 4 adds Vulkan-specific
|
||||
* paths (persistent {@code VkPipelineCache}, {@code VulkanRenderPass} state
|
||||
* cache) by flipping the corresponding {@code *Supported} here to true and
|
||||
* implementing the op body.
|
||||
*
|
||||
* <p>Doc reference: {@code mod/docs/optimize-layer-design.md}, "Этап 4" and
|
||||
* "Что уже решено в архитектуре" → "Рендер-бэкенды".
|
||||
*/
|
||||
public final class VulkanRenderBackendOps implements RenderBackendOps {
|
||||
|
||||
private static final VulkanRenderBackendOps INSTANCE = new VulkanRenderBackendOps();
|
||||
|
||||
private VulkanRenderBackendOps() {
|
||||
}
|
||||
|
||||
/** Singleton — no state, no per-device instance needed. */
|
||||
public static VulkanRenderBackendOps current() {
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
// --- Lazy clear ---
|
||||
|
||||
@Override
|
||||
public boolean lazyClearSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean skipBindFramebufferZero(int framebuffer) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// --- TBO cache ---
|
||||
|
||||
@Override
|
||||
public boolean tboCacheSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void trackBoundTboTexture(int texture) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean tboAlreadyAttached(int format, int buffer) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markTboAttached(int format, int buffer) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void forgetTboCache() {
|
||||
}
|
||||
|
||||
// --- FBO share ---
|
||||
|
||||
@Override
|
||||
public boolean fboShareSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean clearDepthInPlace(int depthId, double value) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// --- RenderTypes cache ---
|
||||
|
||||
@Override
|
||||
public boolean renderTypesCacheSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object renderTypeFor(Identifier id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cacheRenderType(Identifier id, Object type) {
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@ package dev.loki.lovisual.features.module.modules.visuals.effects.ambient;
|
|||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.effects.ambient.geometry.WorldParticlesGeometry;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.optimization.FpsOptimizer;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.Optimize;
|
||||
import dev.loki.lovisual.render.engine.animation.AnimationUtility;
|
||||
import dev.loki.lovisual.render.engine.color.ColorBlendMode;
|
||||
import dev.loki.lovisual.render.engine.RenderState;
|
||||
|
|
@ -51,7 +51,7 @@ final class WorldParticlesFunnel {
|
|||
|
||||
MeshBuilder distortionMesh = WorldParticlesBatches.tintedTexture(renderer, useDepth, depthMode, TextureStorage.FUNNEL_DISTORTION);
|
||||
MeshBuilder eyeMesh = WorldParticlesBatches.tintedTexture(renderer, useDepth, depthMode, TextureStorage.FUNNEL_EYE);
|
||||
MeshBuilder bloomMesh = FpsOptimizer.bloomDisabled()
|
||||
MeshBuilder bloomMesh = Optimize.bloomDisabled()
|
||||
? null
|
||||
: WorldParticlesBatches.tintedTexture(renderer, useDepth, depthMode, TextureStorage.BLOOM);
|
||||
if (distortionMesh == null && eyeMesh == null && bloomMesh == null) {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import net.minecraft.world.entity.projectile.Projectile;
|
|||
import net.minecraft.world.entity.projectile.arrow.AbstractArrow;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.joml.Quaternionf;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.optimization.FpsOptimizer;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.Optimize;
|
||||
import dev.loki.lovisual.mixins.accessors.projectile.PersistentProjectileEntityAccessor;
|
||||
import dev.loki.lovisual.render.engine.RenderState;
|
||||
import dev.loki.lovisual.render.engine.pipeline.LoVisualRenderPipelines;
|
||||
|
|
@ -123,7 +123,7 @@ final class TrailsParticles {
|
|||
Renderer3D.DepthMode dm = useDepth ? Renderer3D.DepthMode.PRE_DEPTH : Renderer3D.DepthMode.MAIN;
|
||||
Quaternionf camRot = RenderState.cameraRotation;
|
||||
if (mode == ParticleTextureMode.BLOOM) {
|
||||
if (FpsOptimizer.bloomDisabled()) return;
|
||||
if (Optimize.bloomDisabled()) return;
|
||||
MeshBuilder mesh = renderer.batchTextured(pipeline, TextureStorage.FIRE_FLY, dm);
|
||||
if (mesh == null) return;
|
||||
for (Particle3D p : extra) renderOne(mesh, p, tickDelta, camRot, geo);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package dev.loki.lovisual.features.module.modules.visuals.effects.hits;
|
||||
|
||||
import com.mojang.blaze3d.pipeline.RenderPipeline;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.optimization.FpsOptimizer;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.Optimize;
|
||||
import dev.loki.lovisual.render.engine.RenderState;
|
||||
import dev.loki.lovisual.render.engine.pipeline.LoVisualRenderPipelines;
|
||||
import dev.loki.lovisual.render.engine.renderer.Renderer3D;
|
||||
|
|
@ -80,7 +80,7 @@ final class HitParticleHelper {
|
|||
Renderer3D.DepthMode depthMode = useDepth ? Renderer3D.DepthMode.PRE_DEPTH : Renderer3D.DepthMode.MAIN;
|
||||
Quaternionf camRot = RenderState.cameraRotation;
|
||||
if (parent.hitParticleTexture.get() == ParticleTextureMode.BLOOM) {
|
||||
if (FpsOptimizer.bloomDisabled()) return;
|
||||
if (Optimize.bloomDisabled()) return;
|
||||
MeshBuilder mesh = renderer.batchTextured(pipeline, TextureStorage.FIRE_FLY, depthMode);
|
||||
if (mesh == null) return;
|
||||
for (Particle3D p : hitParticles) renderParticle(mesh, p, tickDelta, camRot);
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
package dev.loki.lovisual.features.module.modules.visuals.optimization;
|
||||
|
||||
import net.minecraft.core.particles.ParticleTypes;
|
||||
import dev.loki.lovisual.config.values.primitive.BooleanValue;
|
||||
import dev.loki.lovisual.config.values.primitive.NumberValue;
|
||||
import dev.loki.lovisual.events.impl.render.particles.ParticleSpawnEvent;
|
||||
import dev.loki.lovisual.events.meta.EventHandler;
|
||||
import dev.loki.lovisual.features.module.core.Module;
|
||||
import dev.loki.lovisual.features.module.core.ModuleCategory;
|
||||
import dev.loki.lovisual.features.module.core.ModuleInfo;
|
||||
import dev.loki.lovisual.features.module.lifecycle.Modules;
|
||||
|
||||
@ModuleInfo(
|
||||
id = "fpsoptimizer",
|
||||
displayName = "FPS Optimizer",
|
||||
category = ModuleCategory.VISUALS
|
||||
)
|
||||
public final class FpsOptimizer extends Module {
|
||||
|
||||
private final BooleanValue disableParticles =
|
||||
bool("disable_particles", false);
|
||||
private final BooleanValue disableMenuBackground =
|
||||
bool("disable_menu_background", false);
|
||||
private final BooleanValue disableGlass =
|
||||
bool("disable_glass", false);
|
||||
private final BooleanValue disableBloom =
|
||||
bool("disable_bloom", false);
|
||||
private final BooleanValue entityCulling =
|
||||
bool("entity_culling", false);
|
||||
private final NumberValue<Integer> entityCullDistance =
|
||||
visibleWhen(num("entity_cull_distance", 64, 8, 256), entityCulling::get);
|
||||
|
||||
public boolean isMenuBackgroundDisabled() {
|
||||
return isEnabled() && disableMenuBackground.get();
|
||||
}
|
||||
|
||||
public boolean isGlassDisabled() {
|
||||
return isEnabled() && disableGlass.get();
|
||||
}
|
||||
|
||||
public boolean isBloomDisabled() {
|
||||
return isEnabled() && disableBloom.get();
|
||||
}
|
||||
|
||||
public boolean isEntityCullingEnabled() {
|
||||
return isEnabled() && entityCulling.get();
|
||||
}
|
||||
|
||||
public int entityCullDistance() {
|
||||
return entityCullDistance.get();
|
||||
}
|
||||
|
||||
/** Cheap call-site guard for renderers that build bloom/glow geometry every frame. */
|
||||
public static boolean bloomDisabled() {
|
||||
FpsOptimizer module = Modules.get(FpsOptimizer.class);
|
||||
return module != null && module.isBloomDisabled();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
private void onParticleSpawn(ParticleSpawnEvent event) {
|
||||
if (!isEnabled() || !disableParticles.get()) return;
|
||||
// Firework particles are created by FireworkParticles$Starter and assume ParticleEngine.createParticle never returns null.
|
||||
// Cancelling them returns null and causes NPE at Starter.createParticle -> setTrail().
|
||||
// Guard is also present in FireworkParticlesStarterMixin, but exempt here to preserve fireworks even with optimizer enabled.
|
||||
var type = event.options().getType();
|
||||
if (type == ParticleTypes.FIREWORK || type == ParticleTypes.FLASH) return;
|
||||
event.cancel();
|
||||
}
|
||||
}
|
||||
|
|
@ -24,6 +24,7 @@ import dev.loki.lovisual.render.engine.renderer.Renderer3D;
|
|||
import dev.loki.lovisual.render.spatialgui.SpatialGuiCapture;
|
||||
import dev.loki.lovisual.render.spatialgui.SpatialGuiPlane;
|
||||
import dev.loki.lovisual.render.engine.uniform.MeshBuilder;
|
||||
import dev.loki.lovisual.util.logging.DebugLog;
|
||||
import net.minecraft.client.Camera;
|
||||
import net.minecraft.client.CameraType;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
|
@ -38,10 +39,12 @@ import org.joml.Vector3fc;
|
|||
* porting the core idea of Spatial GUI (https://github.com/tastytrash/Spatial-GUI, MIT) to LoVisual's own
|
||||
* module/config system and its deferred GUI-render pipeline.
|
||||
* <p>
|
||||
* The actual off-screen capture happens in {@code GuiRendererCaptureMixin} (which redirects the vanilla
|
||||
* {@code GuiRenderer.draw()} pass into {@link SpatialGuiCapture} instead of the main render target while this
|
||||
* module is active), and mouse routing happens in {@code MouseHandlerSpatialGuiMixin} (which reprojects the
|
||||
* real cursor position onto the plane published every frame via {@link SpatialGuiPlane}).
|
||||
* The off-screen capture follows the reference architecture: {@code GuiSpatialExtractMixin} diverts the open
|
||||
* screen's extraction from the vanilla main GUI state into {@link SpatialGuiCapture}'s isolated state,
|
||||
* {@code GameRendererSpatialGuiMixin} clears the capture texture and runs the isolated renderer at the end of
|
||||
* the frame, and {@code GuiRendererCaptureMixin} swaps that renderer's draw target for the capture texture —
|
||||
* mouse routing happens in {@code MouseHandlerSpatialGuiMixin} (which reprojects the real cursor position onto
|
||||
* the plane published every frame via {@link SpatialGuiPlane}).
|
||||
*/
|
||||
@ModuleInfo(
|
||||
id = "spatialgui",
|
||||
|
|
@ -168,23 +171,29 @@ public class SpatialGui extends Module {
|
|||
@Override
|
||||
public void onRenderWorldEngine(Renderer3D renderer, Renderer3D depthRenderer, float tickDelta) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if (mc.player == null || mc.level == null) return;
|
||||
if (mc.player == null || mc.level == null) {
|
||||
DebugLog.renderThreadOnChange("sg.plane", "noLevel", "[SpatialGui] plane skipped: no level");
|
||||
return;
|
||||
}
|
||||
|
||||
boolean liveScreen = trackedScreen != null;
|
||||
float progress = animationProgress();
|
||||
if (progress <= 0.0F && !liveScreen) {
|
||||
SpatialGuiPlane.clear();
|
||||
DebugLog.renderThreadOnChange("sg.plane", "closed", "[SpatialGui] plane skipped: screen closed");
|
||||
return;
|
||||
}
|
||||
|
||||
SpatialGuiCapture capture = SpatialGuiCapture.get();
|
||||
if (!capture.isReady()) {
|
||||
SpatialGuiPlane.clear();
|
||||
DebugLog.renderThreadOnChange("sg.plane", "captureNotReady", "[SpatialGui] plane skipped: capture not ready");
|
||||
return;
|
||||
}
|
||||
GpuTextureView textureView = capture.colorTextureView();
|
||||
if (textureView == null) {
|
||||
SpatialGuiPlane.clear();
|
||||
DebugLog.renderThreadOnChange("sg.plane", "noTextureView", "[SpatialGui] plane skipped: no texture view");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -245,6 +254,7 @@ public class SpatialGui extends Module {
|
|||
float drawAlpha = "Fade".equals(style) ? baseAlpha * ease(progress) : baseAlpha;
|
||||
if (drawAlpha <= 0.001F) {
|
||||
SpatialGuiPlane.clear();
|
||||
DebugLog.renderThreadOnChange("sg.plane", "alpha0", "[SpatialGui] plane skipped: drawAlpha<=0");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -261,6 +271,7 @@ public class SpatialGui extends Module {
|
|||
}
|
||||
|
||||
MeshBuilder mesh = renderer.batchTextured(LoVisualRenderPipelines.WORLD_TEXTURED_PREMULTIPLIED, textureView, cachedSampler, Renderer3D.DepthMode.NONE);
|
||||
DebugLog.renderThreadOnChange("sg.plane.mesh", mesh != null, "[SpatialGui] plane mesh=%b alpha=%.2f", mesh != null, drawAlpha);
|
||||
if (mesh != null) {
|
||||
// The capture holds premultiplied colour (GUI draws blended onto a transparent target), so the fade
|
||||
// factor must scale RGB together with alpha.
|
||||
|
|
@ -275,8 +286,11 @@ public class SpatialGui extends Module {
|
|||
|
||||
if (liveScreen) {
|
||||
SpatialGuiPlane.publish(new SpatialGuiPlane(center, planeRight, planeUp, halfWidth, halfHeight, guiWidth, guiHeight));
|
||||
DebugLog.renderThreadOnChange("sg.plane", "published",
|
||||
"[SpatialGui] plane published center=(%.2f, %.2f, %.2f) size=%.2fx%.2f", center.x, center.y, center.z, halfWidth * 2.0F, halfHeight * 2.0F);
|
||||
} else {
|
||||
SpatialGuiPlane.clear();
|
||||
DebugLog.renderThreadOnChange("sg.plane", "closing", "[SpatialGui] plane cleared: closing animation");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@ public final class LoVisualMixinPlugin implements IMixinConfigPlugin {
|
|||
"dev.loki.lovisual.mixins.sodium.terrain.SodiumShaderChunkRendererMixin",
|
||||
"dev.loki.lovisual.mixins.sodium.vertex.SodiumVertexConsumerTrackerMixin",
|
||||
"dev.loki.lovisual.mixins.sodium.placement.SodiumPlaceCullMixin",
|
||||
"dev.loki.lovisual.mixins.sodium.placement.SodiumPlaceHideMixin"
|
||||
"dev.loki.lovisual.mixins.sodium.placement.SodiumPlaceHideMixin",
|
||||
"dev.loki.lovisual.mixins.optimize.entity.SodiumEntityRendererMixin",
|
||||
"dev.loki.lovisual.mixins.optimize.gl.raw.VertexConsumerUtilsMixin"
|
||||
);
|
||||
private static final Set<String> OPTIONAL_IRIS_MIXINS = Set.of(
|
||||
"dev.loki.lovisual.mixins.iris.render.IrisCommonUniformsMixin",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
package dev.loki.lovisual.mixins.optimize.block;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.block.TickCached;
|
||||
import net.minecraft.world.level.BaseSpawner;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
/**
|
||||
* Stage 3: implements {@link TickCached} on {@link BaseSpawner} — adds the
|
||||
* per-tick cache slot that {@link dev.loki.lovisual.features.module.modules.misc.optimize.block.SpawnerCache}
|
||||
* reads back to skip the per-frame {@code extractEntity} rebuild of the
|
||||
* spawner's display mob.
|
||||
*
|
||||
* <p>The vanilla {@code SpawnerRenderer.extractRenderState} rebuilds the
|
||||
* display entity's render state every frame for every spawner in view;
|
||||
* the display entity only changes on tick boundaries (spin speed, mob
|
||||
* rotation, etc.), so caching by tick removes that rebuild from the hot path.
|
||||
*
|
||||
*/
|
||||
@Mixin(BaseSpawner.class)
|
||||
public abstract class BaseSpawnerMixin implements TickCached {
|
||||
|
||||
@Unique
|
||||
private Object lovisual$cached;
|
||||
|
||||
@Unique
|
||||
private long lovisual$cachedTick = Long.MIN_VALUE;
|
||||
|
||||
@Override
|
||||
public Object lovisual$cached() {
|
||||
return lovisual$cached;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long lovisual$cachedTick() {
|
||||
return lovisual$cachedTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$setCached(Object value, long tick) {
|
||||
lovisual$cached = value;
|
||||
lovisual$cachedTick = tick;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
package dev.loki.lovisual.mixins.optimize.block;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.block.CachedLight;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.block.CachedValidity;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.block.TickCached;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
/**
|
||||
* Stage 3: implements {@link TickCached}, {@link CachedLight} and
|
||||
* {@link CachedValidity} on {@link BlockEntity} — adds the per-tick cache
|
||||
* slot (object + tick), the per-tick block-light lookups, the per-tick
|
||||
* should-render distance check, and the per-state validity cache.
|
||||
*
|
||||
* <p>The vanilla {@code BlockEntityType.isValid(state)} is called every
|
||||
* frame per block-entity in view but only changes on a state transition;
|
||||
* {@code LightCoordsUtil.getLightCoords(level, pos)} walks the chunk's light
|
||||
* section data per call; {@code BlockEntityRenderer.shouldRender} does a
|
||||
* distance check that only changes when the entity moves across the cull
|
||||
* boundary. All three are cached via the interface fields implemented here.
|
||||
*
|
||||
*/
|
||||
@Mixin(BlockEntity.class)
|
||||
public abstract class BlockEntityMixin implements TickCached, CachedLight, CachedValidity {
|
||||
|
||||
// --- TickCached ---
|
||||
@Unique
|
||||
private Object lovisual$cached;
|
||||
@Unique
|
||||
private long lovisual$cachedTick = Long.MIN_VALUE;
|
||||
|
||||
// --- CachedLight ---
|
||||
@Unique
|
||||
private int lovisual$light;
|
||||
@Unique
|
||||
private long lovisual$lightTick = Long.MIN_VALUE;
|
||||
@Unique
|
||||
private int lovisual$pairLight;
|
||||
@Unique
|
||||
private long lovisual$pairLightTick = Long.MIN_VALUE;
|
||||
|
||||
// --- CachedValidity ---
|
||||
@Unique
|
||||
private BlockState lovisual$validState;
|
||||
@Unique
|
||||
private boolean lovisual$valid;
|
||||
@Unique
|
||||
private long lovisual$distanceTick = Long.MIN_VALUE;
|
||||
@Unique
|
||||
private boolean lovisual$inDistance;
|
||||
|
||||
// --- TickCached ---
|
||||
|
||||
@Override
|
||||
public Object lovisual$cached() {
|
||||
return lovisual$cached;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long lovisual$cachedTick() {
|
||||
return lovisual$cachedTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$setCached(Object value, long tick) {
|
||||
lovisual$cached = value;
|
||||
lovisual$cachedTick = tick;
|
||||
}
|
||||
|
||||
// --- CachedLight ---
|
||||
|
||||
@Override
|
||||
public int lovisual$light() {
|
||||
return lovisual$light;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long lovisual$lightTick() {
|
||||
return lovisual$lightTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$setLight(int light, long tick) {
|
||||
lovisual$light = light;
|
||||
lovisual$lightTick = tick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int lovisual$pairLight() {
|
||||
return lovisual$pairLight;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long lovisual$pairLightTick() {
|
||||
return lovisual$pairLightTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$setPairLight(int light, long tick) {
|
||||
lovisual$pairLight = light;
|
||||
lovisual$pairLightTick = tick;
|
||||
}
|
||||
|
||||
// --- CachedValidity ---
|
||||
|
||||
@Override
|
||||
public BlockState lovisual$validState() {
|
||||
return lovisual$validState;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean lovisual$valid() {
|
||||
return lovisual$valid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$setValid(BlockState state, boolean valid) {
|
||||
lovisual$validState = state;
|
||||
lovisual$valid = valid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long lovisual$distanceTick() {
|
||||
return lovisual$distanceTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean lovisual$inDistance() {
|
||||
return lovisual$inDistance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$setInDistance(boolean inDistance, long tick) {
|
||||
lovisual$inDistance = inDistance;
|
||||
lovisual$distanceTick = tick;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
package dev.loki.lovisual.mixins.optimize.block;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.block.CachedLight;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
|
||||
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.util.LightCoordsUtil;
|
||||
import net.minecraft.world.level.BlockAndLightGetter;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3: cache per-tick block-light lookups on every block-entity in view.
|
||||
*
|
||||
* <p>Vanilla {@code BlockEntityRenderState.extractBase} calls
|
||||
* {@link LightCoordsUtil#getLightCoords} every frame per block-entity — that
|
||||
* walks the chunk's light section data per call, and the light value only
|
||||
* changes on tick boundaries. This WrapOperation wraps the call to consult
|
||||
* the per-tick cache slot on the {@link BlockEntity} (via the
|
||||
* {@link CachedLight} mixin from Stage 3-continued-2) before falling through
|
||||
* to the original.
|
||||
*
|
||||
* Gated on the {@code blockEntityCache} toggle via
|
||||
* {@link OptimizeToggles#blockEntityCache()}. When the toggle is off, the
|
||||
* original runs unchanged.
|
||||
*/
|
||||
@Mixin(BlockEntityRenderState.class)
|
||||
public abstract class BlockEntityRenderStateMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "extractBase",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/util/LightCoordsUtil;getLightCoords(Lnet/minecraft/world/level/BlockAndLightGetter;Lnet/minecraft/core/BlockPos;)I")
|
||||
)
|
||||
private static int lovisual$cachedLight(BlockAndLightGetter level, BlockPos pos, Operation<Integer> original,
|
||||
BlockEntity blockEntity, BlockEntityRenderState state,
|
||||
ModelFeatureRenderer.CrumblingOverlay crumbling) {
|
||||
if (!OptimizeToggles.blockEntityCache() || !(level instanceof Level world)) {
|
||||
return original.call(level, pos);
|
||||
}
|
||||
if (!(blockEntity instanceof CachedLight cache)) {
|
||||
return original.call(level, pos);
|
||||
}
|
||||
long tick = world.getGameTime();
|
||||
if (cache.lovisual$lightTick() != tick) {
|
||||
cache.lovisual$setLight(original.call(level, pos), tick);
|
||||
}
|
||||
return cache.lovisual$light();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
package dev.loki.lovisual.mixins.optimize.block;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.block.CachedLight;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.block.TickCached;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import it.unimi.dsi.fastutil.ints.Int2IntFunction;
|
||||
import net.minecraft.client.renderer.blockentity.ChestRenderer;
|
||||
import net.minecraft.client.renderer.blockentity.state.ChestRenderState;
|
||||
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.ChestBlock;
|
||||
import net.minecraft.world.level.block.DoubleBlockCombiner;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3: double-chest combine cache + double-chest pair-light cache.
|
||||
*
|
||||
* <p>Two WrapOperations on {@link ChestRenderer#extractRenderState}:
|
||||
* <ul>
|
||||
* <li><b>Combine cache</b> — wraps {@link ChestBlock#combine} (the
|
||||
* neighbor-lookup that builds the double-chest render state). The
|
||||
* result only changes when the neighbour block changes, so caching by
|
||||
* game tick (via the {@link TickCached} mixin from Stage 3-continued-2)
|
||||
* removes the neighbor-walk from the per-frame hot path.</li>
|
||||
* <li><b>Pair-light cache</b> — wraps {@link Int2IntFunction#applyAsInt}
|
||||
* (the second light lookup done for double chests). Two light lookups
|
||||
* per chest per frame in vanilla, cached to one per tick via the
|
||||
* {@link CachedLight#lovisual$pairLight()} slot.</li>
|
||||
* </ul>
|
||||
*
|
||||
* Combine cache gated on {@code blockEntityCache} toggle; pair-light cache
|
||||
* gated on {@code microOpts} toggle.
|
||||
*/
|
||||
@Mixin(ChestRenderer.class)
|
||||
public abstract class ChestRendererMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "extractRenderState(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/client/renderer/blockentity/state/ChestRenderState;FLnet/minecraft/world/phys/Vec3;Lnet/minecraft/client/renderer/feature/ModelFeatureRenderer$CrumblingOverlay;)V",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/world/level/block/ChestBlock;combine(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Z)Lnet/minecraft/world/level/block/DoubleBlockCombiner$NeighborCombineResult;")
|
||||
)
|
||||
private DoubleBlockCombiner.NeighborCombineResult<?> lovisual$cachedCombine(
|
||||
ChestBlock block, BlockState state, Level level, BlockPos pos, boolean ignoreBlocked,
|
||||
Operation<DoubleBlockCombiner.NeighborCombineResult<?>> original,
|
||||
BlockEntity blockEntity, ChestRenderState renderState, float partialTick, Vec3 camera,
|
||||
ModelFeatureRenderer.CrumblingOverlay crumbling) {
|
||||
if (!OptimizeToggles.blockEntityCache()) {
|
||||
return original.call(block, state, level, pos, ignoreBlocked);
|
||||
}
|
||||
if (!(blockEntity instanceof TickCached cache)) {
|
||||
return original.call(block, state, level, pos, ignoreBlocked);
|
||||
}
|
||||
long tick = level.getGameTime();
|
||||
if (cache.lovisual$cachedTick() != tick || cache.lovisual$cached() == null) {
|
||||
cache.lovisual$setCached(original.call(block, state, level, pos, ignoreBlocked), tick);
|
||||
}
|
||||
return (DoubleBlockCombiner.NeighborCombineResult<?>) cache.lovisual$cached();
|
||||
}
|
||||
|
||||
@WrapOperation(
|
||||
method = "extractRenderState(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/client/renderer/blockentity/state/ChestRenderState;FLnet/minecraft/world/phys/Vec3;Lnet/minecraft/client/renderer/feature/ModelFeatureRenderer$CrumblingOverlay;)V",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lit/unimi/dsi/fastutil/ints/Int2IntFunction;applyAsInt(I)I")
|
||||
)
|
||||
private int lovisual$cachedPairLight(Int2IntFunction combiner, int light, Operation<Integer> original,
|
||||
BlockEntity blockEntity, ChestRenderState renderState, float partialTick, Vec3 camera,
|
||||
ModelFeatureRenderer.CrumblingOverlay crumbling) {
|
||||
Level level = blockEntity.getLevel();
|
||||
if (!OptimizeToggles.microOpts() || level == null) {
|
||||
return original.call(combiner, light);
|
||||
}
|
||||
if (!(blockEntity instanceof CachedLight cache)) {
|
||||
return original.call(combiner, light);
|
||||
}
|
||||
long tick = level.getGameTime();
|
||||
if (cache.lovisual$pairLightTick() != tick) {
|
||||
cache.lovisual$setPairLight(original.call(combiner, light), tick);
|
||||
}
|
||||
return cache.lovisual$pairLight();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.CachedName;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
/**
|
||||
* Stage 3: implements {@link CachedName} on {@link Entity} — adds the cached
|
||||
* name-tag fields (name + tick) that {@link EntityRendererNameMixin} populates
|
||||
* and reads back. Vanilla {@code Entity.getDisplayName()} rebuilds the team
|
||||
* prefix + name + suffix on every call; renderers call it once per frame per
|
||||
* entity in view, so caching by tick cuts the per-frame cost.
|
||||
*
|
||||
*/
|
||||
@Mixin(Entity.class)
|
||||
public abstract class EntityNameMixin implements CachedName {
|
||||
|
||||
@Unique
|
||||
private Component lovisual$name;
|
||||
|
||||
@Unique
|
||||
private long lovisual$nameTick = Long.MIN_VALUE;
|
||||
|
||||
@Override
|
||||
public Component lovisual$name() {
|
||||
return lovisual$name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long lovisual$nameTick() {
|
||||
return lovisual$nameTick;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$setName(Component name, long tick) {
|
||||
lovisual$name = name;
|
||||
lovisual$nameTick = tick;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.StateEntity;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
/**
|
||||
* Stage 3: implements {@link StateEntity} on {@link EntityRenderState} — adds
|
||||
* the back-reference field to the source {@link Entity}. Render-states are
|
||||
* rebuilt every frame, so they can't keep their own pointer — the
|
||||
* {@link EntityRendererStateMixin} captures it once per state construction
|
||||
* via {@code createRenderState} and downstream renderers read it back.
|
||||
*
|
||||
*/
|
||||
@Mixin(EntityRenderState.class)
|
||||
public abstract class EntityRenderStateEntityMixin implements StateEntity {
|
||||
|
||||
@Unique
|
||||
private Entity lovisual$entity;
|
||||
|
||||
@Override
|
||||
public Entity lovisual$entity() {
|
||||
return lovisual$entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$entity(Entity entity) {
|
||||
lovisual$entity = entity;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.EntityLod;
|
||||
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3: skip {@code shouldRenderLayers(state)} for far living entities —
|
||||
* the entity's armour, held items, eyes, cape, elytra, and stuck arrows are
|
||||
* all submitted by {@code renderLayers}, and they're invisible past the
|
||||
* configured LOD distance. Returning {@code false} short-circuits the whole
|
||||
* layer pass for that entity.
|
||||
*
|
||||
* <p>The vanilla {@code shouldRenderLayers} returns true for every visible
|
||||
* entity; we AND it with "not far" so far entities skip the layers but
|
||||
* close entities render them as usual.
|
||||
*
|
||||
*
|
||||
* <p>Gated on the {@code entity_lod} toggle via {@link EntityLod#far(double)}.
|
||||
* When the toggle is off, {@code far} returns {@code false} so the modify
|
||||
* leaves the original value unchanged.
|
||||
*/
|
||||
@Mixin(LivingEntityRenderer.class)
|
||||
public abstract class LivingEntityLodMixin {
|
||||
|
||||
@ModifyExpressionValue(
|
||||
method = "submit",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;shouldRenderLayers(Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)Z")
|
||||
)
|
||||
private boolean lovisual$skipFarLayers(boolean original, LivingEntityRenderState state) {
|
||||
if (!original) {
|
||||
return false;
|
||||
}
|
||||
// Stage 1 collapses player LOD into entity LOD — same toggle, same threshold.
|
||||
return !EntityLod.far(state.distanceToCameraSq);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.CachedStack;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import org.lwjgl.system.MemoryStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3: hot-path helper for Sodium's entity cuboid renderer — wraps
|
||||
* {@code MemoryStack.stackPush()} so the render thread's stack is cached by
|
||||
* identity instead of being looked up via ThreadLocal on every cuboid. Sodium
|
||||
* calls this once per cuboid per frame (thousands of times for dense entity
|
||||
* scenes), so the cached lookup is a measurable win on the hot path.
|
||||
*
|
||||
* <p>Uses {@code WrapOperation} rather than {@code @Redirect} because
|
||||
* MixinExtras 0.5.4 (which Fabric Loader 0.19.3 ships with) crashes on a
|
||||
* static {@code @Redirect} here — pinned to 0.5.5 in {@code build.gradle},
|
||||
* but the convention is kept for safety. The mixin is registered with
|
||||
* {@code remap = false} because the target is a Sodium class, not a Mojang one.
|
||||
*
|
||||
* Gated on the {@code microOpts} toggle via {@link OptimizeToggles#microOpts()}.
|
||||
* When the toggle is off, the original runs unchanged.
|
||||
*
|
||||
* <p>Registered conditionally via {@code LoVisualMixinPlugin} — only applied
|
||||
* when Sodium is loaded. See {@code lovisual.mixins.json} entry in the
|
||||
* {@code client} array.
|
||||
*/
|
||||
@Mixin(targets = "net.caffeinemc.mods.sodium.client.render.immediate.model.EntityRenderer", remap = false)
|
||||
public abstract class SodiumEntityRendererMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "renderCuboid",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lorg/lwjgl/system/MemoryStack;stackPush()Lorg/lwjgl/system/MemoryStack;")
|
||||
)
|
||||
private static MemoryStack lovisual$cachedStack(Operation<MemoryStack> original) {
|
||||
return OptimizeToggles.microOpts() ? CachedStack.push() : original.call();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity.anim;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.AnimFreeze;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.AnimHolder;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
/**
|
||||
* Stage 3 step 4: implements {@link AnimHolder} on {@code Entity} — adds the
|
||||
* per-entity bag of frozen animation captures. The field lives as long as
|
||||
* the entity; captures hold direct buffers, so long-lived entities keep at
|
||||
* most one capture per (model, renderType, sprite) submission slot.
|
||||
*/
|
||||
@Mixin(Entity.class)
|
||||
public abstract class EntityAnimHolderMixin implements AnimHolder {
|
||||
|
||||
@Unique
|
||||
private AnimFreeze.Holder lovisual$anim;
|
||||
|
||||
@Override
|
||||
public AnimFreeze.Holder lovisual$anim() {
|
||||
return lovisual$anim;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$anim(AnimFreeze.Holder holder) {
|
||||
lovisual$anim = holder;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity.anim;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.StateEntity;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.AnimFreeze;
|
||||
import dev.loki.lovisual.render.engine.optimize.parallel.ParallelModelHook;
|
||||
import java.util.List;
|
||||
import net.minecraft.client.model.Model;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.client.renderer.feature.FeatureFrameContext;
|
||||
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Stage 3 step 4: the AnimFreeze call site. When a far entity's model part is
|
||||
* about to render, hand the submission to {@link AnimFreeze#render} — it
|
||||
* replays the once-per-tick raw vertex capture shifted to the current
|
||||
* position; on success the vanilla {@code renderToBuffer} is skipped.
|
||||
*
|
||||
* <p>The buffer may already be sprite-wrapped; the replayed vertices go
|
||||
* through it, so Sodium's push remaps their UVs. Sheeted decals (block
|
||||
* cracks) never freeze — their pose is built elsewhere.
|
||||
*/
|
||||
@Mixin(ModelFeatureRenderer.class)
|
||||
public abstract class ModelFeatureRendererMixin {
|
||||
|
||||
@Inject(method = "buildGroup", at = @At("HEAD"), cancellable = true)
|
||||
private void lovisual$parallel(FeatureFrameContext context, List<ModelFeatureRenderer.Submit<?>> submits,
|
||||
CallbackInfo ci) {
|
||||
if (ParallelModelHook.buildGroup((ModelFeatureRenderer) (Object) this, submits)) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@WrapOperation(
|
||||
method = "prepareModel",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/model/Model;renderToBuffer(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;III)V")
|
||||
)
|
||||
private void lovisual$frozenAnimation(Model<?> model, PoseStack poseStack, VertexConsumer consumer,
|
||||
int light, int overlay, int color, Operation<Void> original,
|
||||
ModelFeatureRenderer.Submit<?> submit) {
|
||||
if (AnimFreeze.enabled() && submit.sheetedDecalPose() == null
|
||||
&& submit.state() instanceof EntityRenderState state) {
|
||||
Entity entity = ((StateEntity) state).lovisual$entity();
|
||||
if (entity != null && AnimFreeze.render(entity, model, submit.renderType(), null,
|
||||
poseStack.last().pose(), consumer,
|
||||
target -> original.call(model, poseStack, target, light, overlay, color))) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
original.call(model, poseStack, consumer, light, overlay, color);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity.parallel;
|
||||
|
||||
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||
|
||||
/**
|
||||
* Stage 3 step 8: the vanilla per-model build, invoked as the fallback for
|
||||
* submits the parallel path could not take (wrong format, decals, frozen
|
||||
* animations, raw-vertex consumer unavailable).
|
||||
*/
|
||||
@Mixin(ModelFeatureRenderer.class)
|
||||
public interface ModelFeatureRendererInvoker {
|
||||
|
||||
@Invoker("prepareModel")
|
||||
<S> void lovisual$prepareModel(ModelFeatureRenderer.Submit<S> submit);
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity.parallel;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import net.minecraft.client.model.geom.ModelPart;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
/**
|
||||
* Stage 3 step 8: exposes the part-tree internals the parallel model build
|
||||
* flattens once per model — the baked cubes and the ordered children map.
|
||||
*/
|
||||
@Mixin(ModelPart.class)
|
||||
public interface ModelPartAccessor {
|
||||
|
||||
@Accessor("cubes")
|
||||
List<ModelPart.Cube> lovisual$cubes();
|
||||
|
||||
@Accessor("children")
|
||||
Map<String, ModelPart> lovisual$children();
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity.parallel;
|
||||
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
import net.minecraft.client.renderer.feature.RenderTypeFeatureRenderer;
|
||||
import net.minecraft.client.renderer.rendertype.RenderType;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||
|
||||
/**
|
||||
* Stage 3 step 8: the per-render-type vertex builder the parallel emit hands
|
||||
* its raw vertices to — one builder call per model, exactly as vanilla's
|
||||
* prepareModel would make.
|
||||
*/
|
||||
@Mixin(RenderTypeFeatureRenderer.class)
|
||||
public interface RenderTypeFeatureRendererInvoker {
|
||||
|
||||
@Invoker("getVertexBuilder")
|
||||
VertexConsumer lovisual$vertexBuilder(RenderType renderType);
|
||||
}
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity.renderer;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.CachedName;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3: caches {@code Entity.getDisplayName()} per tick. The vanilla
|
||||
* implementation rebuilds a {@link Component} (team prefix + name + suffix)
|
||||
* every call; renderers call it once per frame per entity in view. Wrapping
|
||||
* the call here keeps the per-frame cost to one identity check + read,
|
||||
* instead of a full Component rebuild + style lookup.
|
||||
*
|
||||
* <p>The cache is keyed by game tick — name parts only change on tick
|
||||
* boundaries (team membership, name change). On the first call of a tick the
|
||||
* original runs and the result is stored; subsequent calls in the same tick
|
||||
* return the cached instance.
|
||||
*
|
||||
* Gated on the {@code microOpts} toggle via {@link OptimizeToggles#microOpts()}.
|
||||
* When the toggle is off, the original runs unchanged.
|
||||
*/
|
||||
@Mixin(EntityRenderer.class)
|
||||
public abstract class EntityRendererNameMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "getNameTag",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/world/entity/Entity;getDisplayName()Lnet/minecraft/network/chat/Component;")
|
||||
)
|
||||
private Component lovisual$cachedName(Entity entity, Operation<Component> original) {
|
||||
if (!OptimizeToggles.microOpts()) {
|
||||
return original.call(entity);
|
||||
}
|
||||
if (!(entity instanceof CachedName cache)) {
|
||||
return original.call(entity);
|
||||
}
|
||||
long tick = entity.level().getGameTime();
|
||||
if (cache.lovisual$nameTick() != tick) {
|
||||
cache.lovisual$setName(original.call(entity), tick);
|
||||
}
|
||||
return cache.lovisual$name();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package dev.loki.lovisual.mixins.optimize.entity.renderer;
|
||||
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.StateEntity;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
/**
|
||||
* Stage 3: captures the source {@link Entity} on every freshly-built
|
||||
* {@link EntityRenderState}. Vanilla's {@code createRenderState(entity, partial)}
|
||||
* returns a state without back-reference; this inject at RETURN stores the
|
||||
* entity on the state via the {@link StateEntity} contract so downstream
|
||||
* renderers (model feature renderer, item feature renderer, future LOD mixins)
|
||||
* can reach the live entity.
|
||||
*
|
||||
* The original used {@code @ModifyReturnValue}; LoVisual uses {@code @Inject}
|
||||
* at RETURN with {@code CallbackInfoReturnable} so the mixin stays simple and
|
||||
* doesn't rely on the (more fragile across versions) MixinExtras return-value
|
||||
* transformer — the captured state is set as a side effect, not returned.
|
||||
*/
|
||||
@Mixin(EntityRenderer.class)
|
||||
public abstract class EntityRendererStateMixin {
|
||||
|
||||
@Inject(
|
||||
method = "createRenderState(Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState;",
|
||||
at = @At("RETURN")
|
||||
)
|
||||
private void lovisual$rememberEntity(Entity entity, float partialTick,
|
||||
CallbackInfoReturnable<EntityRenderState> cir,
|
||||
@Local(argsOnly = true) Entity localEntity) {
|
||||
EntityRenderState state = cir.getReturnValue();
|
||||
if (state instanceof StateEntity stateEntity) {
|
||||
stateEntity.lovisual$entity(localEntity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.gl.RenderBackendOps;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Stage 3 step 2 (completes the TBO cache): only {@code GlBuffer.Direct}
|
||||
* deletes its GL handle; transient buffers are slices of a shared one. A
|
||||
* deleted buffer's id can be reused by a new buffer, so the attachment cache
|
||||
* must not outlive it — this hook clears the cache on every Direct close.
|
||||
*
|
||||
*
|
||||
* <p>Unconditional (clearing a tiny map on buffer close is free); correctness
|
||||
* beats the micro-saving of keeping stale attachments around.
|
||||
*/
|
||||
@Mixin(targets = "com.mojang.blaze3d.opengl.GlBuffer$Direct")
|
||||
public abstract class GlBufferCloseMixin {
|
||||
|
||||
@Inject(method = "close", at = @At("HEAD"))
|
||||
private void lovisual$forgetTboCache(CallbackInfo ci) {
|
||||
RenderBackendOps backend = RenderBackendOps.current();
|
||||
if (backend != null) {
|
||||
backend.forgetTboCache();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import com.mojang.blaze3d.opengl.GlStateManager;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.gl.RenderBackendOps;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3c: lazy clear — after {@code clearColorAndDepthTextures}, vanilla
|
||||
* binds framebuffer 0 (the default framebuffer) before the next pass runs.
|
||||
* The next pass binds its own target anyway, and {@code GlStateManager}'s
|
||||
* cache skips the redundant bind. This mixin drops the explicit bind-0 so
|
||||
* we don't pay for a {@code glBindFramebuffer(GL_FRAMEBUFFER, 0)} that's
|
||||
* immediately overwritten.
|
||||
*
|
||||
*
|
||||
* <p>Gated on the {@code microOpts} toggle via {@link RenderBackendOps#skipBindFramebufferZero(int)}.
|
||||
* When the toggle is off, the original call runs unchanged.
|
||||
*/
|
||||
@Mixin(targets = "com.mojang.blaze3d.opengl.GlCommandEncoder")
|
||||
public abstract class GlCommandEncoderClearMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "clearColorAndDepthTextures",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lcom/mojang/blaze3d/opengl/GlStateManager;_glBindFramebuffer(II)V")
|
||||
)
|
||||
private void lovisual$skipBindZero(int target, int framebuffer, Operation<Void> original) {
|
||||
RenderBackendOps backend = RenderBackendOps.current();
|
||||
if (backend != null && backend.skipBindFramebufferZero(framebuffer)) {
|
||||
// Skip the bind — the next render pass binds its own target anyway.
|
||||
return;
|
||||
}
|
||||
original.call(target, framebuffer);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.gl.RenderBackendOps;
|
||||
import org.lwjgl.opengl.GL33C;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3d: TBO cache — when {@code GlCommandEncoder.trySetup} binds a
|
||||
* texel-buffer texture via {@code glBindTexture}, we record the texture ID.
|
||||
* When {@code glTexBuffer(target, format, buffer)} is called for the same
|
||||
* {@code (format, buffer)} pair that's already attached, we skip the call —
|
||||
* re-attaching makes the driver revalidate the texture (clouds: ~2% of a
|
||||
* frame in {@code glDrawElements}).
|
||||
*
|
||||
*
|
||||
* <p>Gated on the {@code microOpts} toggle via
|
||||
* {@link RenderBackendOps#tboCacheSupported()}. When the toggle is off, both
|
||||
* {@code WrapOperation}s call the original.
|
||||
*/
|
||||
@Mixin(targets = "com.mojang.blaze3d.opengl.GlCommandEncoder")
|
||||
public abstract class GlCommandEncoderTexBufferMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "trySetup",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lorg/lwjgl/opengl/GL33C;glBindTexture(II)V")
|
||||
)
|
||||
private void lovisual$trackBoundTboTexture(int target, int texture, Operation<Void> original) {
|
||||
RenderBackendOps backend = RenderBackendOps.current();
|
||||
if (backend != null && backend.tboCacheSupported()) {
|
||||
backend.trackBoundTboTexture(texture);
|
||||
}
|
||||
original.call(target, texture);
|
||||
}
|
||||
|
||||
@WrapOperation(
|
||||
method = "trySetup",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lorg/lwjgl/opengl/GL33C;glTexBuffer(III)V")
|
||||
)
|
||||
private void lovisual$texBufferOnce(int target, int format, int buffer, Operation<Void> original) {
|
||||
RenderBackendOps backend = RenderBackendOps.current();
|
||||
if (backend != null && backend.tboAlreadyAttached(format, buffer)) {
|
||||
// Same (format, buffer) pair already attached to the bound texture — skip the re-attach.
|
||||
return;
|
||||
}
|
||||
original.call(target, format, buffer);
|
||||
if (backend != null) {
|
||||
backend.markTboAttached(format, buffer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.gl.RenderBackendOps;
|
||||
import net.minecraft.client.renderer.rendertype.RenderType;
|
||||
import net.minecraft.client.renderer.rendertype.RenderTypes;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
/**
|
||||
* Stage 3b: cache {@code RenderTypes.entityTranslucent(id, flag=true)} by
|
||||
* identifier — vanilla uses {@code Util.memoize} keyed on {@code Pair(id, flag)},
|
||||
* which {@code Objects.hash}-es the pair on every call, per entity per frame.
|
||||
* When the flag is {@code true} (the common case — translucent skins, held
|
||||
* items, etc.), the result depends only on the identifier, so we cache it
|
||||
* directly in a {@code ConcurrentHashMap}.
|
||||
*
|
||||
* is wrapped in {@link RenderBackendOps}; LoVisual's GL implementation is
|
||||
* {@code GlRenderBackendOps}, which gates on {@code microOpts} (Stage 1 toggle).
|
||||
*
|
||||
* <p>When the toggle is off, the WrapOperation calls the original — vanilla
|
||||
* behavior preserved. When the toggle is on and the flag is {@code true},
|
||||
* the cache is consulted; on a miss, the original is called and the result
|
||||
* is stored.
|
||||
*/
|
||||
@Mixin(RenderTypes.class)
|
||||
public abstract class RenderTypesMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "entityTranslucent(Lnet/minecraft/resources/Identifier;Z)Lnet/minecraft/client/renderer/rendertype/RenderType;",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Ljava/util/function/BiFunction;apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")
|
||||
)
|
||||
private static Object lovisual$cacheTranslucent(
|
||||
BiFunction<Object, Object, Object> memo, Object id, Object flag, Operation<Object> original) {
|
||||
RenderBackendOps backend = RenderBackendOps.current();
|
||||
if (backend == null || !backend.renderTypesCacheSupported()) {
|
||||
return original.call(memo, id, flag);
|
||||
}
|
||||
// Only cache when the flag is true — the false case depends on the flag too.
|
||||
if (!(Boolean) flag) {
|
||||
return original.call(memo, id, flag);
|
||||
}
|
||||
Identifier mcId = (Identifier) id;
|
||||
RenderBackendOps.Identifier cacheKey = new RenderBackendOps.Identifier(mcId.getNamespace(), mcId.getPath());
|
||||
Object cached = backend.renderTypeFor(cacheKey);
|
||||
if (cached != null) {
|
||||
return cached;
|
||||
}
|
||||
Object result = original.call(memo, id, flag);
|
||||
if (result instanceof RenderType) {
|
||||
backend.cacheRenderType(cacheKey, result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl.fbo;
|
||||
|
||||
import com.mojang.blaze3d.opengl.DirectStateAccess;
|
||||
import com.mojang.blaze3d.opengl.FrameBufferAttachment;
|
||||
import com.mojang.blaze3d.opengl.FrameBufferCache;
|
||||
import dev.loki.lovisual.render.engine.optimize.gl.SharedDepthFbos;
|
||||
import it.unimi.dsi.fastutil.objects.Object2IntMap;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Stage 3 step 2: feeds {@link SharedDepthFbos} from the vanilla FBO cache.
|
||||
* {@code getFbo} records "this depth texture lives in that FBO" (mip 0 only —
|
||||
* higher mips are never the depth attachment of the cached FBO);
|
||||
* {@code destroyFbo} drops the mapping before the FBO is deleted, because its
|
||||
* GL id may be reused by the next one.
|
||||
*
|
||||
*
|
||||
* <p>Bookkeeping only — runs regardless of the {@code fbo_share} toggle (a
|
||||
* map put/remove per FBO create/destroy is free); the toggle gates the clear
|
||||
* path in {@code GlCommandEncoderDepthClearMixin}.
|
||||
*/
|
||||
@Mixin(FrameBufferCache.class)
|
||||
public abstract class FrameBufferCacheMixin {
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
private Object2IntMap<FrameBufferCache.CacheKey> cache;
|
||||
|
||||
@Inject(method = "getFbo", at = @At("RETURN"))
|
||||
private void lovisual$rememberDepth(DirectStateAccess dsa,
|
||||
List<FrameBufferAttachment> colors,
|
||||
FrameBufferAttachment depth,
|
||||
CallbackInfoReturnable<Integer> cir) {
|
||||
if (depth != null && depth.fboMipLevel() == 0) {
|
||||
SharedDepthFbos.remember(depth.glId(), cir.getReturnValueI());
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "destroyFbo", at = @At("HEAD"))
|
||||
private void lovisual$forget(FrameBufferCache.CacheKey key, CallbackInfo ci) {
|
||||
if (cache.containsKey(key)) {
|
||||
SharedDepthFbos.forget(cache.getInt(key));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl.fbo;
|
||||
|
||||
import com.mojang.blaze3d.opengl.GlTexture;
|
||||
import com.mojang.blaze3d.textures.GpuTexture;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.gl.RenderBackendOps;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Stage 3 step 2: vanilla attaches the depth texture to a scratch FBO,
|
||||
* clears, detaches and unbinds; a cached FBO (see {@code FrameBufferCacheMixin})
|
||||
* already holds the attachment, so the clear becomes one
|
||||
* {@code glClearNamedFramebufferfv}. Cancels the vanilla path when the
|
||||
* in-place clear ran.
|
||||
*
|
||||
*
|
||||
* <p>Gated on the {@code fbo_share} toggle via
|
||||
* {@link RenderBackendOps#clearDepthInPlace(int, double)}; a closed texture
|
||||
* or a missing DSA capability falls through to vanilla unchanged.
|
||||
*/
|
||||
@Mixin(targets = "com.mojang.blaze3d.opengl.GlCommandEncoder")
|
||||
public abstract class GlCommandEncoderDepthClearMixin {
|
||||
|
||||
@Inject(method = "clearDepthTexture", at = @At("HEAD"), cancellable = true)
|
||||
private void lovisual$clearInPlace(GpuTexture depth, double value, CallbackInfo ci) {
|
||||
if (!(depth instanceof GlTexture gl) || gl.isClosed()) {
|
||||
return;
|
||||
}
|
||||
RenderBackendOps backend = RenderBackendOps.current();
|
||||
if (backend != null && backend.clearDepthInPlace(gl.glId(), value)) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl.raw;
|
||||
|
||||
import com.mojang.blaze3d.vertex.BufferBuilder;
|
||||
import com.mojang.blaze3d.vertex.ByteBufferBuilder;
|
||||
import com.mojang.blaze3d.vertex.VertexFormat;
|
||||
import dev.loki.lovisual.render.engine.optimize.gl.RawBuffer;
|
||||
import org.lwjgl.system.MemoryUtil;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
/**
|
||||
* Stage 3 step 7: what Sodium's {@code VertexBufferWriter} does for a
|
||||
* {@code BufferBuilder} — push ready-made vertex bytes straight into the
|
||||
* buffer — reimplemented on the vanilla builder so raw-vertex consumers
|
||||
* (AnimFreeze, ParallelModels) work without Sodium.
|
||||
*
|
||||
*/
|
||||
@Mixin(BufferBuilder.class)
|
||||
public abstract class BufferBuilderRawMixin implements RawBuffer {
|
||||
|
||||
@Shadow
|
||||
private int vertices;
|
||||
@Shadow
|
||||
@Final
|
||||
private int vertexSize;
|
||||
@Shadow
|
||||
private long vertexPointer;
|
||||
@Shadow
|
||||
@Final
|
||||
private ByteBufferBuilder buffer;
|
||||
@Shadow
|
||||
private int elementsToFill;
|
||||
@Shadow
|
||||
@Final
|
||||
private VertexFormat format;
|
||||
|
||||
@Override
|
||||
public boolean lovisual$accepts(VertexFormat format) {
|
||||
return format == this.format;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void lovisual$push(long src, int count) {
|
||||
int length = count * vertexSize;
|
||||
long dst = buffer.reserve(length);
|
||||
MemoryUtil.memCopy(src, dst, length);
|
||||
vertices += count;
|
||||
// the pushed vertices are complete: the next addVertex must not see a half-filled one
|
||||
vertexPointer = dst + length - vertexSize;
|
||||
elementsToFill = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl.raw;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
/**
|
||||
* Stage 3 step 7: caches Sodium's {@code VertexConsumerUtils.convertOrLog}
|
||||
* result. The vanilla method is an interface instanceof plus an interface
|
||||
* call on a handful of alternating consumer classes, which keeps evicting
|
||||
* HotSpot's per-class type-check cache; an identity compare against the last
|
||||
* successful consumer skips both.
|
||||
*
|
||||
* Sodium-only: registered in {@code OPTIONAL_SODIUM_MIXINS}, never applied
|
||||
* without Sodium.
|
||||
*
|
||||
* <p>Gated on the {@code micro_opts} toggle. When the toggle is off, the
|
||||
* original method runs unchanged.
|
||||
*/
|
||||
@Mixin(targets = "net.caffeinemc.mods.sodium.client.render.vertex.VertexConsumerUtils", remap = false)
|
||||
public abstract class VertexConsumerUtilsMixin {
|
||||
|
||||
// last consumer that passed the check; a whole model goes to one consumer, so this hits for nearly every cuboid
|
||||
@Unique
|
||||
private static volatile Object lovisual$lastWriter;
|
||||
|
||||
@WrapMethod(method = "convertOrLog")
|
||||
private static VertexBufferWriter lovisual$cachedConvert(VertexConsumer consumer, Operation<VertexBufferWriter> original) {
|
||||
if (consumer == lovisual$lastWriter && OptimizeToggles.microOpts()) {
|
||||
return (VertexBufferWriter) consumer;
|
||||
}
|
||||
VertexBufferWriter writer = original.call(consumer);
|
||||
if (writer == consumer) {
|
||||
lovisual$lastWriter = consumer;
|
||||
}
|
||||
return writer;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package dev.loki.lovisual.mixins.optimize.gl.state;
|
||||
|
||||
import com.mojang.blaze3d.opengl.GlStateManager;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import dev.loki.lovisual.render.engine.optimize.gl.state.GlStateCache;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Extended GL state cache — Stage 3 "Дополнительные GL-оптимизации" item 1 in
|
||||
* {@code mod/docs/optimize-layer-design.md}. Skips redundant driver calls that
|
||||
* vanilla's own {@code BLEND/DEPTH/CULL/SCISSOR/TEXTURES} arrays do not cover:
|
||||
* {@code _glUseProgram(int)} and {@code _glBindVertexArray(int)} reach
|
||||
* {@code GL33C} every time, with no cache.
|
||||
*
|
||||
* <p>Gated by {@link OptimizeToggles#microOpts()} — the Stage 1 "micro_opts"
|
||||
* switch already covers the TBO / RenderTypes caches, so this rides along.
|
||||
*
|
||||
* <p>Cache is invalidated on {@link GlStateManager#glDeleteProgram(int)} —
|
||||
* the driver recycles program ids, and on {@code Optimize.onDisable} /
|
||||
* resource reload via {@code GlStateCache.reset()} called from the module.
|
||||
* Under Vulkan the mixin's target class is never loaded, so no injection fires.
|
||||
*/
|
||||
@Mixin(GlStateManager.class)
|
||||
public abstract class GlStateManagerCacheMixin {
|
||||
|
||||
@Inject(method = "_glUseProgram", at = @At("HEAD"), cancellable = true)
|
||||
private static void lovisual$skipRedundantUseProgram(int program, CallbackInfo ci) {
|
||||
if (!OptimizeToggles.microOpts()) {
|
||||
GlStateCache.reset();
|
||||
return;
|
||||
}
|
||||
if (GlStateCache.programAlreadyBound(program)) {
|
||||
ci.cancel();
|
||||
return;
|
||||
}
|
||||
GlStateCache.markProgram(program);
|
||||
}
|
||||
|
||||
@Inject(method = "_glBindVertexArray", at = @At("HEAD"), cancellable = true)
|
||||
private static void lovisual$skipRedundantBindVao(int vao, CallbackInfo ci) {
|
||||
if (!OptimizeToggles.microOpts()) {
|
||||
GlStateCache.reset();
|
||||
return;
|
||||
}
|
||||
if (GlStateCache.vaoAlreadyBound(vao)) {
|
||||
ci.cancel();
|
||||
return;
|
||||
}
|
||||
GlStateCache.markVao(vao);
|
||||
}
|
||||
|
||||
@Inject(method = "glDeleteProgram", at = @At("HEAD"))
|
||||
private static void lovisual$invalidateOnDeleteProgram(int program, CallbackInfo ci) {
|
||||
GlStateCache.reset();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,124 @@
|
|||
package dev.loki.lovisual.mixins.optimize.hud;
|
||||
|
||||
import dev.loki.lovisual.features.module.lifecycle.Modules;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.Optimize;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.DrawStats;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.FrameBudget;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.FrameProfiler;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.OptimizePropertyBridge;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.client.gui.components.DebugScreenOverlay;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* F3 debug overlay for the Optimize layer — Stage 2 of
|
||||
* {@code mod/docs/optimize-layer-design.md}.
|
||||
*
|
||||
* <p>Injects three groups of lines into the F3 text list, prepended before
|
||||
* the existing LoVisual engine block:
|
||||
* <ul>
|
||||
* <li>Optimize status — which toggles are on, plus the budget mode + target FPS.</li>
|
||||
* <li>Frame profiler — EMA-averaged per-section timings (entities/particles/HUD/effects/text).</li>
|
||||
* <li>Property overrides — when any {@code -Dlovisual.opt.*} is set, list which ones.</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>The hook mirrors the existing {@code hud.DebugHudMixin}'s pattern: it
|
||||
* {@code ModifyArg}s the {@code extractLines} call inside
|
||||
* {@code DebugScreenOverlay.extractRenderState} and replaces the text list.
|
||||
* Both mixins return a new list with their own lines prepended; whichever runs
|
||||
* last sees the previous one's output in its input list, so both blocks appear
|
||||
* in F3.
|
||||
*/
|
||||
@Mixin(DebugScreenOverlay.class)
|
||||
public abstract class OptimizeDebugHudMixin {
|
||||
|
||||
@ModifyArg(
|
||||
method = "extractRenderState",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/gui/components/DebugScreenOverlay;extractLines(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Ljava/util/List;Z)V",
|
||||
ordinal = 0
|
||||
),
|
||||
index = 1
|
||||
)
|
||||
private List<String> lovisual$addOptimizeInfo(List<String> list) {
|
||||
if (list == null) return list;
|
||||
Optimize module = Modules.get(Optimize.class);
|
||||
if (module == null || !module.isEnabled()) {
|
||||
return list;
|
||||
}
|
||||
|
||||
List<String> out = new ArrayList<>(list.size() + 16);
|
||||
out.add("§cLoVisual Optimize");
|
||||
out.add(String.format("toggles: %s", togglesSummary()));
|
||||
out.add(String.format("budget: %s @ %d fps (scale %.2f)",
|
||||
FrameBudget.mode(),
|
||||
FrameBudget.targetFps(),
|
||||
FrameBudget.scale()));
|
||||
|
||||
FrameProfiler.Snapshot snap = FrameProfiler.snapshot();
|
||||
if (snap.frameMs() > 0) {
|
||||
out.add(String.format("frame: %.2f ms (%.0f fps)",
|
||||
snap.frameMs(),
|
||||
1000.0 / Math.max(0.01, snap.frameMs())));
|
||||
if (hasSectionTimings(snap)) {
|
||||
out.add(String.format(" entities=%.2fms particles=%.2fms hud=%.2fms effects=%.2fms text=%.2fms",
|
||||
snap.entityMs(),
|
||||
snap.particleMs(),
|
||||
snap.hudMs(),
|
||||
snap.effectMs(),
|
||||
snap.textMs()));
|
||||
}
|
||||
}
|
||||
|
||||
DrawStats.Snapshot counters = DrawStats.snapshot();
|
||||
if (counters.frames() > 0) {
|
||||
out.add(String.format("draws: %d, pipelines: %d, fbo binds: %d (avg/frame)",
|
||||
counters.draws(),
|
||||
counters.pipelines(),
|
||||
counters.binds()));
|
||||
if (!counters.top().isEmpty()) {
|
||||
out.add(" top: " + String.join(", ", counters.top()));
|
||||
}
|
||||
}
|
||||
|
||||
if (OptimizePropertyBridge.hasOverrides()) {
|
||||
out.add("props: " + OptimizePropertyBridge.lastResolved());
|
||||
}
|
||||
|
||||
out.add("");
|
||||
out.addAll(list);
|
||||
return out;
|
||||
}
|
||||
|
||||
/** Sections are only reported once something opens them — a row of zeros is noise. */
|
||||
private static boolean hasSectionTimings(FrameProfiler.Snapshot snap) {
|
||||
return snap.entityMs() > 0
|
||||
|| snap.particleMs() > 0
|
||||
|| snap.hudMs() > 0
|
||||
|| snap.effectMs() > 0
|
||||
|| snap.textMs() > 0;
|
||||
}
|
||||
|
||||
private static String togglesSummary() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
if (OptimizeToggles.entityLod()) append(sb, "entity_lod@" + OptimizeToggles.entityLodDistance());
|
||||
if (OptimizeToggles.particleLod()) append(sb, "particle_lod");
|
||||
if (OptimizeToggles.spawnerCull()) append(sb, "spawner_cull@" + OptimizeToggles.spawnerDistance());
|
||||
if (OptimizeToggles.spawnerTickCache()) append(sb, "spawner_tick_cache");
|
||||
if (OptimizeToggles.blockEntityCache()) append(sb, "block_entity_cache");
|
||||
if (OptimizeToggles.preparedTextCache()) append(sb, "prepared_text_cache");
|
||||
if (OptimizeToggles.microOpts()) append(sb, "micro_opts");
|
||||
return sb.length() == 0 ? "none" : sb.toString();
|
||||
}
|
||||
|
||||
private static void append(StringBuilder out, String knob) {
|
||||
if (out.length() > 0) out.append(", ");
|
||||
out.append(knob);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
package dev.loki.lovisual.mixins.optimize.particle;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.particle.BubbleColumnCache;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.client.particle.BubbleColumnUpParticle;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/**
|
||||
* Stage 3: bubble-column fluid cache. {@code BubbleColumnUpParticle.tick}
|
||||
* calls {@code level.getFluidState(pos)} once per particle per tick — but
|
||||
* thousands of bubble particles share a few columns, so each block's fluid
|
||||
* is looked up thousands of times. This mixin wraps the call to consult
|
||||
* {@link BubbleColumnCache} first; on a miss, the original runs and the
|
||||
* result is stored.
|
||||
*
|
||||
* The cache logic is in {@link BubbleColumnCache} so the mixin stays a thin
|
||||
* wrapper and the cache is unit-testable without Minecraft types.
|
||||
*
|
||||
* <p>Gated on the {@code microOpts} toggle (Stage 1). When the toggle is off,
|
||||
* the original call runs unchanged.
|
||||
*/
|
||||
@Mixin(BubbleColumnUpParticle.class)
|
||||
public abstract class BubbleColumnUpParticleMixin {
|
||||
|
||||
@WrapOperation(
|
||||
method = "tick",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/multiplayer/ClientLevel;getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;")
|
||||
)
|
||||
private FluidState lovisual$cachedFluid(ClientLevel level, BlockPos pos, Operation<FluidState> original) {
|
||||
if (!BubbleColumnCache.enabled()) {
|
||||
return original.call(level, pos);
|
||||
}
|
||||
long tick = level.getGameTime();
|
||||
long key = pos.asLong();
|
||||
FluidState fluid = BubbleColumnCache.get(key, tick);
|
||||
if (fluid == null) {
|
||||
fluid = original.call(level, pos);
|
||||
BubbleColumnCache.put(key, fluid);
|
||||
}
|
||||
return fluid;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
package dev.loki.lovisual.mixins.optimize.particle;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.particle.camera.CameraPosition;
|
||||
import dev.loki.lovisual.render.engine.optimize.OptimizeToggles;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.client.particle.BaseAshSmokeParticle;
|
||||
import net.minecraft.client.particle.BubbleColumnUpParticle;
|
||||
import net.minecraft.client.particle.CampfireSmokeParticle;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
/**
|
||||
* Stage 3: per-particle light cache + far-particle physics skip.
|
||||
*
|
||||
* <p>Two optimizations in one mixin:
|
||||
* <ul>
|
||||
* <li><b>Light cache</b> — vanilla {@code getLightCoords(partialTick)} walks
|
||||
* the chunk's light section data per call, called per particle per frame.
|
||||
* The value only changes on tick boundaries (light updates), so caching
|
||||
* by game tick removes the walk from the hot path.</li>
|
||||
* <li><b>Physics skip</b> — vanilla {@code move} does full collision against
|
||||
* the world for every particle. Far particles (>16 blocks) and three
|
||||
* specific always-skip subclasses ({@link BaseAshSmokeParticle},
|
||||
* {@link CampfireSmokeParticle}, {@link BubbleColumnUpParticle}) skip
|
||||
* the collision check by setting {@code hasPhysics=false} for the
|
||||
* duration of {@code move}.</li>
|
||||
* </ul>
|
||||
*
|
||||
* Light-cache gated on the {@code microOpts} toggle (Stage 1 wiring);
|
||||
* physics-skip also gated on {@code microOpts} since both are micro-opts.
|
||||
* When the toggle is off, the original code runs unchanged.
|
||||
*/
|
||||
@Mixin(Particle.class)
|
||||
public abstract class ParticleMixin {
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
protected ClientLevel level;
|
||||
|
||||
@Shadow
|
||||
protected boolean hasPhysics;
|
||||
|
||||
@Shadow
|
||||
protected double x;
|
||||
|
||||
@Shadow
|
||||
protected double y;
|
||||
|
||||
@Shadow
|
||||
protected double z;
|
||||
|
||||
@Unique
|
||||
private boolean lovisual$physicsBefore;
|
||||
|
||||
@Unique
|
||||
private long lovisual$lightTick = Long.MIN_VALUE;
|
||||
|
||||
@Unique
|
||||
private int lovisual$light;
|
||||
|
||||
@Inject(method = "getLightCoords", at = @At("HEAD"), cancellable = true)
|
||||
private void lovisual$cachedLight(float partialTick, CallbackInfoReturnable<Integer> cir) {
|
||||
if (lovisual$lightTick == level.getGameTime() && OptimizeToggles.particleLight()) {
|
||||
cir.setReturnValue(lovisual$light);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "getLightCoords", at = @At("RETURN"))
|
||||
private void lovisual$storeLight(float partialTick, CallbackInfoReturnable<Integer> cir) {
|
||||
lovisual$light = cir.getReturnValueI();
|
||||
lovisual$lightTick = level.getGameTime();
|
||||
}
|
||||
|
||||
@Inject(method = "move", at = @At("HEAD"))
|
||||
private void lovisual$cheapPhysics(double dx, double dy, double dz, CallbackInfo ci) {
|
||||
lovisual$physicsBefore = hasPhysics;
|
||||
if (hasPhysics && OptimizeToggles.particlePhysics() && lovisual$skipCollision()) {
|
||||
hasPhysics = false;
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "move", at = @At("RETURN"))
|
||||
private void lovisual$restorePhysics(double dx, double dy, double dz, CallbackInfo ci) {
|
||||
hasPhysics = lovisual$physicsBefore;
|
||||
}
|
||||
|
||||
@Unique
|
||||
private boolean lovisual$skipCollision() {
|
||||
Object self = this;
|
||||
if (self instanceof BaseAshSmokeParticle
|
||||
|| self instanceof CampfireSmokeParticle
|
||||
|| self instanceof BubbleColumnUpParticle) {
|
||||
return true;
|
||||
}
|
||||
Vec3 cam = CameraPosition.get();
|
||||
double ddx = x - cam.x;
|
||||
double ddy = y - cam.y;
|
||||
double ddz = z - cam.z;
|
||||
return ddx * ddx + ddy * ddy + ddz * ddz > 16 * 16;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package dev.loki.lovisual.mixins.optimize.stats;
|
||||
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.DrawStats;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Counts the four places {@code GlCommandEncoder} actually issues a draw —
|
||||
* {@code executeDraw}, {@code executeDraws}, {@code executeDrawIndirect} and
|
||||
* {@code executeDrawMultiple} do not call each other, so exactly one of them
|
||||
* sees every submission.
|
||||
*
|
||||
* <p>Part of Stage 3 step 1 in {@code mod/docs/optimize-layer-design.md};
|
||||
* the counter is a boolean test unless F3 is open with Optimize on.
|
||||
*
|
||||
*/
|
||||
@Mixin(targets = "com.mojang.blaze3d.opengl.GlCommandEncoder")
|
||||
public abstract class GlCommandEncoderStatsMixin {
|
||||
|
||||
@Inject(method = "executeDraw", at = @At("HEAD"))
|
||||
private void lovisual$countDraw(CallbackInfo ci) {
|
||||
DrawStats.draw();
|
||||
}
|
||||
|
||||
@Inject(method = "executeDraws", at = @At("HEAD"))
|
||||
private void lovisual$countDraws(CallbackInfo ci) {
|
||||
DrawStats.draw();
|
||||
}
|
||||
|
||||
@Inject(method = "executeDrawIndirect", at = @At("HEAD"))
|
||||
private void lovisual$countDrawIndirect(CallbackInfo ci) {
|
||||
DrawStats.draw();
|
||||
}
|
||||
|
||||
@Inject(method = "executeDrawMultiple", at = @At("HEAD"))
|
||||
private void lovisual$countDrawMultiple(CallbackInfo ci) {
|
||||
DrawStats.draw();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package dev.loki.lovisual.mixins.optimize.stats;
|
||||
|
||||
import com.mojang.blaze3d.pipeline.RenderPipeline;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.DrawStats;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Counts {@code RenderPass.setPipeline} — one per state selection, repeats
|
||||
* included — and feeds the pipeline name to the per-frame top list, so F3
|
||||
* shows which pipelines a frame spends its draws on. That is the input for
|
||||
* the "sort draws by pipeline" idea in
|
||||
* {@code mod/docs/optimize-layer-design.md}.
|
||||
*
|
||||
* <p>Part of Stage 3 step 1 in {@code mod/docs/optimize-layer-design.md}.
|
||||
*
|
||||
*/
|
||||
@Mixin(targets = "com.mojang.blaze3d.opengl.GlRenderPass")
|
||||
public abstract class GlRenderPassStatsMixin {
|
||||
|
||||
@Inject(method = "setPipeline", at = @At("HEAD"))
|
||||
private void lovisual$countPipeline(RenderPipeline pipeline, CallbackInfo ci) {
|
||||
if (pipeline == null || pipeline.getLocation() == null) {
|
||||
return;
|
||||
}
|
||||
DrawStats.pipeline(pipeline.getLocation().getPath());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
package dev.loki.lovisual.mixins.optimize.stats;
|
||||
|
||||
import com.mojang.blaze3d.opengl.GlStateManager;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.DrawStats;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Counts framebuffer binds that actually reach the driver: the injection sits
|
||||
* on the {@code glBindFramebuffer} calls inside {@code _glBindFramebuffer}, so
|
||||
* binds GlStateManager's read/write cache absorbs are not counted. A target of
|
||||
* {@code GL_FRAMEBUFFER} runs both branches and is counted twice — two GL calls
|
||||
* really happen.
|
||||
*
|
||||
* <p>Part of Stage 3 step 1 in {@code mod/docs/optimize-layer-design.md}.
|
||||
*
|
||||
*/
|
||||
@Mixin(GlStateManager.class)
|
||||
public abstract class GlStateManagerStatsMixin {
|
||||
|
||||
@Inject(
|
||||
method = "_glBindFramebuffer",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lorg/lwjgl/opengl/GL33C;glBindFramebuffer(II)V"
|
||||
)
|
||||
)
|
||||
private static void lovisual$countBind(int target, int framebuffer, CallbackInfo ci) {
|
||||
DrawStats.bind();
|
||||
}
|
||||
}
|
||||
|
|
@ -9,20 +9,20 @@ import org.spongepowered.asm.mixin.injection.At;
|
|||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
import dev.loki.lovisual.features.module.lifecycle.Modules;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.optimization.FpsOptimizer;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.Optimize;
|
||||
|
||||
@Mixin(EntityRenderDispatcher.class)
|
||||
public abstract class EntityRenderDispatcherMixin {
|
||||
|
||||
@Inject(method = "shouldRender(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/culling/Frustum;DDD)Z", at = @At("HEAD"), cancellable = true)
|
||||
private <E extends Entity> void lovisual$cullEntity(E entity, Frustum frustum, double camX, double camY, double camZ, CallbackInfoReturnable<Boolean> cir) {
|
||||
FpsOptimizer fpsOptimizer = Modules.get(FpsOptimizer.class);
|
||||
if (fpsOptimizer == null || !fpsOptimizer.isEntityCullingEnabled()) return;
|
||||
Optimize optimize = Modules.get(Optimize.class);
|
||||
if (optimize == null || !optimize.isEntityCullingEnabled()) return;
|
||||
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if (entity == mc.player) return;
|
||||
|
||||
double maxDistance = fpsOptimizer.entityCullDistance();
|
||||
double maxDistance = optimize.entityCullDistance();
|
||||
if (entity.distanceToSqr(camX, camY, camZ) > maxDistance * maxDistance) {
|
||||
cir.setReturnValue(false);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,16 @@ package dev.loki.lovisual.mixins.render.item;
|
|||
|
||||
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
|
||||
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.ItemLod;
|
||||
import java.util.List;
|
||||
import net.minecraft.client.renderer.feature.ItemFeatureRenderer;
|
||||
import net.minecraft.client.renderer.rendertype.RenderType;
|
||||
import net.minecraft.client.resources.model.geometry.BakedQuad;
|
||||
import net.minecraft.world.item.ItemDisplayContext;
|
||||
import org.joml.Matrix4f;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
|
@ -56,4 +62,20 @@ public abstract class ItemFeatureRendererMixin {
|
|||
// corrupt the following world translucent composite, so item layers keep their own type.
|
||||
return original;
|
||||
}
|
||||
|
||||
@WrapOperation(
|
||||
method = {"prepareMainSubmit", "prepareOutlineSubmit", "prepareFoilSubmit"},
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/feature/ItemFeatureRenderer$Submit;quads()Ljava/util/List;")
|
||||
)
|
||||
private List<BakedQuad> lovisual$itemLod(ItemFeatureRenderer.Submit submit, Operation<List<BakedQuad>> original) {
|
||||
List<BakedQuad> quads = original.call(submit);
|
||||
ItemDisplayContext context = submit.displayContext();
|
||||
if (context.firstPerson() || context == ItemDisplayContext.GUI || !ItemLod.enabled()) {
|
||||
return quads;
|
||||
}
|
||||
Matrix4f m = submit.pose().pose();
|
||||
float dSq = m.m30() * m.m30() + m.m31() * m.m31() + m.m32() * m.m32();
|
||||
return dSq > ItemLod.distanceSq() ? ItemLod.flat(quads) : quads;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
package dev.loki.lovisual.mixins.render.item.bounds;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import org.joml.Matrix4f;
|
||||
import org.joml.Vector3fc;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
/**
|
||||
* Stage 3 step 5: exposes the layer internals {@link ItemStackRenderStateMixin}
|
||||
* keys the shared {@code ItemBounds} cache on — the extents supplier identity,
|
||||
* the item transform and the local matrix whose identity bit short-circuits
|
||||
* the cache.
|
||||
*/
|
||||
@Mixin(ItemStackRenderState.LayerRenderState.class)
|
||||
public interface ItemLayerAccessor {
|
||||
|
||||
@Accessor("extents")
|
||||
Supplier<Vector3fc[]> lovisual$extents();
|
||||
|
||||
@Accessor("itemTransform")
|
||||
ItemTransform lovisual$itemTransform();
|
||||
|
||||
@Accessor("localTransform")
|
||||
Matrix4f lovisual$localTransform();
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package dev.loki.lovisual.mixins.render.item.bounds;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.ItemBounds;
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import org.joml.Matrix4fc;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
/**
|
||||
* Stage 3 step 5: single-layer item model bounds served from
|
||||
* {@link ItemBounds} instead of recomputed every frame. The vanilla path
|
||||
* walks the layer's extents supplier; the cache key is that supplier's
|
||||
* identity, which is stable per baked model. Multi-layer items and items
|
||||
* with a non-identity local transform keep the vanilla computation.
|
||||
*/
|
||||
@Mixin(ItemStackRenderState.class)
|
||||
public abstract class ItemStackRenderStateMixin {
|
||||
|
||||
@Shadow
|
||||
private int activeLayerCount;
|
||||
|
||||
@Shadow
|
||||
private ItemStackRenderState.LayerRenderState[] layers;
|
||||
|
||||
@WrapMethod(method = "getModelBoundingBox")
|
||||
private AABB lovisual$sharedBounds(Operation<AABB> original) {
|
||||
if (!ItemBounds.enabled() || activeLayerCount != 1) {
|
||||
return original.call();
|
||||
}
|
||||
ItemLayerAccessor layer = (ItemLayerAccessor) layers[0];
|
||||
if ((layer.lovisual$localTransform().properties() & Matrix4fc.PROPERTY_IDENTITY) == 0) {
|
||||
return original.call();
|
||||
}
|
||||
return ItemBounds.get(layer.lovisual$extents(), layer.lovisual$itemTransform(), original::call);
|
||||
}
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Coerce;
|
|||
|
||||
/**
|
||||
* Vanilla bug: FireworkParticles$Starter.createParticle assumes ParticleEngine.createParticle never returns null.
|
||||
* Our ParticleManagerMixin returns null when a ParticleSpawnEvent is cancelled (e.g. FpsOptimizer.disable_particles).
|
||||
* Our ParticleManagerMixin returns null when a ParticleSpawnEvent is cancelled (e.g. Optimize.no_particles).
|
||||
* This causes NPE: sparkParticle is null -> setTrail() crashes.
|
||||
* Fix: guard every SparkParticle setter to be null-safe. SparkParticle is a private inner class, so we use Object
|
||||
* with @Coerce to avoid InvalidInjectionException (expected SparkParticle vs Object).
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import dev.loki.lovisual.features.module.modules.player.interact.NoDelay;
|
|||
import dev.loki.lovisual.features.module.modules.player.interact.NoInteract;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.camera.Freecam;
|
||||
import dev.loki.lovisual.features.relations.StaffTracker;
|
||||
import dev.loki.lovisual.render.engine.optimize.entity.AnimFreeze;
|
||||
import dev.loki.lovisual.render.helpers.util.TickDelta;
|
||||
import dev.loki.lovisual.util.combat.tracking.AntiBotTracker;
|
||||
import dev.loki.lovisual.util.session.SessionChanger;
|
||||
|
|
@ -257,6 +258,11 @@ public class MinecraftMixin implements MinecraftGameConfigHolder {
|
|||
AntiBotTracker.INSTANCE.reset();
|
||||
}
|
||||
|
||||
@Inject(method = "renderFrame", at = @At("HEAD"))
|
||||
private void lovisual$animFreezeFrame(boolean tick, CallbackInfo ci) {
|
||||
AnimFreeze.frame++;
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderFrame",
|
||||
at = @At(
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
/*
|
||||
* Ported/adapted from Spatial GUI (https://github.com/tastytrash/Spatial-GUI), MIT License.
|
||||
* Copyright (c) tastytrash and Spatial GUI contributors.
|
||||
*
|
||||
* This file is part of LoVisual and is distributed under LoVisual's own GPLv3 license terms
|
||||
* for the modifications made here (see mod/LICENSE and mod/THIRD_PARTY_NOTICES.md); the MIT-licensed
|
||||
* portions ported from Spatial GUI remain available under the MIT terms above.
|
||||
*/
|
||||
package dev.loki.lovisual.mixins.render.spatialgui;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.visuals.spatialgui.SpatialGui;
|
||||
import dev.loki.lovisual.render.spatialgui.SpatialGuiCapture;
|
||||
import dev.loki.lovisual.util.logging.DebugLog;
|
||||
import net.minecraft.client.DeltaTracker;
|
||||
import net.minecraft.client.gui.render.GuiRenderer;
|
||||
import net.minecraft.client.renderer.GameRenderer;
|
||||
import net.minecraft.client.renderer.state.WindowRenderState;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* Adapted from Spatial-GUI's {@code GameRendererMixin}: right before the main GUI pass the capture texture is
|
||||
* (re)sized to the frame's window state and cleared to transparent, and at the end of the frame the isolated
|
||||
* screen renderer built by {@link SpatialGuiCapture} runs its own prepare/draw cycle so the open screen lands
|
||||
* in the capture texture while the flat overlay stays absent.
|
||||
*/
|
||||
@Mixin(GameRenderer.class)
|
||||
public abstract class GameRendererSpatialGuiMixin {
|
||||
|
||||
@Inject(method = "render", at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/gui/render/GuiRenderer;render()V"))
|
||||
private void lovisual$prepareSpatialCapture(DeltaTracker deltaTracker, boolean renderLevel, CallbackInfo ci) {
|
||||
SpatialGui module = SpatialGui.getInstance();
|
||||
if (module == null || !module.isCapturing()) {
|
||||
DebugLog.renderThreadOnChange("sg.prepare", "notCapturing",
|
||||
"[SpatialGui] prepare skipped: not capturing");
|
||||
return;
|
||||
}
|
||||
|
||||
WindowRenderState windowState = ((GameRenderer) (Object) this).gameRenderState().windowRenderState;
|
||||
if (windowState == null || windowState.width <= 0 || windowState.height <= 0) {
|
||||
DebugLog.renderThreadOnChange("sg.prepare", "badWindowState",
|
||||
"[SpatialGui] prepare skipped: windowState=%s", String.valueOf(windowState));
|
||||
return;
|
||||
}
|
||||
|
||||
SpatialGuiCapture capture = SpatialGuiCapture.get();
|
||||
capture.ensure(windowState.width, windowState.height);
|
||||
capture.clearTransparent();
|
||||
DebugLog.renderThreadOnChange("sg.prepare", windowState.width + "x" + windowState.height,
|
||||
"[SpatialGui] capture prepared and cleared %dx%d", windowState.width, windowState.height);
|
||||
}
|
||||
|
||||
@Inject(method = "render", at = @At("TAIL"))
|
||||
private void lovisual$renderIsolatedSpatialScreen(DeltaTracker deltaTracker, boolean renderLevel, CallbackInfo ci) {
|
||||
SpatialGui module = SpatialGui.getInstance();
|
||||
if (module == null || !module.isCapturing()) {
|
||||
DebugLog.renderThreadOnChange("sg.tail", "notCapturing",
|
||||
"[SpatialGui] isolated TAIL skipped: not capturing");
|
||||
return;
|
||||
}
|
||||
if (!SpatialGuiCapture.get().isReady()) {
|
||||
DebugLog.renderThreadOnChange("sg.tail", "notReady",
|
||||
"[SpatialGui] isolated TAIL skipped: capture not ready");
|
||||
return;
|
||||
}
|
||||
|
||||
DebugLog.renderThreadOnChange("sg.tail", "run",
|
||||
"[SpatialGui] isolated render frame");
|
||||
SpatialGuiCapture.get().renderIsolatedFrame();
|
||||
}
|
||||
}
|
||||
|
|
@ -8,92 +8,38 @@
|
|||
*/
|
||||
package dev.loki.lovisual.mixins.render.spatialgui;
|
||||
|
||||
import com.mojang.blaze3d.ProjectionType;
|
||||
import com.mojang.blaze3d.buffers.GpuBufferSlice;
|
||||
import com.mojang.blaze3d.pipeline.RenderTarget;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import dev.loki.lovisual.features.module.modules.visuals.spatialgui.SpatialGui;
|
||||
import dev.loki.lovisual.render.spatialgui.SpatialGuiCapture;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import dev.loki.lovisual.util.logging.DebugLog;
|
||||
import net.minecraft.client.gui.render.GuiRenderer;
|
||||
import net.minecraft.client.renderer.Projection;
|
||||
import net.minecraft.client.renderer.ProjectionMatrixBuffer;
|
||||
import net.minecraft.client.renderer.state.WindowRenderState;
|
||||
import org.joml.Matrix4f;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.function.Supplier;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
|
||||
/**
|
||||
* Adapted from Spatial-GUI's {@code ScreenExtractor}/{@code TextureTargetManager}: on this Minecraft version the
|
||||
* whole 2D GUI pass is a deferred draw list executed once per frame by {@link GuiRenderer#draw()} against an
|
||||
* explicit {@link RenderTarget}. Redirecting the currently open screen into a 3D plane therefore only requires
|
||||
* pointing that one draw call at {@link SpatialGuiCapture}'s off-screen target instead of the main render
|
||||
* target, and cancelling the vanilla draw so nothing shows up as a flat overlay.
|
||||
* <p>
|
||||
* The vertex data itself is prepared and uploaded earlier in {@code GuiRenderer.render()} (which this mixin does
|
||||
* not touch), so this only ever affects where the already-built draw list is executed to.
|
||||
* Adapted from Spatial-GUI's {@code GuiRendererMixin}: every {@code draw()} executes its prepared draw list
|
||||
* through {@code executeDrawRange(label, target, ...)} — when the instance is the isolated screen renderer
|
||||
* built by {@link SpatialGuiCapture} while SpatialGui is capturing, the target argument is swapped for the
|
||||
* off-screen capture texture. The vanilla main GuiRenderer (HUD) keeps its normal framebuffer, and the flat
|
||||
* screen overlay is naturally absent because the screen was extracted into the isolated state instead.
|
||||
*/
|
||||
@Mixin(value = GuiRenderer.class, priority = 900)
|
||||
@Mixin(GuiRenderer.class)
|
||||
public abstract class GuiRendererCaptureMixin {
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
private List<?> draws;
|
||||
|
||||
@Shadow
|
||||
private int firstDrawIndexAfterBlur;
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
private Projection guiProjection;
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
private ProjectionMatrixBuffer guiProjectionMatrixBuffer;
|
||||
|
||||
@Shadow
|
||||
private void executeDrawRange(Supplier<String> label, RenderTarget target, GpuBufferSlice transform, int startIndex, int endIndex) {
|
||||
throw new AssertionError();
|
||||
}
|
||||
|
||||
@Inject(method = "draw", at = @At("HEAD"), cancellable = true)
|
||||
private void lovisual$captureToSpatialPlane(CallbackInfo ci) {
|
||||
if (draws == null || draws.isEmpty()) return;
|
||||
|
||||
@ModifyArg(
|
||||
method = "draw",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/gui/render/GuiRenderer;executeDrawRange(Ljava/util/function/Supplier;Lcom/mojang/blaze3d/pipeline/RenderTarget;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;II)V"),
|
||||
index = 1)
|
||||
private RenderTarget lovisual$redirectSpatialCapture(RenderTarget original) {
|
||||
SpatialGui module = SpatialGui.getInstance();
|
||||
if (module == null || !module.isCapturing()) return;
|
||||
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if (mc == null || mc.gameRenderer == null) return;
|
||||
WindowRenderState windowState = mc.gameRenderer.gameRenderState().windowRenderState;
|
||||
if (windowState == null || windowState.guiScale <= 0) return;
|
||||
|
||||
if (module == null || !module.isCapturing()) return original;
|
||||
SpatialGuiCapture capture = SpatialGuiCapture.get();
|
||||
RenderTarget target = capture.ensure(windowState.width, windowState.height);
|
||||
capture.clearTransparent();
|
||||
|
||||
guiProjection.setupOrtho(1000.0F, 11000.0F,
|
||||
(float) windowState.width / windowState.guiScale, (float) windowState.height / windowState.guiScale, true);
|
||||
RenderSystem.setProjectionMatrix(guiProjectionMatrixBuffer.getBuffer(guiProjection), ProjectionType.ORTHOGRAPHIC);
|
||||
GpuBufferSlice transform = RenderSystem.getDynamicUniforms().writeTransform(new Matrix4f().setTranslation(0.0F, 0.0F, -11000.0F));
|
||||
|
||||
int splitIndex = Math.min(firstDrawIndexAfterBlur, draws.size());
|
||||
if (splitIndex > 0) {
|
||||
executeDrawRange(() -> "spatial gui before blur", target, transform, 0, splitIndex);
|
||||
}
|
||||
if (draws.size() > firstDrawIndexAfterBlur) {
|
||||
RenderSystem.getDevice().createCommandEncoder().clearDepthTexture(target.getDepthTexture(), 0.0D);
|
||||
mc.gameRenderer.processBlurEffect();
|
||||
executeDrawRange(() -> "spatial gui after blur", target, transform, firstDrawIndexAfterBlur, draws.size());
|
||||
}
|
||||
|
||||
ci.cancel();
|
||||
if ((Object) this != capture.screenGuiRenderer()) return original;
|
||||
RenderTarget redirect = capture.target();
|
||||
if (redirect == null) return original;
|
||||
DebugLog.renderThreadOnce("sg.swap", "[SpatialGui] draw target swapped to capture texture");
|
||||
return redirect;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
* Ported/adapted from Spatial GUI (https://github.com/tastytrash/Spatial-GUI), MIT License.
|
||||
* Copyright (c) tastytrash and Spatial GUI contributors.
|
||||
*
|
||||
* This file is part of LoVisual and is distributed under LoVisual's own GPLv3 license terms
|
||||
* for the modifications made here (see mod/LICENSE and mod/THIRD_PARTY_NOTICES.md); the MIT-licensed
|
||||
* portions ported from Spatial GUI remain available under the MIT terms above.
|
||||
*/
|
||||
package dev.loki.lovisual.mixins.render.spatialgui;
|
||||
|
||||
import dev.loki.lovisual.features.module.modules.visuals.spatialgui.SpatialGui;
|
||||
import dev.loki.lovisual.render.spatialgui.SpatialGuiCapture;
|
||||
import dev.loki.lovisual.util.logging.DebugLog;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.gui.Gui;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
/**
|
||||
* Adapted from Spatial-GUI's {@code GuiMixin}: while SpatialGui is capturing, the open screen's extraction
|
||||
* is diverted from the vanilla main GUI render state into {@link SpatialGuiCapture}'s isolated state, so the
|
||||
* main pass draws only the HUD and the screen content lands exclusively in the capture texture for the 3D
|
||||
* plane. Mouse coordinates arrive already reprojected onto the plane via the MouseHandler mixin.
|
||||
*/
|
||||
@Mixin(Gui.class)
|
||||
public abstract class GuiSpatialExtractMixin {
|
||||
|
||||
@Redirect(method = "extractRenderState", at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/gui/screens/Screen;extractRenderStateWithTooltipAndSubtitles(Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V"))
|
||||
private void lovisual$isolateScreenExtraction(Screen screen, GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||
SpatialGui module = SpatialGui.getInstance();
|
||||
boolean capturing = module != null && module.isCapturing();
|
||||
DebugLog.renderThreadOnChange("sg.extract", capturing,
|
||||
"[SpatialGui] screen extraction divert=%b screen=%s", capturing, screen.getClass().getSimpleName());
|
||||
if (capturing) {
|
||||
SpatialGuiCapture.get().extractScreen(screen, mouseX, mouseY, partialTick);
|
||||
} else {
|
||||
screen.extractRenderStateWithTooltipAndSubtitles(graphics, mouseX, mouseY, partialTick);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14,6 +14,7 @@ import dev.loki.lovisual.render.engine.core.policy.LightPolicy;
|
|||
import dev.loki.lovisual.render.engine.core.policy.fog.VanillaWorldFogProvider;
|
||||
import dev.loki.lovisual.render.engine.depth.WorldSceneDepth;
|
||||
import dev.loki.lovisual.render.engine.framegraph.LoVisualFrameGraph;
|
||||
import dev.loki.lovisual.render.engine.optimize.profile.FrameProfiler;
|
||||
import dev.loki.lovisual.render.engine.profiler.frame.FrameStutterProfiler;
|
||||
import dev.loki.lovisual.render.engine.profiler.frame.RenderFrameProfiler;
|
||||
import dev.loki.lovisual.render.engine.rhi.resource.LoVisualRhi;
|
||||
|
|
@ -220,6 +221,7 @@ public enum LoVisualRenderSystem {
|
|||
TextRenderSystem.beginFrame();
|
||||
sodiumFrame = SODIUM.beginFrame();
|
||||
RenderFrameProfiler.beginFrame(frameId);
|
||||
FrameProfiler.beginFrame();
|
||||
frameOpen = true;
|
||||
submissionEnded = false;
|
||||
lifecycle = FrameLifecycle.RECORDING;
|
||||
|
|
@ -319,6 +321,7 @@ public enum LoVisualRenderSystem {
|
|||
FrameStutterProfiler.onFramePresented(rhiStatsSnapshot(), uniformStatsSnapshot(), resourceStatsSnapshot());
|
||||
}
|
||||
RenderFrameProfiler.endFrame(null, null);
|
||||
FrameProfiler.endFrame();
|
||||
lifecycle = FrameLifecycle.PRESENTED;
|
||||
} finally {
|
||||
currentContext = null;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
package dev.loki.lovisual.render.engine.optimize;
|
||||
|
||||
/**
|
||||
* Resolved per-frame toggle snapshot for the Stage 1 optimization helpers
|
||||
* (LOD distances, caches, micro-opts). Mirrors {@link OptimizeState}'s shape:
|
||||
* an enum-utility holder with volatile fields, written by the {@code Optimize}
|
||||
* module on enable/disable and once per frame, read by render code (helpers,
|
||||
* future mixins) — never by the module class itself.
|
||||
*
|
||||
* <p>Stage 1 of {@code mod/docs/optimize-layer-design.md}: backend-independent
|
||||
* logic plus the toggle snapshot. Lazy clear and the TBO cache ride
|
||||
* {@link #microOpts()}; FBO share (Stage 3 step 2) has its own
|
||||
* {@link #fboShare()} flag. GL/Vulkan-specific helpers that need their own
|
||||
* holder (skin atlas, HUD cache) arrive in later Stage 3 steps alongside the
|
||||
* mixins that consume them.
|
||||
*
|
||||
* <p>All module settings are resolved into volatile primitive fields once per frame.
|
||||
* System-property overrides are not supported here (the {@code Optimize} module's
|
||||
* {@code bool()}/{@code num()} settings are the single source of truth); they can be
|
||||
* layered back via {@code -Dlovisual.opt.*} in Stage 2 per the design doc.
|
||||
*/
|
||||
public enum OptimizeToggles {
|
||||
;
|
||||
|
||||
private static volatile boolean entityLod;
|
||||
private static volatile int entityLodDistance;
|
||||
private static volatile boolean particleLod;
|
||||
private static volatile boolean particleLight;
|
||||
private static volatile boolean particlePhysics;
|
||||
private static volatile boolean spawnerCull;
|
||||
private static volatile int spawnerDistance;
|
||||
private static volatile boolean spawnerTickCache;
|
||||
private static volatile boolean blockEntityCache;
|
||||
private static volatile boolean preparedTextCache;
|
||||
private static volatile boolean microOpts;
|
||||
private static volatile boolean fboShare;
|
||||
|
||||
public static boolean entityLod() { return entityLod; }
|
||||
public static int entityLodDistance() { return entityLodDistance; }
|
||||
public static boolean particleLod() { return particleLod; }
|
||||
public static boolean particleLight() { return particleLight; }
|
||||
public static boolean particlePhysics() { return particlePhysics; }
|
||||
public static boolean spawnerCull() { return spawnerCull; }
|
||||
public static int spawnerDistance() { return spawnerDistance; }
|
||||
public static boolean spawnerTickCache() { return spawnerTickCache; }
|
||||
public static boolean blockEntityCache() { return blockEntityCache; }
|
||||
public static boolean preparedTextCache() { return preparedTextCache; }
|
||||
public static boolean microOpts() { return microOpts; }
|
||||
public static boolean fboShare() { return fboShare; }
|
||||
|
||||
/**
|
||||
* Push a full snapshot. Called by {@code Optimize.onEnable/onDisable/onFrame}
|
||||
* with the resolved {@code (isEnabled() && knob.get())} for every toggle.
|
||||
*/
|
||||
public static void apply(
|
||||
boolean entityLod, int entityLodDistance,
|
||||
boolean particleLod, boolean particleLight, boolean particlePhysics,
|
||||
boolean spawnerCull, int spawnerDistance,
|
||||
boolean spawnerTickCache,
|
||||
boolean blockEntityCache,
|
||||
boolean preparedTextCache,
|
||||
boolean microOpts,
|
||||
boolean fboShare) {
|
||||
OptimizeToggles.entityLod = entityLod;
|
||||
OptimizeToggles.entityLodDistance = entityLodDistance;
|
||||
OptimizeToggles.particleLod = particleLod;
|
||||
OptimizeToggles.particleLight = particleLight;
|
||||
OptimizeToggles.particlePhysics = particlePhysics;
|
||||
OptimizeToggles.spawnerCull = spawnerCull;
|
||||
OptimizeToggles.spawnerDistance = spawnerDistance;
|
||||
OptimizeToggles.spawnerTickCache = spawnerTickCache;
|
||||
OptimizeToggles.blockEntityCache = blockEntityCache;
|
||||
OptimizeToggles.preparedTextCache = preparedTextCache;
|
||||
OptimizeToggles.microOpts = microOpts;
|
||||
OptimizeToggles.fboShare = fboShare;
|
||||
}
|
||||
|
||||
/** Reset to "nothing on" — used by {@code Optimize.onDisable}. */
|
||||
public static void reset() {
|
||||
apply(false, 0, false, false, false, false, 0, false, false, false, false, false);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,208 @@
|
|||
package dev.loki.lovisual.render.engine.optimize.entity;
|
||||
|
||||
import com.mojang.blaze3d.vertex.BufferBuilder;
|
||||
import com.mojang.blaze3d.vertex.ByteBufferBuilder;
|
||||
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
|
||||
import com.mojang.blaze3d.vertex.MeshData;
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
import com.mojang.blaze3d.vertex.VertexFormat;
|
||||
import dev.loki.lovisual.features.module.modules.misc.optimize.entity.StateEntity;
|
||||
import dev.loki.lovisual.render.engine.optimize.gl.RawVertices;
|
||||
import net.minecraft.client.model.Model;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.client.renderer.rendertype.RenderType;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.joml.Matrix4f;
|
||||
import org.lwjgl.system.MemoryStack;
|
||||
import org.lwjgl.system.MemoryUtil;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* Stage 3 step 4: far-entity animation freeze. A distant entity's model
|
||||
* vertices are captured once per game tick and, on the frames in between,
|
||||
* replayed as raw vertex copies shifted to the entity's current position —
|
||||
* the model is no longer rebuilt (and re-animated) every frame, only moved.
|
||||
*
|
||||
* <p>Distance gate: farther than {@link #distance()} blocks from the camera
|
||||
* (squared comparison against the pose translation). Close entities render
|
||||
* through the vanilla path untouched.
|
||||
*
|
||||
* <p>The capture is keyed per {@code (model, renderType, sprite)} triplet per
|
||||
* entity — one entity may submit the same model several times per frame
|
||||
* (body + armor layers); the n-th submission reuses the n-th capture. Parts
|
||||
* that are rebuilt every frame elsewhere (e.g. armor trim shimmer) are NOT
|
||||
* replayed — callers decide via {@link #freezes}, so those parts stay in sync
|
||||
* with the frozen rest instead of drifting.
|
||||
*
|
||||
* <p>Requires the raw-vertex push path ({@code RawVertices} + Sodium or the
|
||||
* vanilla {@code RawBuffer} mixin); when neither consumer accepts raw bytes,
|
||||
* {@link #render} returns {@code false} and vanilla runs.
|
||||
*
|
||||
* <p>Toggle: {@link #configure(boolean, int)}, pushed by the Optimize module
|
||||
* once per frame. The frame counter advances from the {@code renderFrame}
|
||||
* hook in {@code MinecraftMixin}.
|
||||
*/
|
||||
public enum AnimFreeze {
|
||||
;
|
||||
|
||||
/** Advances once per rendered frame; captures are reused within one frame. */
|
||||
public static volatile long frame;
|
||||
|
||||
private static final ByteBufferBuilder SCRATCH = new ByteBufferBuilder(16384);
|
||||
private static ByteBuffer emitBuffer = MemoryUtil.memAlloc(16384);
|
||||
|
||||
private static volatile boolean enabled;
|
||||
private static volatile int distance = 16;
|
||||
|
||||
/** Push a full snapshot — called by the Optimize module once per frame. */
|
||||
public static void configure(boolean enable, int distanceBlocks) {
|
||||
enabled = enable;
|
||||
distance = distanceBlocks;
|
||||
}
|
||||
|
||||
/** Reset to "off" — used by {@code Optimize.onDisable}. */
|
||||
public static void reset() {
|
||||
configure(false, 0);
|
||||
}
|
||||
|
||||
public static boolean enabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public static int distance() {
|
||||
return distance;
|
||||
}
|
||||
|
||||
/**
|
||||
* True when this (state, pose) pair belongs to a far entity whose parts
|
||||
* must all replay the frozen capture — parts built every frame elsewhere
|
||||
* consult this so they don't drift off the frozen rest.
|
||||
*/
|
||||
public static boolean freezes(Object state, Matrix4f pose) {
|
||||
if (!enabled || !(state instanceof EntityRenderState s)
|
||||
|| ((StateEntity) s).lovisual$entity() == null) {
|
||||
return false;
|
||||
}
|
||||
float d = distance;
|
||||
return beyondDistance(pose.m30(), pose.m31(), pose.m32(), d);
|
||||
}
|
||||
|
||||
/**
|
||||
* Capture-once-per-tick / replay-in-between for one model submission.
|
||||
*
|
||||
* @return {@code false} when not frozen (caller renders as usual)
|
||||
*/
|
||||
public static boolean render(Entity entity, Model<?> model, RenderType type, TextureAtlasSprite sprite,
|
||||
Matrix4f pose, VertexConsumer target, Consumer<VertexConsumer> draw) {
|
||||
float x = pose.m30(), y = pose.m31(), z = pose.m32();
|
||||
float d = distance;
|
||||
if (!enabled || !beyondDistance(x, y, z, d) || !RawVertices.accepts(target, type.format())) {
|
||||
return false;
|
||||
}
|
||||
AnimHolder owner = (AnimHolder) entity;
|
||||
Holder holder = owner.lovisual$anim();
|
||||
if (holder == null) {
|
||||
holder = new Holder();
|
||||
owner.lovisual$anim(holder);
|
||||
}
|
||||
Capture capture = find(holder, model, type, sprite);
|
||||
long tick = entity.level().getGameTime();
|
||||
if (capture.tick != tick) {
|
||||
BufferBuilder builder = new BufferBuilder(SCRATCH, type.primitiveTopology(), type.format());
|
||||
draw.accept(sprite == null ? builder : sprite.wrap(builder));
|
||||
capture.count = 0;
|
||||
try (MeshData mesh = builder.build()) {
|
||||
if (mesh != null) {
|
||||
ByteBuffer src = mesh.vertexBuffer();
|
||||
int bytes = src.remaining();
|
||||
if (capture.data == null || capture.data.capacity() < bytes) {
|
||||
capture.data = ByteBuffer.allocateDirect(bytes * 2);
|
||||
}
|
||||
MemoryUtil.memCopy(MemoryUtil.memAddress(src), MemoryUtil.memAddress0(capture.data), bytes);
|
||||
capture.count = mesh.drawState().vertexCount();
|
||||
}
|
||||
}
|
||||
capture.tick = tick;
|
||||
capture.x = x;
|
||||
capture.y = y;
|
||||
capture.z = z;
|
||||
}
|
||||
if (capture.count > 0) {
|
||||
emit(capture, type.format(), x - capture.x, y - capture.y, z - capture.z, target);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/** Squared distance from the origin — shared by {@link #freezes} and {@link #render}. */
|
||||
static boolean beyondDistance(float x, float y, float z, float dist) {
|
||||
return x * x + y * y + z * z > dist * dist;
|
||||
}
|
||||
|
||||
/** Per-entity bag of captures. */
|
||||
public static final class Holder {
|
||||
final List<Capture> captures = new ArrayList<>(4);
|
||||
|
||||
Holder() {
|
||||
}
|
||||
}
|
||||
|
||||
static final class Capture {
|
||||
Object model;
|
||||
RenderType type;
|
||||
TextureAtlasSprite sprite;
|
||||
int ordinal;
|
||||
long usedFrame = -1;
|
||||
long tick = Long.MIN_VALUE;
|
||||
ByteBuffer data;
|
||||
int count;
|
||||
float x, y, z;
|
||||
}
|
||||
|
||||
/** The same model may be submitted several times per entity; the n-th call this frame reuses the n-th capture. */
|
||||
private static Capture find(Holder holder, Object model, RenderType type, TextureAtlasSprite sprite) {
|
||||
int ordinal = 0;
|
||||
for (Capture c : holder.captures) {
|
||||
if (c.model == model && c.type == type && c.sprite == sprite && c.usedFrame == frame) {
|
||||
ordinal++;
|
||||
}
|
||||
}
|
||||
for (Capture c : holder.captures) {
|
||||
if (c.model == model && c.type == type && c.sprite == sprite && c.ordinal == ordinal) {
|
||||
c.usedFrame = frame;
|
||||
return c;
|
||||
}
|
||||
}
|
||||
Capture c = new Capture();
|
||||
c.model = model;
|
||||
c.type = type;
|
||||
c.sprite = sprite;
|
||||
c.ordinal = ordinal;
|
||||
c.usedFrame = frame;
|
||||
holder.captures.add(c);
|
||||
return c;
|
||||
}
|
||||
|
||||
private static void emit(Capture capture, VertexFormat format, float dx, float dy, float dz, VertexConsumer target) {
|
||||
int stride = format.getVertexSize();
|
||||
int pos = format.getElement(DefaultVertexFormat.POSITION_SEMANTIC_NAME).offset();
|
||||
int size = capture.count * stride;
|
||||
if (emitBuffer.capacity() < size) {
|
||||
emitBuffer = MemoryUtil.memRealloc(emitBuffer, size * 2);
|
||||
}
|
||||
long dst = MemoryUtil.memAddress0(emitBuffer);
|
||||
MemoryUtil.memCopy(MemoryUtil.memAddress0(capture.data), dst, size);
|
||||
for (long v = dst + pos, end = dst + size; v < end; v += stride) {
|
||||
MemoryUtil.memPutFloat(v, MemoryUtil.memGetFloat(v) + dx);
|
||||
MemoryUtil.memPutFloat(v + 4, MemoryUtil.memGetFloat(v + 4) + dy);
|
||||
MemoryUtil.memPutFloat(v + 8, MemoryUtil.memGetFloat(v + 8) + dz);
|
||||
}
|
||||
try (MemoryStack stack = MemoryStack.stackPush()) {
|
||||
RawVertices.push(target, stack, dst, capture.count, format);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package dev.loki.lovisual.render.engine.optimize.entity;
|
||||
|
||||
/**
|
||||
* Mixin-contract: per-entity storage for frozen animation captures
|
||||
* ({@link AnimFreeze.Holder}). Implemented on {@code Entity} by
|
||||
* {@code EntityAnimHolderMixin}; render code reaches it through the
|
||||
* {@code EntityRenderState} back-reference ({@code StateEntity}).
|
||||
*/
|
||||
public interface AnimHolder {
|
||||
|
||||
AnimFreeze.Holder lovisual$anim();
|
||||
|
||||
void lovisual$anim(AnimFreeze.Holder holder);
|
||||
}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
package dev.loki.lovisual.render.engine.optimize.entity;
|
||||
|
||||
import java.util.IdentityHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import org.joml.Vector3fc;
|
||||
|
||||
/**
|
||||
* Stage 3 step 5: shared model bounds for single-layer items. Render states
|
||||
* are rebuilt every frame, so a cache stored on the state itself dies with
|
||||
* it; the extents supplier identity is stable per baked model and works as
|
||||
* a long-lived key here.
|
||||
*/
|
||||
public enum ItemBounds {
|
||||
;
|
||||
|
||||
private static final Map<Supplier<Vector3fc[]>, Entry> BOUNDS = new IdentityHashMap<>();
|
||||
|
||||
private static volatile boolean enabled;
|
||||
|
||||
public static void configure(boolean on) {
|
||||
enabled = on;
|
||||
}
|
||||
|
||||
public static void reset() {
|
||||
enabled = false;
|
||||
BOUNDS.clear();
|
||||
}
|
||||
|
||||
public static boolean enabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public static AABB get(Supplier<Vector3fc[]> extents, ItemTransform transform, Supplier<AABB> compute) {
|
||||
Entry e = BOUNDS.get(extents);
|
||||
if (e != null && e.transform() == transform) {
|
||||
return e.bounds();
|
||||
}
|
||||
AABB bounds = compute.get();
|
||||
// wholesale clear instead of LRU; models only change on resource reload
|
||||
if (BOUNDS.size() > 4096) {
|
||||
BOUNDS.clear();
|
||||
}
|
||||
BOUNDS.put(extents, new Entry(transform, bounds));
|
||||
return bounds;
|
||||
}
|
||||
|
||||
private record Entry(ItemTransform transform, AABB bounds) {
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
package dev.loki.lovisual.render.engine.optimize.entity;
|
||||
|
||||
import com.google.common.collect.MapMaker;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import net.minecraft.client.resources.model.geometry.BakedQuad;
|
||||
import net.minecraft.core.Direction;
|
||||
import org.joml.Vector3fc;
|
||||
|
||||
/**
|
||||
* Stage 3 step 5: far-item level of detail. Distant flat items (generated
|
||||
* item models with a few large Z faces plus thin edge strips) drop their
|
||||
* side geometry — at 8+ blocks the two big faces read the same on screen.
|
||||
*
|
||||
* <p>The quad list handed to the item renderer is a reused per-render-state
|
||||
* buffer, so the flat-list cache is keyed by the model's first quad with
|
||||
* weak keys; a model rebuild invalidates the entry for free.
|
||||
*/
|
||||
public enum ItemLod {
|
||||
;
|
||||
|
||||
private static final float EDGE = 1f / 16f + 1e-4f;
|
||||
private static final Map<BakedQuad, Flat> FLAT = new MapMaker().weakKeys().makeMap();
|
||||
|
||||
private static volatile boolean enabled;
|
||||
private static volatile float distanceSq;
|
||||
|
||||
public static void configure(boolean on, int distance) {
|
||||
enabled = on;
|
||||
distanceSq = (float) distance * (float) distance;
|
||||
}
|
||||
|
||||
public static void reset() {
|
||||
enabled = false;
|
||||
distanceSq = 0f;
|
||||
FLAT.clear();
|
||||
}
|
||||
|
||||
public static boolean enabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public static float distanceSq() {
|
||||
return distanceSq;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the model's Z faces only when the whole model is flat (every
|
||||
* quad is an Z-axis face or thinner than 1/16 block) and has at least
|
||||
* eight quads; anything else is returned unchanged.
|
||||
*/
|
||||
public static List<BakedQuad> flat(List<BakedQuad> quads) {
|
||||
if (quads.isEmpty()) {
|
||||
return quads;
|
||||
}
|
||||
Flat cached = FLAT.get(quads.getFirst());
|
||||
if (cached == null || cached.sourceSize() != quads.size()) {
|
||||
cached = new Flat(quads.size(), compute(quads));
|
||||
FLAT.put(quads.getFirst(), cached);
|
||||
}
|
||||
return cached.quads() == null ? quads : cached.quads();
|
||||
}
|
||||
|
||||
private record Flat(int sourceSize, List<BakedQuad> quads) {
|
||||
}
|
||||
|
||||
private static List<BakedQuad> compute(List<BakedQuad> quads) {
|
||||
if (quads.size() < 8) {
|
||||
return null;
|
||||
}
|
||||
for (BakedQuad q : quads) {
|
||||
if (q.direction().getAxis() != Direction.Axis.Z && !thin(q)) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
List<BakedQuad> faces = List.copyOf(
|
||||
quads.stream().filter(q -> q.direction().getAxis() == Direction.Axis.Z).toList());
|
||||
return faces.isEmpty() ? null : faces;
|
||||
}
|
||||
|
||||
private static boolean thin(BakedQuad q) {
|
||||
float minZ = Float.MAX_VALUE;
|
||||
float maxZ = -Float.MAX_VALUE;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
Vector3fc p = q.position(i);
|
||||
minZ = Math.min(minZ, p.z());
|
||||
maxZ = Math.max(maxZ, p.z());
|
||||
}
|
||||
return maxZ - minZ <= EDGE;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package dev.loki.lovisual.render.engine.optimize.gl;
|
||||
|
||||
import com.mojang.blaze3d.vertex.VertexFormat;
|
||||
|
||||
/**
|
||||
* Stage 3 step 7: a {@code BufferBuilder} that accepts ready-made vertex
|
||||
* bytes pushed straight from memory — what Sodium's {@code VertexBufferWriter}
|
||||
* does, reimplemented for the vanilla builder so optimizations work without
|
||||
* Sodium.
|
||||
*
|
||||
* Implemented on {@code BufferBuilder} by {@code BufferBuilderRawMixin}.
|
||||
*/
|
||||
public interface RawBuffer {
|
||||
|
||||
/** True when this buffer's vertex format is exactly {@code format}. */
|
||||
boolean lovisual$accepts(VertexFormat format);
|
||||
|
||||
/**
|
||||
* Copy {@code count} whole vertices from {@code src} (a native address)
|
||||
* into the buffer.
|
||||
*/
|
||||
void lovisual$push(long src, int count);
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue