Skip to content

Fix sparse indices and values, they are objects not arrays #9

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.

Sign up for GitHub

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

Open
victor-Lopez25 wants to merge 1 commit into
base: master
Choose a base branch
from
+72 −87
Open

Fix sparse indices and values, they are objects not arrays #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
155 changes: 70 additions & 85 deletions gltf.odin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,32 +426,25 @@ accessors_free :: proc(accessors: []Accessor) {
if len(accessors) == 0 {
return
}
for accessor in accessors {
if accessor.sparse == nil {
continue
}
if len(accessor.sparse.?.indices) > 0 {
delete(accessor.sparse.?.indices)
}
if len(accessor.sparse.?.values) > 0 {
delete(accessor.sparse.?.values)
}
}
delete(accessors)
}

@(require_results)
accessor_sparse_parse :: proc(object: json.Object) -> (res: Accessor_Sparse, err: Error) {
indices_set, values_set: bool

for k, v in object {
switch k {
case "count": // Not used by this implementation
case "indices":
// Required
res.indices = sparse_indices_parse(v.(json.Array)) or_return
res.indices = sparse_indices_parse(v.(json.Object)) or_return
indices_set = true

case "values":
// Required
res.values = sparse_values_parse(v.(json.Array)) or_return
res.values = sparse_values_parse(v.(json.Object)) or_return
values_set = true

case EXTENSIONS_KEY:
res.extensions = v
Expand All @@ -464,108 +457,100 @@ accessor_sparse_parse :: proc(object: json.Object) -> (res: Accessor_Sparse, err
}
}

if len(res.indices) == 0 {
if !indices_set {
return res, GLTF_Error{type = .Missing_Required_Parameter, proc_name = #procedure, param = {name = "indices"}}
}
if len(res.values) == 0 {
if !values_set {
return res, GLTF_Error{type = .Missing_Required_Parameter, proc_name = #procedure, param = {name = "values"}}
}

return res, nil
}

@(require_results)
sparse_indices_parse :: proc(array: json.Array) -> (res: []Accessor_Sparse_Indices, err: Error) {
res = make([]Accessor_Sparse_Indices, len(array))

for index, idx in array {
buffer_view_set, component_type_set: bool
sparse_indices_parse :: proc(object: json.Object) -> (res: Accessor_Sparse_Indices, err: Error) {
buffer_view_set, component_type_set: bool

for k, v in index.(json.Object) {
switch k {
case "bufferView":
// Required
res[idx].buffer_view = Integer(v.(f64))
buffer_view_set = true
for k, v in object {
switch k {
case "bufferView":
// Required
res.buffer_view = Integer(v.(f64))
buffer_view_set = true

case "byteOffset":
// Default 0
res[idx].byte_offset = Integer(v.(f64))
case "byteOffset":
// Default 0
res.byte_offset = Integer(v.(f64))

case "componentType":
// Required
res[idx].component_type = Component_Type(v.(f64))
component_type_set = true
case "componentType":
// Required
res.component_type = Component_Type(v.(f64))
component_type_set = true

case EXTENSIONS_KEY:
res[idx].extensions = v
case EXTENSIONS_KEY:
res.extensions = v

case EXTRAS_KEY:
res[idx].extras = v
case EXTRAS_KEY:
res.extras = v

case:
warning_unexpected_data(#procedure, k, v, idx)
}
case:
warning_unexpected_data(#procedure, k, v)
}
}

if !buffer_view_set {
return res,
GLTF_Error {
type = .Missing_Required_Parameter,
proc_name = #procedure,
param = {name = "bufferView", index = idx},
}
}
if !component_type_set {
return res,
GLTF_Error {
type = .Missing_Required_Parameter,
proc_name = #procedure,
param = {name = "componentType", index = idx},
}
}
if !buffer_view_set {
return res,
GLTF_Error {
type = .Missing_Required_Parameter,
proc_name = #procedure,
param = {name = "bufferView"},
}
}
if !component_type_set {
return res,
GLTF_Error {
type = .Missing_Required_Parameter,
proc_name = #procedure,
param = {name = "componentType"},
}
}

return res, nil
}

@(require_results)
sparse_values_parse :: proc(array: json.Array) -> (res: []Accessor_Sparse_Values, err: Error) {
res = make([]Accessor_Sparse_Values, len(array))

for value, idx in array {
buffer_view_set: bool
sparse_values_parse :: proc(object: json.Object) -> (res: Accessor_Sparse_Values, err: Error) {
buffer_view_set: bool

for k, v in value.(json.Object) {
switch k {
case "bufferView":
// Required
res[idx].buffer_view = Integer(v.(f64))
buffer_view_set = true
for k, v in object {
switch k {
case "bufferView":
// Required
res.buffer_view = Integer(v.(f64))
buffer_view_set = true

case "byteOffset":
// Defalt 0
res[idx].byte_offset = Integer(v.(f64))
case "byteOffset":
// Defalt 0
res.byte_offset = Integer(v.(f64))

case EXTENSIONS_KEY:
res[idx].extensions = v
case EXTENSIONS_KEY:
res.extensions = v

case EXTRAS_KEY:
res[idx].extras = v
case EXTRAS_KEY:
res.extras = v

case:
warning_unexpected_data(#procedure, k, v, idx)
}
case:
warning_unexpected_data(#procedure, k, v)
}
}

if !buffer_view_set {
return res,
GLTF_Error {
type = .Missing_Required_Parameter,
proc_name = #procedure,
param = {name = "bufferView", index = idx},
}
}
if !buffer_view_set {
return res,
GLTF_Error {
type = .Missing_Required_Parameter,
proc_name = #procedure,
param = {name = "bufferView"},
}
}

return res, nil
Expand Down
4 changes: 2 additions & 2 deletions types.odin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ Accessor_Type :: enum {

Accessor_Sparse :: struct {
//count: Integer, // Required
indices: []Accessor_Sparse_Indices, // Required
values: []Accessor_Sparse_Values, // Required
indices: Accessor_Sparse_Indices, // Required
values: Accessor_Sparse_Values, // Required
extensions: Extensions,
extras: Extras,
}
Expand Down