Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic NFS2 track support #27

Merged
merged 43 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
1b37ac5
TRK track spline and basic mesh (proving grounds only)
AndyGura Dec 18, 2024
85c1f16
TRK track spline and basic mesh (proving grounds only)
AndyGura Dec 18, 2024
276edc9
trk bugfix
AndyGura Dec 18, 2024
aca9c1e
frontend textures preview in TRK gui
AndyGura Dec 19, 2024
efb627d
use correct textures in TRK mesh
AndyGura Dec 20, 2024
1e1f454
new UV logic for trk map mesh
AndyGura Dec 24, 2024
d45dd89
broken TRK props
AndyGura Jan 1, 2025
24f432e
Merge remote-tracking branch 'origin/main' into feature/nfs2-tracks
AndyGura Jan 2, 2025
f6f2274
documentation
AndyGura Jan 2, 2025
ffa32eb
Merge remote-tracking branch 'origin/main' into feature/nfs2-tracks
AndyGura Jan 2, 2025
bbeb1f2
code adjustments
AndyGura Jan 2, 2025
03c4cc2
Merge remote-tracking branch 'origin/main' into feature/nfs2-tracks
AndyGura Jan 2, 2025
fe5e167
merged frontend changes
AndyGura Jan 2, 2025
397e02a
Merge remote-tracking branch 'origin/main' into feature/nfs2-tracks
AndyGura Jan 3, 2025
b00c554
fixed COL reader; fixed TRK props positions reset
AndyGura Jan 3, 2025
7588490
enum lookup delegate field; added missing extrablock declaration for …
AndyGura Jan 3, 2025
afc3d22
hex editor
AndyGura Jan 9, 2025
05747fe
Merge branch 'main' into feature/nfs2-tracks
AndyGura Jan 9, 2025
49171af
fixed merge problems
AndyGura Jan 9, 2025
e9bd207
fixed shpi save problem
AndyGura Jan 9, 2025
a739e35
Merge remote-tracking branch 'origin/main' into feature/nfs2-tracks
AndyGura Jan 17, 2025
c1b8f19
abstractizing 3d scenes exporters
AndyGura Jan 17, 2025
9db9451
regression bugfix
AndyGura Jan 17, 2025
8899de0
migrated TRI serializer to use new 3d scenes approach
AndyGura Jan 21, 2025
7e56ded
fix regressions
AndyGura Jan 22, 2025
6049665
fix regressions
AndyGura Jan 22, 2025
a58e86f
fix regressions
AndyGura Jan 22, 2025
30c7777
cleanup; returned back logic to bake props to tnfs track scene
AndyGura Jan 23, 2025
5fc617b
added macos blender path example
AndyGura Jan 23, 2025
7c8e2f2
upd
AndyGura Jan 24, 2025
e69161b
Merge remote-tracking branch 'origin/main' into feature/nfs2-tracks
AndyGura Feb 3, 2025
d966714
updated frontend
AndyGura Feb 3, 2025
78529a3
TRK serializer code adjustments
AndyGura Feb 3, 2025
21a882e
TRK fixed mesh offsets
AndyGura Feb 3, 2025
cd81cd4
docs
AndyGura Feb 4, 2025
f060e4f
docs
AndyGura Feb 4, 2025
89ac16e
docs
AndyGura Feb 4, 2025
1c1d2fd
minor cleanup
AndyGura Feb 5, 2025
43ec942
textures
AndyGura Feb 5, 2025
5100ea2
mesh uv-s
AndyGura Feb 5, 2025
2e3ef31
terrain uv-s
AndyGura Feb 6, 2025
a6259e7
terrain uv-s
AndyGura Feb 6, 2025
a75291a
terrain uv-s
AndyGura Feb 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/dist/gui/index.html

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion frontend/dist/gui/main.a1816d660f2f8307.js

This file was deleted.

1 change: 1 addition & 0 deletions frontend/dist/gui/main.b45e12319af3e832.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions frontend/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { MatDialogModule } from '@angular/material/dialog';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatMenuModule } from '@angular/material/menu';
import { TriMapBlockUiComponent } from './components/editor/eac/tri-map.block-ui/tri-map.block-ui.component';
import { TrkMapBlockUiComponent } from './components/editor/eac/trk-map.block-ui/trk-map.block-ui.component';
import { RunCustomActionDialogComponent } from './components/run-custom-action.dialog/run-custom-action.dialog.component';
import { OripGeometryBlockUiComponent } from './components/editor/eac/orip-geometry.block-ui/orip-geometry.block-ui.component';
import { MinimapComponent } from './components/editor/common/minimap/minimap.component';
Expand Down Expand Up @@ -79,6 +80,7 @@ import { HexEditorModule } from 'ngx-hex-editor';
FlagsBlockUiComponent,
ConfirmDialogComponent,
TriMapBlockUiComponent,
TrkMapBlockUiComponent,
RunCustomActionDialogComponent,
OripGeometryBlockUiComponent,
MinimapComponent,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<div class='qfsSelector'>
<h4>Preview QFS file</h4>
<mat-form-field appearance='fill'>
<mat-label>Custom QFS path</mat-label>
<input #customQfsInput matInput type='text' [value]='(previewQfsLocation$ | async)!'>
</mat-form-field>
<button mat-button (click)='onQfsSelected(customQfsInput.value)'>LOAD</button>
<mat-spinner *ngIf='previewQfsLoading$ | async' mode='indeterminate' [diameter]='40'></mat-spinner>
</div>
<div class='preview'>
<div class='previewCanvasContainer' #previewCanvasContainer>
<canvas #previewCanvas width='640' height='480'></canvas>
<mat-spinner *ngIf='previewLoading$ | async' mode='indeterminate'></mat-spinner>
</div>
<div class='previewNavigationContainer' #previewCanvasContainer>
<mat-form-field appearance='fill'>
<mat-label>Spline item</mat-label>
<input matInput type='number'
[min]='0' [max]='(_resource$ | async)?.data.num_blocks * 4 - 1'
[ngModel]='selectedSplineIndex$ | async'
(ngModelChange)='selectedSplineIndex$.next($event)'>
</mat-form-field>
<app-minimap [roadSpline]='roadPath || []'
[pointer]='pointer$ | async'
[splineClosed]='true'
[projection]='"nz"'
(pointerChange)='onPointerChange($event)'></app-minimap>
</div>
</div>
<app-compound-block-ui [resource]='_resource$ | async'></app-compound-block-ui>
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
.preview {
width: 100%;
height: calc(100vh - 14rem);
display: flex;
column-gap: 1rem;

.previewCanvasContainer {
flex-grow: 1;
position: relative;
overflow: hidden;
margin: 0 0 16px;
display: flex;
align-items: center;
justify-content: space-around;

canvas {
position: absolute;
}
}

.previewNavigationContainer {
width: 20rem;
flex-shrink: 0;
display: flex;
flex-direction: column;

app-minimap {
flex-grow: 1;
display: flex;
}
}

}

.qfsSelector {
display: flex;
align-items: center;
width: 100%;
column-gap: 1rem;

h4 {
min-width: fit-content;
}

mat-form-field {
flex-grow: 1;
}

mat-spinner, button {
margin-bottom: 1.34375em;
}
}
Loading