Skip to content

Commit 7e8fa48

Browse files
sandrofigosandrofigo
committed
Merge branch 'develop'
2 parents 43f671b + 45fe5cb commit 7e8fa48

33 files changed

+1138
-600
lines changed

‎.github/workflows/release.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# ------------------------------------------------------------------------------
2-
# <auto-generated>
3-
#
4-
# This code was generated.
5-
#
6-
# - To turn off auto-generation set:
7-
#
8-
# [GitHubActions (AutoGenerate = false)]
9-
#
10-
# - To trigger manual generation invoke:
11-
#
12-
# nuke --generate-configuration GitHubActions_release --host GitHubActions
13-
#
14-
# </auto-generated>
15-
# ------------------------------------------------------------------------------
16-
171
name: release
182

193
on:
@@ -23,15 +7,15 @@ on:
237

248
jobs:
259
nuke-build:
26-
name: NUKE build
10+
name: Release
2711
runs-on: ubuntu-latest
2812
steps:
29-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
3014
with:
3115
fetch-depth: 0
3216
lfs: true
3317
- name: Cache .nuke/temp, ~/.nuget/packages
34-
uses: actions/cache@v3
18+
uses: actions/cache@v4
3519
with:
3620
path: |
3721
.nuke/temp

‎.github/workflows/build.yml renamed to ‎.github/workflows/test.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
# ------------------------------------------------------------------------------
2-
# <auto-generated>
3-
#
4-
# This code was generated.
5-
#
6-
# - To turn off auto-generation set:
7-
#
8-
# [GitHubActions (AutoGenerate = false)]
9-
#
10-
# - To trigger manual generation invoke:
11-
#
12-
# nuke --generate-configuration GitHubActions_test --host GitHubActions
13-
#
14-
# </auto-generated>
15-
# ------------------------------------------------------------------------------
16-
17-
name: build
1+
name: test
182

193
on:
204
push:
215
branches:
226
- main
7+
- develop
238
paths-ignore:
249
- '**/README.md'
2510
- '**/CHANGELOG.md'
@@ -32,15 +17,15 @@ on:
3217

3318
jobs:
3419
nuke-build:
35-
name: NUKE build
20+
name: Test
3621
runs-on: ubuntu-latest
3722
steps:
38-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
3924
with:
4025
fetch-depth: 0
4126
lfs: true
4227
- name: Cache .nuke/temp, ~/.nuget/packages
43-
uses: actions/cache@v3
28+
uses: actions/cache@v4
4429
with:
4530
path: |
4631
.nuke/temp

‎.nuke/build.schema.json

Lines changed: 75 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,52 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"title": "Build Schema",
4-
"$ref": "#/definitions/build",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"Clean",
28+
"Compile",
29+
"Pack",
30+
"PublishGitHubRelease",
31+
"PublishPackageToGithub",
32+
"PublishPackageToNuGet",
33+
"Restore",
34+
"Test",
35+
"Validate"
36+
]
37+
},
38+
"Verbosity": {
39+
"type": "string",
40+
"description": "",
41+
"enum": [
42+
"Verbose",
43+
"Normal",
44+
"Minimal",
45+
"Quiet"
46+
]
47+
},
48+
"NukeBuild": {
849
"properties": {
9-
"Configuration": {
10-
"type": "string",
11-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
12-
"enum": [
13-
"Debug",
14-
"Release"
15-
]
16-
},
1750
"Continue": {
1851
"type": "boolean",
1952
"description": "Indicates to continue a previously failed build attempt"
@@ -23,35 +56,13 @@
2356
"description": "Shows the help text for this build assembly"
2457
},
2558
"Host": {
26-
"type": "string",
2759
"description": "Host for execution. Default is 'automatic'",
28-
"enum": [
29-
"AppVeyor",
30-
"AzurePipelines",
31-
"Bamboo",
32-
"Bitbucket",
33-
"Bitrise",
34-
"GitHubActions",
35-
"GitLab",
36-
"Jenkins",
37-
"Rider",
38-
"SpaceAutomation",
39-
"TeamCity",
40-
"Terminal",
41-
"TravisCI",
42-
"VisualStudio",
43-
"VSCode"
44-
]
60+
"$ref": "#/definitions/Host"
4561
},
4662
"NoLogo": {
4763
"type": "boolean",
4864
"description": "Disables displaying the NUKE logo"
4965
},
50-
"NuGetApiKey": {
51-
"type": "string",
52-
"description": "NuGet API Key",
53-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
54-
},
5566
"Partition": {
5667
"type": "string",
5768
"description": "Partition to use on CI"
@@ -75,53 +86,47 @@
7586
"type": "array",
7687
"description": "List of targets to be skipped. Empty list skips all dependencies",
7788
"items": {
78-
"type": "string",
79-
"enum": [
80-
"Clean",
81-
"Compile",
82-
"Pack",
83-
"PublishGitHubRelease",
84-
"PublishPackageToGithub",
85-
"PublishPackageToNuGet",
86-
"Restore",
87-
"Test",
88-
"Validate"
89-
]
89+
"$ref": "#/definitions/ExecutableTarget"
9090
}
9191
},
92-
"Solution": {
93-
"type": "string",
94-
"description": "Path to a solution file that is automatically loaded"
95-
},
9692
"Target": {
9793
"type": "array",
9894
"description": "List of targets to be invoked. Default is '{default_target}'",
9995
"items": {
100-
"type": "string",
101-
"enum": [
102-
"Clean",
103-
"Compile",
104-
"Pack",
105-
"PublishGitHubRelease",
106-
"PublishPackageToGithub",
107-
"PublishPackageToNuGet",
108-
"Restore",
109-
"Test",
110-
"Validate"
111-
]
96+
"$ref": "#/definitions/ExecutableTarget"
11297
}
11398
},
11499
"Verbosity": {
115-
"type": "string",
116100
"description": "Logging verbosity during build execution. Default is 'Normal'",
101+
"$ref": "#/definitions/Verbosity"
102+
}
103+
}
104+
}
105+
},
106+
"allOf": [
107+
{
108+
"properties": {
109+
"Configuration": {
110+
"type": "string",
111+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
117112
"enum": [
118-
"Minimal",
119-
"Normal",
120-
"Quiet",
121-
"Verbose"
113+
"Debug",
114+
"Release"
122115
]
116+
},
117+
"NuGetApiKey": {
118+
"type": "string",
119+
"description": "NuGet API Key",
120+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
121+
},
122+
"Solution": {
123+
"type": "string",
124+
"description": "Path to a solution file that is automatically loaded"
123125
}
124126
}
127+
},
128+
{
129+
"$ref": "#/definitions/NukeBuild"
125130
}
126-
}
127-
}
131+
]
132+
}

‎CHANGELOG.md

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
77
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
88
-->
99

10+
## [Unreleased]
11+
12+
## [5.0.0] - 2024-12-19
13+
14+
### Added
15+
16+
- Added support for model rotations (Thanks to @Oribow)
17+
18+
### Changed
19+
20+
- Voxel and model positions are now accessed via the `GlobalPosition` and `LocalPosition` property
21+
- Model size is now accessed via the `GlobalSize` and `LocalSize` property
22+
1023
## [4.1.1] - 2023-05-20
1124

1225
### Changed
@@ -32,14 +45,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3245
- Added method `Palette.GetColorIndicesByNote` to get mapped palette color indices grouped by palette note texts
3346
- Added mapped color index to voxel
3447

35-
### Fixed
36-
37-
- Fixed wrong colors in palette when an IMAP chunk exists
38-
3948
### Changed
4049

4150
- `Palette.Colors` now stores the mapped colors that are visible in the UI of MagicaVoxel instead of the raw colors parsed from the `.vox` file
4251

52+
### Fixed
53+
54+
- Fixed wrong colors in palette when an IMAP chunk exists
55+
4356
## [3.1.0] - 2023-01-03
4457

4558
### Added
@@ -119,16 +132,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
119132

120133
## [2.0.0] - 2021-07-18
121134

122-
### Changed
123-
124-
- Simplified access to voxels and model properties
125-
- Library targets .NET Standard 2.0
126-
127135
### Added
128136

129137
- Added support for multiple models
130138
- Added access to raw data for all chunk types
131139

140+
### Changed
141+
142+
- Simplified access to voxels and model properties
143+
- Library targets .NET Standard 2.0
144+
132145
## [1.2.0] - 2019-09-08
133146

134147
### Changed

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 Sandro Figo
3+
Copyright (c) 2024 Sandro Figo and contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![latest](https://img.shields.io/nuget/v/VoxReader)](https://www.nuget.org/packages/VoxReader/)
44
[![openupm](https://img.shields.io/npm/v/com.sandrofigo.voxreader?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.sandrofigo.voxreader/)
55
[![downloads](https://img.shields.io/nuget/dt/VoxReader?color=blue)](https://www.nuget.org/packages/VoxReader/)
6-
[![build](https://github.com/sandrofigo/VoxReader/actions/workflows/build.yml/badge.svg)](https://github.com/sandrofigo/VoxReader/actions/workflows/build.yml)
6+
[![test](https://github.com/sandrofigo/VoxReader/actions/workflows/test.yml/badge.svg)](https://github.com/sandrofigo/VoxReader/actions/workflows/test.yml)
77

88
A C# library to read .vox files created with [MagicaVoxel](https://ephtracy.github.io/index.html?page=mv_main)
99

@@ -12,7 +12,7 @@ A C# library to read .vox files created with [MagicaVoxel](https://ephtracy.gith
1212
## Currently supported features
1313

1414
At the moment it is possible to read:
15-
- the name, size and position of all models
15+
- the name, size, position and rotation of all models
1616
- all individual voxels including their color and position
1717
- the palette that was used for the model
1818
- the notes stored in the palette
@@ -32,7 +32,7 @@ IModel[] models = voxFile.Models;
3232
Voxel[] voxels = models[0].Voxels;
3333

3434
// Access properties of a voxel
35-
Vector3 position = voxels[0].Position;
35+
Vector3 position = voxels[0].GlobalPosition;
3636
Color color = voxels[0].Color;
3737

3838
// Access palette of .vox file

0 commit comments

Comments
 (0)