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 --- .../BoxTextured.gltf | 282 --------------------- .../BoxTextured0.bin | Bin 840 -> 0 bytes .../BoxTextured0.vert | 17 -- .../BoxTextured1.frag | 29 --- .../CesiumLogoFlat.png | Bin 2433 -> 0 bytes 5 files changed, 328 deletions(-) delete mode 100644 libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured.gltf delete mode 100644 libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.bin delete mode 100644 libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.vert delete mode 100644 libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured1.frag delete mode 100644 libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/CesiumLogoFlat.png (limited to 'libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL') diff --git a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured.gltf b/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured.gltf deleted file mode 100644 index 7401dce..0000000 --- a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured.gltf +++ /dev/null @@ -1,282 +0,0 @@ -{ - "asset": { - "generator": "COLLADA2GLTF", - "version": "2.0" - }, - "scene": 0, - "scenes": [ - { - "nodes": [ - 0 - ] - } - ], - "nodes": [ - { - "children": [ - 1 - ], - "matrix": [ - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - -1.0, - 0.0, - 0.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0 - ] - }, - { - "mesh": 0 - } - ], - "meshes": [ - { - "primitives": [ - { - "attributes": { - "NORMAL": 1, - "POSITION": 2, - "TEXCOORD_0": 3 - }, - "indices": 0, - "mode": 4, - "material": 0 - } - ], - "name": "Mesh" - } - ], - "accessors": [ - { - "bufferView": 0, - "byteOffset": 0, - "componentType": 5123, - "count": 36, - "max": [ - 23 - ], - "min": [ - 0 - ], - "type": "SCALAR" - }, - { - "bufferView": 1, - "byteOffset": 0, - "componentType": 5126, - "count": 24, - "max": [ - 1.0, - 1.0, - 1.0 - ], - "min": [ - -1.0, - -1.0, - -1.0 - ], - "type": "VEC3" - }, - { - "bufferView": 1, - "byteOffset": 288, - "componentType": 5126, - "count": 24, - "max": [ - 0.5, - 0.5, - 0.5 - ], - "min": [ - -0.5, - -0.5, - -0.5 - ], - "type": "VEC3" - }, - { - "bufferView": 2, - "byteOffset": 0, - "componentType": 5126, - "count": 24, - "max": [ - 6.0, - 1.0 - ], - "min": [ - 0.0, - 0.0 - ], - "type": "VEC2" - } - ], - "materials": [ - { - "values": { - "diffuse": [ - 0 - ], - "specular": [ - 0.20000000298023225, - 0.20000000298023225, - 0.20000000298023225, - 1.0 - ], - "shininess": [ - 256.0 - ], - "transparency": [ - 1.0 - ] - }, - "technique": 0 - } - ], - "textures": [ - { - "sampler": 0, - "source": 0 - } - ], - "images": [ - { - "uri": "CesiumLogoFlat.png" - } - ], - "samplers": [ - { - "magFilter": 9729, - "minFilter": 9986, - "wrapS": 10497, - "wrapT": 10497 - } - ], - "techniques": [ - { - "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": 35665 - }, - "transparency": { - "type": 5126 - } - }, - "program": 0, - "states": { - "enable": [ - 2884, - 2929 - ] - }, - "uniforms": { - "u_diffuse": "diffuse", - "u_modelViewMatrix": "modelViewMatrix", - "u_normalMatrix": "normalMatrix", - "u_projectionMatrix": "projectionMatrix", - "u_shininess": "shininess", - "u_specular": "specular", - "u_transparency": "transparency" - } - } - ], - "programs": [ - { - "attributes": [ - "a_normal", - "a_position", - "a_texcoord0" - ], - "fragmentShader": 1, - "vertexShader": 0 - } - ], - "shaders": [ - { - "type": 35633, - "uri": "BoxTextured0.vert" - }, - { - "type": 35632, - "uri": "BoxTextured1.frag" - } - ], - "bufferViews": [ - { - "buffer": 0, - "byteOffset": 768, - "byteLength": 72, - "target": 34963 - }, - { - "buffer": 0, - "byteOffset": 0, - "byteLength": 576, - "byteStride": 12, - "target": 34962 - }, - { - "buffer": 0, - "byteOffset": 576, - "byteLength": 192, - "byteStride": 8, - "target": 34962 - } - ], - "buffers": [ - { - "byteLength": 840, - "uri": "BoxTextured0.bin" - } - ], - "extensionsRequired": [ - "KHR_technique_webgl" - ], - "extensionsUsed": [ - "KHR_technique_webgl" - ] -} diff --git a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.bin b/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.bin deleted file mode 100644 index d2a7355..0000000 Binary files a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.bin and /dev/null differ diff --git a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.vert b/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.vert deleted file mode 100644 index 05d5e82..0000000 --- a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured0.vert +++ /dev/null @@ -1,17 +0,0 @@ -precision highp float; -uniform mat4 u_modelViewMatrix; -uniform mat4 u_projectionMatrix; -uniform mat3 u_normalMatrix; -attribute vec3 a_position; -varying vec3 v_position; -attribute vec3 a_normal; -varying vec3 v_normal; -attribute vec2 a_texcoord0; -varying vec2 v_texcoord0; -void main(void) { - vec4 pos = u_modelViewMatrix * vec4(a_position,1.0); - v_position = pos.xyz; - gl_Position = u_projectionMatrix * pos; - v_normal = u_normalMatrix * a_normal; - v_texcoord0 = a_texcoord0; -} diff --git a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured1.frag b/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured1.frag deleted file mode 100644 index 3850980..0000000 --- a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/BoxTextured1.frag +++ /dev/null @@ -1,29 +0,0 @@ -precision highp float; -uniform sampler2D u_diffuse; -uniform vec4 u_specular; -uniform float u_shininess; -uniform float u_transparency; -varying vec3 v_position; -varying vec3 v_normal; -varying vec2 v_texcoord0; -void main(void) { - vec3 normal = normalize(v_normal); - vec4 diffuse = texture2D(u_diffuse, v_texcoord0); - vec3 diffuseLight = vec3(0.0, 0.0, 0.0); - vec3 specular = u_specular.rgb; - vec3 specularLight = vec3(0.0, 0.0, 0.0); - vec3 ambient = diffuse.rgb; - vec3 viewDir = -normalize(v_position); - vec3 ambientLight = vec3(0.0, 0.0, 0.0); - ambientLight += vec3(0.2, 0.2, 0.2); - vec3 l = vec3(0.0, 0.0, 1.0); - diffuseLight += vec3(1.0, 1.0, 1.0) * max(dot(normal, l), 0.); - vec3 reflectDir = reflect(-l, normal); - float specularIntensity = max(0., pow(max(dot(reflectDir, viewDir), 0.), u_shininess)); - specularLight += vec3(1.0, 1.0, 1.0) * specularIntensity; - vec3 color = vec3(0.0, 0.0, 0.0); - color += diffuse.rgb * diffuseLight; - color += specular * specularLight; - color += ambient * ambientLight; - gl_FragColor = vec4(color * diffuse.a * u_transparency, diffuse.a * u_transparency); -} diff --git a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/CesiumLogoFlat.png b/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/CesiumLogoFlat.png deleted file mode 100644 index 45d502e..0000000 Binary files a/libs/assimp/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/CesiumLogoFlat.png and /dev/null differ -- cgit v1.2.1