Merge in Head #4

Rjvs · 2021-07-30T17:20:56Z

Key changes from upstream:

fixed sphere geometry
NaN normals (might be GLTF only)

Fixed sphere geometry kind

…checks on current offset versus expected offset.

@minorai

- Fixes issue pointed out by @minorai that the length field in the chunk header actually is the offset of the next chunk. - Adds check to verify that offset of next chunk is where it is expected. - Renamed some variables in ParserRVM to make the code more readable.

…in an extras field in the header

Export data as GLTF (GLB)

Added note about upgrading solution

Handle the case that the normal is NaN before normalization

…can be handled with the same base code

…nsparency

…at encodes translucency

Partial support exporting data as rev file

@ddcsjtu

Handle obstruction and insulation chunks using feedback from @ddcsjtu

# Conflicts: # msvc15/rvmparser.vcxproj # src/ParserRVM.cpp # src/main.cpp

minorai and others added 30 commits February 24, 2021 11:02

Fixed sphere geometry kind

f870b62

Merge pull request cdyk#15 from minorai/Bugfix/WrongGeometryKind

5b57c02

Fixed sphere geometry kind

Renaming len from rvm header to expected offset of next chunk, added …

a3a7f7c

…checks on current offset versus expected offset.

Set up skeleton for export-gltf routine

b414d57

Write GLB container fields

85e42c2

Start building some data and set up writing

cf6c31e

Pretty print JSON to stdout for debugging

ef07aa5

Update readme

721e888

Build gltf node hierarchy

e6a314b

Initial skeleton of rev writer

d6c703e

Added output code for data I have seen so far

10ea2bf

Updated readme

3182eb8

Emit log message for unsupported primitives instead of asserting

6da774a

Added buffers, accessors, materials, meshes

a90a1e2

Fix silly operator[] type

857eabd

Fix missing members, clean up gltf validator issues

5836743

Add optional centering of model, stuffing the position of the origin …

f705a26

…in an extras field in the header

Fix bug when no json padding

770ae97

Optional root node that rotates +Z to +Y to match gltf's notion of up

8606a54

Plumb options to control gltf export

072913d

Update help and readme with new options

035f29b

Update years in LICENSE

4354cd7

minor cleanup

8033493

Merge pull request cdyk#20 from cdyk/export-gltf

0dd3166

Export data as GLTF (GLB)

Added note about upgrading solution

518da7c

Merge pull request cdyk#24 from cdyk/note

613a2a2

Added note about upgrading solution

fix Common.cpp,add github action

119c03e

fix build steps

f9e3d02

export posix env

bc2ba91

cdyk and others added 3 commits July 6, 2021 18:22

Handle the case that the normal is NaN before normalization

34441eb

Merge pull request cdyk#32 from cdyk/nan-normals

c8a651d

Handle the case that the normal is NaN before normalization

Merge branch 'cdyk:master' into master

80a58e5

Rjvs added bug Something isn't working technical debt Make life easier for ourselves labels Jul 30, 2021

Rjvs requested a review from RaymondTFreeman July 30, 2021 17:20

Rjvs self-assigned this Jul 30, 2021

Rjvs removed the bug Something isn't working label Jul 30, 2021

Rjvs assigned RaymondTFreeman and unassigned Rjvs Jul 30, 2021

cdyk and others added 20 commits November 14, 2021 14:07

Pass along chunk id to primitive chunk parse code, so similar chunks …

1d6851c

…can be handled with the same base code

Handle obst and insu chunks by reading translucency

c77fc41

Store primitive/obstruction/insulation in geometry, add field for tra…

0106e91

…nsparency

Assume CNTB chunks with version greater than two has an extra word th…

5f688de

…at encodes translucency

Cleanup

d712cd6

Merge branch 'master' into export-rev

7c92cd0

Merge pull request cdyk#22 from cdyk/export-rev

e5811ab

Partial support exporting data as rev file

Merge branch 'master' into parse_obst_insu

ad8f6f7

Handle translucency in gltf export

4d0d72f

Rename translucency -> transparency

b6f52a0

Handle transparency in obj export

06c527c

Interpret first byte of v3 CNTB chunk as transparency.

57fff37

Inherit transparency from parent

41bd21a

Merge pull request cdyk#33 from cdyk/parse_obst_insu

60c4d44

Handle obstruction and insulation chunks using feedback from @ddcsjtu

Opens and writes SLJSON now

5f7ccb8

Merge branch 'rapidjson-writer' into stirling-labs

45a3be0

Merge remote-tracking branch 'upstream/master'

8f03c20

Update project to include ExportStirlingJson

9920a93

Merge SL-Export with upstream INSU & OBST support

14283e7

# Conflicts: # msvc15/rvmparser.vcxproj # src/ParserRVM.cpp # src/main.cpp

colourise geometry

5be69c7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge in Head #4

Merge in Head #4

Rjvs commented Jul 30, 2021

Merge in Head #4

Are you sure you want to change the base?

Merge in Head #4

Conversation

Rjvs commented Jul 30, 2021