From f1fe73d1909a2448a004a88362a1a532d0d4f7c3 Mon Sep 17 00:00:00 2001 From: sanine Date: Sun, 12 Feb 2023 23:53:22 -0600 Subject: switch to tinyobj and nanovg from assimp and cairo --- .../glTF/CesiumMilkTruck/CesiumMilkTruck.bin | Bin 113052 -> 0 bytes .../glTF/CesiumMilkTruck/CesiumMilkTruck.gltf | 705 --------------------- .../glTF/CesiumMilkTruck/CesiumMilkTruck.png | Bin 923282 -> 0 bytes .../glTF/CesiumMilkTruck/CesiumMilkTruck0FS.glsl | 17 - .../glTF/CesiumMilkTruck/CesiumMilkTruck0VS.glsl | 12 - .../glTF/CesiumMilkTruck/CesiumMilkTruck1FS.glsl | 18 - .../glTF/CesiumMilkTruck/CesiumMilkTruck1VS.glsl | 15 - 7 files changed, 767 deletions(-) delete mode 100644 libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.bin delete mode 100644 libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.gltf delete mode 100644 libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.png delete mode 100644 libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0FS.glsl delete mode 100644 libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0VS.glsl delete mode 100644 libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1FS.glsl delete mode 100644 libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1VS.glsl (limited to 'libs/assimp/test/models/glTF/CesiumMilkTruck') diff --git a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.bin b/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.bin deleted file mode 100644 index e718eec..0000000 Binary files a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.bin and /dev/null differ diff --git a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.gltf b/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.gltf deleted file mode 100644 index 0d66c6f..0000000 --- a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.gltf +++ /dev/null @@ -1,705 +0,0 @@ -{ - "accessors": { - "accessor_100": { - "bufferView": "bufferView_105", - "byteOffset": 7032, - "byteStride": 12, - "componentType": 5126, - "count": 586, - "max": [ - 0.999039, - 0.999038, - 1 - ], - "min": [ - -0.999038, - -0.999038, - -1 - ], - "type": "VEC3" - }, - "accessor_102": { - "bufferView": "bufferView_105", - "byteOffset": 14064, - "byteStride": 8, - "componentType": 5126, - "count": 586, - "max": [ - 0.993657, - 0.989576 - ], - "min": [ - 0.605093, - 0.00905001 - ], - "type": "VEC2" - }, - "accessor_63": { - "bufferView": "bufferView_104", - "byteOffset": 4608, - "byteStride": 0, - "componentType": 5123, - "count": 5232, - "type": "SCALAR" - }, - "accessor_66": { - "bufferView": "bufferView_104", - "byteOffset": 15072, - "byteStride": 0, - "componentType": 5123, - "count": 168, - "type": "SCALAR" - }, - "accessor_69": { - "bufferView": "bufferView_104", - "byteOffset": 15408, - "byteStride": 0, - "componentType": 5123, - "count": 864, - "type": "SCALAR" - }, - "accessor_71": { - "bufferView": "bufferView_105", - "byteOffset": 18752, - "byteStride": 12, - "componentType": 5126, - "count": 2392, - "max": [ - 2.438, - 2.58437, - 1.396 - ], - "min": [ - -2.43091, - 0.2668, - -1.396 - ], - "type": "VEC3" - }, - "accessor_73": { - "bufferView": "bufferView_105", - "byteOffset": 47456, - "byteStride": 12, - "componentType": 5126, - "count": 2392, - "max": [ - 1, - 1, - 1 - ], - "min": [ - -1, - -1, - -1 - ], - "type": "VEC3" - }, - "accessor_75": { - "bufferView": "bufferView_105", - "byteOffset": 76160, - "byteStride": 8, - "componentType": 5126, - "count": 2392, - "max": [ - 0.896458, - 0.997245 - ], - "min": [ - 0.00295639, - 0.015672 - ], - "type": "VEC2" - }, - "accessor_96": { - "bufferView": "bufferView_104", - "byteOffset": 0, - "byteStride": 0, - "componentType": 5123, - "count": 2304, - "type": "SCALAR" - }, - "accessor_98": { - "bufferView": "bufferView_105", - "byteOffset": 0, - "byteStride": 12, - "componentType": 5126, - "count": 586, - "max": [ - 0.4278, - 0.4278, - 1.058 - ], - "min": [ - -0.4278, - -0.4278, - -1.058 - ], - "type": "VEC3" - }, - "animAccessor_0": { - "bufferView": "bufferView_103", - "byteOffset": 0, - "componentType": 5126, - "count": 31, - "type": "SCALAR" - }, - "animAccessor_1": { - "bufferView": "bufferView_103", - "byteOffset": 124, - "componentType": 5126, - "count": 31, - "type": "VEC4" - } - }, - "animations": { - "animation_0": { - "channels": [ - { - "sampler": "animation_0_rotation_sampler", - "target": { - "id": "Geometry-mesh001Node", - "path": "rotation" - } - } - ], - "parameters": { - "TIME": "animAccessor_0", - "rotation": "animAccessor_1" - }, - "samplers": { - "animation_0_rotation_sampler": { - "input": "TIME", - "interpolation": "LINEAR", - "output": "rotation" - } - } - }, - "animation_1": { - "channels": [ - { - "sampler": "animation_1_rotation_sampler", - "target": { - "id": "meshInst962Node", - "path": "rotation" - } - } - ], - "parameters": { - "TIME": "animAccessor_0", - "rotation": "animAccessor_1" - }, - "samplers": { - "animation_1_rotation_sampler": { - "input": "TIME", - "interpolation": "LINEAR", - "output": "rotation" - } - } - } - }, - "asset": { - "generator": "collada2gltf@ceec062e3d5793f2f249f53cbd843aee382ad40b", - "premultipliedAlpha": true, - "profile": { - "api": "WebGL", - "version": "1.0.2" - }, - "version": 1 - }, - "bufferViews": { - "bufferView_103": { - "buffer": "CesiumMilkTruck", - "byteLength": 620, - "byteOffset": 0 - }, - "bufferView_104": { - "buffer": "CesiumMilkTruck", - "byteLength": 17136, - "byteOffset": 620, - "target": 34963 - }, - "bufferView_105": { - "buffer": "CesiumMilkTruck", - "byteLength": 95296, - "byteOffset": 17756, - "target": 34962 - } - }, - "buffers": { - "CesiumMilkTruck": { - "byteLength": 113052, - "type": "arraybuffer", - "uri": "CesiumMilkTruck.bin" - } - }, - "images": { - "Image0001": { - "name": "Image0001", - "uri": "CesiumMilkTruck.png" - } - }, - "materials": { - "Effect-glass": { - "name": "glass", - "technique": "technique0", - "values": { - "diffuse": [ - 0, - 0.0405063, - 0.0212407, - 1 - ], - "shininess": 256, - "specular": [ - 0.65, - 0.65, - 0.65, - 1 - ] - } - }, - "Effect-truck": { - "name": "truck", - "technique": "technique1", - "values": { - "diffuse": "texture_Image0001", - "shininess": 256, - "specular": [ - 0.04, - 0.04, - 0.04, - 1 - ] - } - }, - "Effect-wheels": { - "name": "wheels", - "technique": "technique1", - "values": { - "diffuse": "texture_Image0001", - "shininess": 256, - "specular": [ - 0.04, - 0.04, - 0.04, - 1 - ] - } - }, - "Effect-window_trim": { - "name": "window_trim", - "technique": "technique0", - "values": { - "diffuse": [ - 0.064, - 0.064, - 0.064, - 1 - ], - "shininess": 256, - "specular": [ - 0.04, - 0.04, - 0.04, - 1 - ] - } - } - }, - "meshes": { - "Geometry-mesh001": { - "name": "Wheels", - "primitives": [ - { - "attributes": { - "NORMAL": "accessor_100", - "POSITION": "accessor_98", - "TEXCOORD_0": "accessor_102" - }, - "indices": "accessor_96", - "material": "Effect-wheels", - "mode": 4 - } - ] - }, - "Geometry-mesh002": { - "name": "Cesium_Milk_Truck", - "primitives": [ - { - "attributes": { - "NORMAL": "accessor_73", - "POSITION": "accessor_71", - "TEXCOORD_0": "accessor_75" - }, - "indices": "accessor_63", - "material": "Effect-truck", - "mode": 4 - }, - { - "attributes": { - "NORMAL": "accessor_73", - "POSITION": "accessor_71", - "TEXCOORD_0": "accessor_75" - }, - "indices": "accessor_66", - "material": "Effect-glass", - "mode": 4 - }, - { - "attributes": { - "NORMAL": "accessor_73", - "POSITION": "accessor_71", - "TEXCOORD_0": "accessor_75" - }, - "indices": "accessor_69", - "material": "Effect-window_trim", - "mode": 4 - } - ] - } - }, - "nodes": { - "Geometry-mesh001Node": { - "children": [], - "meshes": [ - "Geometry-mesh001" - ], - "name": "Wheels", - "rotation": [ - 0, - 0, - -0.0884856, - 0.996077 - ], - "scale": [ - 1, - 1, - 1 - ], - "translation": [ - 1.43267, - 0.427722, - -2.98023e-008 - ] - }, - "Geometry-mesh002Node": { - "children": [ - "Geometry-mesh001Node", - "meshInst962Node" - ], - "matrix": [ - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1 - ], - "meshes": [ - "Geometry-mesh002" - ], - "name": "Cesium_Milk_Truck" - }, - "groupLocator006Node": { - "children": [ - "txtrLocator003Node", - "txtrLocator013Node" - ], - "matrix": [ - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1 - ], - "name": "Texture_Group" - }, - "meshInst962Node": { - "children": [], - "meshes": [ - "Geometry-mesh001" - ], - "name": "Wheels__2_", - "rotation": [ - 0, - 0, - -0.0884856, - 0.996077 - ], - "scale": [ - 1, - 1, - 1 - ], - "translation": [ - -1.35233, - 0.427722, - -2.98023e-008 - ] - }, - "polyRender006": { - "children": [], - "matrix": [ - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1 - ], - "name": "Render" - }, - "txtrLocator003Node": { - "children": [], - "matrix": [ - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1 - ], - "name": "Cesium_Milk_Truck__2___Image___Texture_" - }, - "txtrLocator013Node": { - "children": [], - "matrix": [ - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1 - ], - "name": "Cesium_Milk_Truck__2___Image___2___Texture_" - } - }, - "programs": { - "program_0": { - "attributes": [ - "a_normal", - "a_position" - ], - "fragmentShader": "CesiumMilkTruck0FS", - "vertexShader": "CesiumMilkTruck0VS" - }, - "program_1": { - "attributes": [ - "a_normal", - "a_position", - "a_texcoord0" - ], - "fragmentShader": "CesiumMilkTruck1FS", - "vertexShader": "CesiumMilkTruck1VS" - } - }, - "samplers": { - "sampler_0": { - "magFilter": 9729, - "minFilter": 9987, - "wrapS": 10497, - "wrapT": 10497 - } - }, - "scene": "defaultScene", - "scenes": { - "defaultScene": { - "nodes": [ - "polyRender006", - "Geometry-mesh002Node", - "groupLocator006Node" - ] - } - }, - "shaders": { - "CesiumMilkTruck0FS": { - "type": 35632, - "uri": "CesiumMilkTruck0FS.glsl" - }, - "CesiumMilkTruck0VS": { - "type": 35633, - "uri": "CesiumMilkTruck0VS.glsl" - }, - "CesiumMilkTruck1FS": { - "type": 35632, - "uri": "CesiumMilkTruck1FS.glsl" - }, - "CesiumMilkTruck1VS": { - "type": 35633, - "uri": "CesiumMilkTruck1VS.glsl" - } - }, - "skins": {}, - "techniques": { - "technique0": { - "attributes": { - "a_normal": "normal", - "a_position": "position" - }, - "parameters": { - "diffuse": { - "type": 35666 - }, - "modelViewMatrix": { - "semantic": "MODELVIEW", - "type": 35676 - }, - "normal": { - "semantic": "NORMAL", - "type": 35665 - }, - "normalMatrix": { - "semantic": "MODELVIEWINVERSETRANSPOSE", - "type": 35675 - }, - "position": { - "semantic": "POSITION", - "type": 35665 - }, - "projectionMatrix": { - "semantic": "PROJECTION", - "type": 35676 - }, - "shininess": { - "type": 5126 - }, - "specular": { - "type": 35666 - } - }, - "program": "program_0", - "states": { - "enable": [ - 2929, - 2884 - ] - }, - "uniforms": { - "u_diffuse": "diffuse", - "u_modelViewMatrix": "modelViewMatrix", - "u_normalMatrix": "normalMatrix", - "u_projectionMatrix": "projectionMatrix", - "u_shininess": "shininess", - "u_specular": "specular" - } - }, - "technique1": { - "attributes": { - "a_normal": "normal", - "a_position": "position", - "a_texcoord0": "texcoord0" - }, - "parameters": { - "diffuse": { - "type": 35678 - }, - "modelViewMatrix": { - "semantic": "MODELVIEW", - "type": 35676 - }, - "normal": { - "semantic": "NORMAL", - "type": 35665 - }, - "normalMatrix": { - "semantic": "MODELVIEWINVERSETRANSPOSE", - "type": 35675 - }, - "position": { - "semantic": "POSITION", - "type": 35665 - }, - "projectionMatrix": { - "semantic": "PROJECTION", - "type": 35676 - }, - "shininess": { - "type": 5126 - }, - "specular": { - "type": 35666 - }, - "texcoord0": { - "semantic": "TEXCOORD_0", - "type": 35664 - } - }, - "program": "program_1", - "states": { - "enable": [ - 2929, - 2884 - ] - }, - "uniforms": { - "u_diffuse": "diffuse", - "u_modelViewMatrix": "modelViewMatrix", - "u_normalMatrix": "normalMatrix", - "u_projectionMatrix": "projectionMatrix", - "u_shininess": "shininess", - "u_specular": "specular" - } - } - }, - "textures": { - "texture_Image0001": { - "format": 6408, - "internalFormat": 6408, - "sampler": "sampler_0", - "source": "Image0001", - "target": 3553, - "type": 5121 - } - } -} \ No newline at end of file diff --git a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.png b/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.png deleted file mode 100644 index ba7a47c..0000000 Binary files a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.png and /dev/null differ diff --git a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0FS.glsl b/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0FS.glsl deleted file mode 100644 index 6e928dc..0000000 --- a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0FS.glsl +++ /dev/null @@ -1,17 +0,0 @@ -precision highp float; -varying vec3 v_normal; -uniform vec4 u_diffuse; -uniform vec4 u_specular; -uniform float u_shininess; -void main(void) { -vec3 normal = normalize(v_normal); -vec4 color = vec4(0., 0., 0., 0.); -vec4 diffuse = vec4(0., 0., 0., 1.); -vec4 specular; -diffuse = u_diffuse; -specular = u_specular; -diffuse.xyz *= max(dot(normal,vec3(0.,0.,1.)), 0.); -color.xyz += diffuse.xyz; -color = vec4(color.rgb * diffuse.a, diffuse.a); -gl_FragColor = color; -} diff --git a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0VS.glsl b/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0VS.glsl deleted file mode 100644 index 9e35922..0000000 --- a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck0VS.glsl +++ /dev/null @@ -1,12 +0,0 @@ -precision highp float; -attribute vec3 a_position; -attribute vec3 a_normal; -varying vec3 v_normal; -uniform mat3 u_normalMatrix; -uniform mat4 u_modelViewMatrix; -uniform mat4 u_projectionMatrix; -void main(void) { -vec4 pos = u_modelViewMatrix * vec4(a_position,1.0); -v_normal = u_normalMatrix * a_normal; -gl_Position = u_projectionMatrix * pos; -} diff --git a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1FS.glsl b/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1FS.glsl deleted file mode 100644 index 782e1f4..0000000 --- a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1FS.glsl +++ /dev/null @@ -1,18 +0,0 @@ -precision highp float; -varying vec3 v_normal; -varying vec2 v_texcoord0; -uniform sampler2D u_diffuse; -uniform vec4 u_specular; -uniform float u_shininess; -void main(void) { -vec3 normal = normalize(v_normal); -vec4 color = vec4(0., 0., 0., 0.); -vec4 diffuse = vec4(0., 0., 0., 1.); -vec4 specular; -diffuse = texture2D(u_diffuse, v_texcoord0); -specular = u_specular; -diffuse.xyz *= max(dot(normal,vec3(0.,0.,1.)), 0.); -color.xyz += diffuse.xyz; -color = vec4(color.rgb * diffuse.a, diffuse.a); -gl_FragColor = color; -} diff --git a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1VS.glsl b/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1VS.glsl deleted file mode 100644 index cacc9ed..0000000 --- a/libs/assimp/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck1VS.glsl +++ /dev/null @@ -1,15 +0,0 @@ -precision highp float; -attribute vec3 a_position; -attribute vec3 a_normal; -varying vec3 v_normal; -uniform mat3 u_normalMatrix; -uniform mat4 u_modelViewMatrix; -uniform mat4 u_projectionMatrix; -attribute vec2 a_texcoord0; -varying vec2 v_texcoord0; -void main(void) { -vec4 pos = u_modelViewMatrix * vec4(a_position,1.0); -v_normal = u_normalMatrix * a_normal; -v_texcoord0 = a_texcoord0; -gl_Position = u_projectionMatrix * pos; -} -- cgit v1.2.1