From 789061b71f55536deefb9232033ba29c52f42918 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 20 Aug 2026 16:16:46 -0400 Subject: [PATCH] Remove old files --- .gitignore | 5 - Makefile | 7 - Rsconscript | 19 - configure | 2 - rscons | 46 - scenes/ambient_occlusion.fart | 41 - scenes/csg.fart | 228 - scenes/cyls.fart | 84 - scenes/die.fart | 152 - scenes/dw-circle.fart | 134 - scenes/dw.fart | 123 - scenes/extrudes.fart | 53 - scenes/for-test.fart | 55 - scenes/if-test.fart | 57 - scenes/infinity.fart | 54 - scenes/shape-definitions.fart | 151 - scenes/simple.fart | 27 - scenes/subtract-subtract.fart | 55 - scenes/trans-boxes.fart | 46 - src/distrib/distrib.cc | 438 -- src/distrib/distrib.h | 72 - src/main/BMP.cc | 130 - src/main/BMP.h | 54 - src/main/Light.cc | 20 - src/main/Light.h | 48 - src/main/PointLight.cc | 7 - src/main/PointLight.h | 17 - src/main/Scene-load.cc | 839 ---- src/main/Scene.cc | 406 -- src/main/Scene.h | 109 - src/main/fart.cc | 434 -- src/parser/nodes.cc | 283 -- src/parser/nodes.h | 791 ---- src/parser/parser.h | 13 - src/parser/parser.ll | 157 - src/parser/parser.yy | 511 --- src/parser/preparser.cc | 34 - src/shapes/BoolShape.cc | 9 - src/shapes/BoolShape.h | 19 - src/shapes/Box.cc | 111 - src/shapes/Box.h | 19 - src/shapes/Cyl.cc | 141 - src/shapes/Cyl.h | 25 - src/shapes/Extrude.cc | 267 -- src/shapes/Extrude.h | 43 - src/shapes/Intersect.cc | 115 - src/shapes/Intersect.h | 17 - src/shapes/Plane.cc | 57 - src/shapes/Plane.h | 20 - src/shapes/Shape.cc | 66 - src/shapes/Shape.h | 131 - src/shapes/Sphere.cc | 49 - src/shapes/Sphere.h | 20 - src/shapes/Subtract.cc | 115 - src/shapes/Subtract.h | 17 - src/shapes/Union.cc | 110 - src/shapes/Union.h | 17 - src/shapes/shapes.h | 10 - src/util/AABB.h | 21 - src/util/Color.cc | 17 - src/util/Color.h | 132 - src/util/Material.h | 72 - src/util/Matrix.cc | 241 - src/util/Matrix.h | 75 - src/util/Polygon.cc | 95 - src/util/Polygon.h | 19 - src/util/Ray.cc | 17 - src/util/Ray.h | 58 - src/util/Scope.h | 73 - src/util/Solver.cc | 127 - src/util/Solver.h | 57 - src/util/Texture.h | 16 - src/util/Transform.cc | 72 - src/util/Transform.h | 72 - src/util/Vector.cc | 29 - src/util/Vector.h | 203 - src/util/refptr.h | 115 - src/util/stb_image.cc | 5 - src/util/stb_image.h | 7988 --------------------------------- vim/syntax/fart.vim | 27 - vim/vimrc | 3 - 81 files changed, 16614 deletions(-) delete mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 Rsconscript delete mode 100755 configure delete mode 100755 rscons delete mode 100644 scenes/ambient_occlusion.fart delete mode 100644 scenes/csg.fart delete mode 100644 scenes/cyls.fart delete mode 100644 scenes/die.fart delete mode 100644 scenes/dw-circle.fart delete mode 100644 scenes/dw.fart delete mode 100644 scenes/extrudes.fart delete mode 100644 scenes/for-test.fart delete mode 100644 scenes/if-test.fart delete mode 100644 scenes/infinity.fart delete mode 100644 scenes/shape-definitions.fart delete mode 100644 scenes/simple.fart delete mode 100644 scenes/subtract-subtract.fart delete mode 100644 scenes/trans-boxes.fart delete mode 100644 src/distrib/distrib.cc delete mode 100644 src/distrib/distrib.h delete mode 100644 src/main/BMP.cc delete mode 100644 src/main/BMP.h delete mode 100644 src/main/Light.cc delete mode 100644 src/main/Light.h delete mode 100644 src/main/PointLight.cc delete mode 100644 src/main/PointLight.h delete mode 100644 src/main/Scene-load.cc delete mode 100644 src/main/Scene.cc delete mode 100644 src/main/Scene.h delete mode 100644 src/main/fart.cc delete mode 100644 src/parser/nodes.cc delete mode 100644 src/parser/nodes.h delete mode 100644 src/parser/parser.h delete mode 100644 src/parser/parser.ll delete mode 100644 src/parser/parser.yy delete mode 100644 src/parser/preparser.cc delete mode 100644 src/shapes/BoolShape.cc delete mode 100644 src/shapes/BoolShape.h delete mode 100644 src/shapes/Box.cc delete mode 100644 src/shapes/Box.h delete mode 100644 src/shapes/Cyl.cc delete mode 100644 src/shapes/Cyl.h delete mode 100644 src/shapes/Extrude.cc delete mode 100644 src/shapes/Extrude.h delete mode 100644 src/shapes/Intersect.cc delete mode 100644 src/shapes/Intersect.h delete mode 100644 src/shapes/Plane.cc delete mode 100644 src/shapes/Plane.h delete mode 100644 src/shapes/Shape.cc delete mode 100644 src/shapes/Shape.h delete mode 100644 src/shapes/Sphere.cc delete mode 100644 src/shapes/Sphere.h delete mode 100644 src/shapes/Subtract.cc delete mode 100644 src/shapes/Subtract.h delete mode 100644 src/shapes/Union.cc delete mode 100644 src/shapes/Union.h delete mode 100644 src/shapes/shapes.h delete mode 100644 src/util/AABB.h delete mode 100644 src/util/Color.cc delete mode 100644 src/util/Color.h delete mode 100644 src/util/Material.h delete mode 100644 src/util/Matrix.cc delete mode 100644 src/util/Matrix.h delete mode 100644 src/util/Polygon.cc delete mode 100644 src/util/Polygon.h delete mode 100644 src/util/Ray.cc delete mode 100644 src/util/Ray.h delete mode 100644 src/util/Scope.h delete mode 100644 src/util/Solver.cc delete mode 100644 src/util/Solver.h delete mode 100644 src/util/Texture.h delete mode 100644 src/util/Transform.cc delete mode 100644 src/util/Transform.h delete mode 100644 src/util/Vector.cc delete mode 100644 src/util/Vector.h delete mode 100644 src/util/refptr.h delete mode 100644 src/util/stb_image.cc delete mode 100644 src/util/stb_image.h delete mode 100644 vim/syntax/fart.vim delete mode 100644 vim/vimrc diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 21430e0..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -fart -*.bmp -*.png -/.rscons* -/build/ diff --git a/Makefile b/Makefile deleted file mode 100644 index 2325ff9..0000000 --- a/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: all -all: - @./rscons - -.PHONY: clean -clean: - @./rscons clean diff --git a/Rsconscript b/Rsconscript deleted file mode 100644 index 38de147..0000000 --- a/Rsconscript +++ /dev/null @@ -1,19 +0,0 @@ -configure do - check_cxx_compiler - check_program "flex" - check_program "bison" - check_lib "pthread" -end - -env do |env| - env["CCFLAGS"] += %w[-Wall -O2] - env["CPPPATH"] += glob("src/**") - - env.CFile("^/parser/lexer.cc", "src/parser/parser.ll") - env.CFile("^/parser/parser.cc", "src/parser/parser.yy") - env["CPPPATH"] += ["#{env.build_root}/parser"] - - sources = glob("src/**/*.cc") - sources += ["^/parser/lexer.cc", "^/parser/parser.cc"] - env.Program("fart", sources) -end diff --git a/configure b/configure deleted file mode 100755 index 5cd01ed..0000000 --- a/configure +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec ./rscons configure "$@" diff --git a/rscons b/rscons deleted file mode 100755 index e30cf2e..0000000 --- a/rscons +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env ruby - -# Copyright (c) 2013-2022 Josh Holtrop -# -# MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -script = File.join(File.dirname(__FILE__), ".rscons-3.1.0-4892f95d56c30bbe9aa0c9964062ec5b.rb") -unless File.exist?(script) - if File.read(__FILE__, mode: "rb") =~ /^#==>(.*)/ - require "zlib" - require "base64" - encoded_compressed = $1 - unescaped_compressed = Base64.decode64(encoded_compressed) - inflated = Zlib::Inflate.inflate(unescaped_compressed) - File.open(script, "wb") do |fh| - fh.write(inflated) - end - else - raise "Could not decompress." - end -end -load script -if __FILE__ == $0 - Rscons::Cli.new.run(ARGV) -end -#==>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 diff --git a/scenes/ambient_occlusion.fart b/scenes/ambient_occlusion.fart deleted file mode 100644 index 81c6400..0000000 --- a/scenes/ambient_occlusion.fart +++ /dev/null @@ -1,41 +0,0 @@ - -scene -{ - options - { - multisample 3 - width 800 - height 600 - ambient_occlusion 5 - } - - camera - { - position <2, -3, 2> - look_at <0, 0, 1> - up <0, 0, 1> - } - - light - { - position <200, -10, 50> - } - - define material white - { - color <1, 1, 1> - } - - sphere - { - radius 1 - material white - translate <0, 0, 1> - } - - plane - { - position <0, 0, 1>, 0 - material white - } -} diff --git a/scenes/csg.fart b/scenes/csg.fart deleted file mode 100644 index e71712e..0000000 --- a/scenes/csg.fart +++ /dev/null @@ -1,228 +0,0 @@ - -scene -{ - options - { - multisample 3 - } - - camera - { - position <3, -2.6, 2> - look_at <1.5, -1, 0> - up <0, 0, 1> - } - - light - { - position <-2, -5, 6> - } - - plane - { - position <1, -1, 1.5>, 3 - material - { - color <1, 1, 0> - } - } - - define material green - { - color <0, 1, 0> - shininess 3 - } - - subtract - { - intersect - { - box - { - size <1, 1, 1> - material - { - color <1, 0.4, 0.4> - } - } - - sphere - { - radius 0.67 - material - { - color <0, 0, 1> - shininess 3 - } - } - } - - union - { - cyl - { - size <0.35, 0.35, 1.2> - translate <0, 0, -0.6> - material green - } - - union - { - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <1, 0, 0> - translate <0, 0, -0.6> - material green - } - - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <0, 1, 0> - translate <0, 0, -0.6> - material green - } - } - } - } - - scale <0.5, 0.5, 0.5> - { - translate <0, -3, -2> - { - intersect - { - box - { - size <1, 1, 1> - material - { - color <1, 0.4, 0.4> - } - } - - sphere - { - radius 0.67 - material - { - color <0, 0, 1> - shininess 3 - } - } - } - - translate <0, -1.5, -1> - { - box - { - size <1, 1, 1> - material - { - color <1, 0.4, 0.4> - } - } - } - - translate <1.5, 0, -1> - { - sphere - { - radius 0.67 - material - { - color <0, 0, 1> - shininess 3 - } - } - } - } - - translate <3, 0, -2> - { - union - { - cyl - { - size <0.35, 0.35, 1.2> - translate <0, 0, -0.6> - material green - } - - union - { - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <1, 0, 0> - translate <0, 0, -0.6> - material green - } - - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <0, 1, 0> - translate <0, 0, -0.6> - material green - } - } - } - - translate <0, -1.5, -1> - { - cyl - { - size <0.35, 0.35, 1.2> - translate <0, 0, -0.6> - material green - } - } - - translate <1.5, 0, -1> - { - union - { - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <1, 0, 0> - translate <0, 0, -0.6> - material green - } - - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <0, 1, 0> - translate <0, 0, -0.6> - material green - } - } - - translate <0, -1.5, -1> - { - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <1, 0, 0> - translate <0, 0, -0.6> - material green - } - } - - translate <1.5, 0, -1> - { - cyl - { - size <0.35, 0.35, 1.2> - rotate 90, <0, 1, 0> - translate <0, 0, -0.6> - material green - } - } - } - } - } -} diff --git a/scenes/cyls.fart b/scenes/cyls.fart deleted file mode 100644 index 6946970..0000000 --- a/scenes/cyls.fart +++ /dev/null @@ -1,84 +0,0 @@ - -scene -{ - options - { - width 800 - height 600 - multisample 3 - } - - camera - { - position <1.0, -2, 1.2> - look_at <0, 0, 0.4> - up <0, 0, 1> - } - - light - { - position <10, 0, 10> - } - - define material cyan - { - color <0, 1, 1> - } - - plane - { - position <0, 0, 1>, 0 - material - { - color <1, 1, 0> - reflectance 0.6 - } - } - - translate <0, 0, 0.7> - { - box - { - size <0.4, 0.4, 0.4> - material - { - color <1.0, 0.6, 0> - } - } - cyl { - size <0.2, 0, 0.3> - translate <0, 0, 0.3> - material cyan - } - cyl { - size <0.2, 0, 0.3> - rotate 90, <1, 0, 0> - translate <0, 0, 0.3> - material cyan - } - cyl { - size <0.2, 0, 0.3> - rotate -90, <1, 0, 0> - translate <0, 0, 0.3> - material cyan - } - cyl { - size <0.2, 0, 0.3> - rotate 180, <1, 0, 0> - translate <0, 0, 0.3> - material cyan - } - cyl { - size <0.2, 0, 0.3> - rotate 90, <0, 1, 0> - translate <0, 0, 0.3> - material cyan - } - cyl { - size <0.2, 0, 0.3> - rotate -90, <0, 1, 0> - translate <0, 0, 0.3> - material cyan - } - } -} diff --git a/scenes/die.fart b/scenes/die.fart deleted file mode 100644 index f48d5b9..0000000 --- a/scenes/die.fart +++ /dev/null @@ -1,152 +0,0 @@ - -scene -{ - options - { - multisample 3 - exposure 1.2 - } - - camera - { - position <1.2, -2, 1> - look_at <0, 0, 0> - } - - light { position <10, -12, 8> } - - plane - { - position <0, 0, 1>, 0.501 - material - { - color <0.4, 1, 0.4> - reflectance 0.4 - } - } - plane - { - position <1, 0, 0>, 1 - material - { - color <1, 0.4, 0.4> - reflectance 0.4 - } - } - plane - { - position <0, -1, 0>, 1 - material - { - color <0.4, 0.4, 1> - reflectance 0.4 - } - } - - subtract - { - union - { - box { size <1, 0.8, 0.8> } - box { size <0.8, 1, 0.8> } - box { size <0.8, 0.8, 1> } - - cyl { size <0.1, 0.1, 0.8> translate <0.4, 0.4, -0.4> } - cyl { size <0.1, 0.1, 0.8> translate <0.4, -0.4, -0.4> } - cyl { size <0.1, 0.1, 0.8> translate <-0.4, 0.4, -0.4> } - cyl { size <0.1, 0.1, 0.8> translate <-0.4, -0.4, -0.4> } - - cyl { - size <.1, .1, .8> - translate <.4, -.4, .4> - rotate -90, <1, 0, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, -.4, -.4> - rotate -90, <1, 0, 0> - } - cyl { - size <.1, .1, .8> - translate <-.4, -.4, .4> - rotate -90, <1, 0, 0> - } - cyl { - size <.1, .1, .8> - translate <-.4, -.4, -.4> - rotate -90, <1, 0, 0> - } - - cyl { - size <.1, .1, .8> - translate <.4, -.4, .4> - rotate -90, <0, 1, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, -.4, -.4> - rotate -90, <0, 1, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, .4, .4> - rotate -90, <0, 1, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, .4, -.4> - rotate -90, <0, 1, 0> - } - - sphere { radius .1 translate <.4, .4, .4> } - sphere { radius .1 translate <.4, .4, -.4> } - sphere { radius .1 translate <.4, -.4, .4> } - sphere { radius .1 translate <.4, -.4, -.4> } - sphere { radius .1 translate <-.4, .4, .4> } - sphere { radius .1 translate <-.4, .4, -.4> } - sphere { radius .1 translate <-.4, -.4, .4> } - sphere { radius .1 translate <-.4, -.4, -.4> } - - material - { - color <1, 0.4, 1> - transparency 0.4 - } - } - - union - { - sphere { radius .1 translate <0, -.5, 0> } - - sphere { radius .1 translate <-.5, .25, -.25> } - sphere { radius .1 translate <-.5, -.25, .25> } - - sphere { radius .1 translate <0, 0, -.5> } - sphere { radius .1 translate <.25, -.25, -.5> } - sphere { radius .1 translate <-.25, .25, -.5> } - - sphere { radius .1 translate <-.25, -.25, .5> } - sphere { radius .1 translate <-.25, .25, .5> } - sphere { radius .1 translate <.25, -.25, .5> } - sphere { radius .1 translate <.25, .25, .5> } - - sphere { radius .1 translate <.5, 0, 0> } - sphere { radius .1 translate <.5, .25, .25> } - sphere { radius .1 translate <.5, .25, -.25> } - sphere { radius .1 translate <.5, -.25, .25> } - sphere { radius .1 translate <.5, -.25, -.25> } - - sphere { radius .1 translate <.25, .5, 0> } - sphere { radius .1 translate <.25, .5, -.25> } - sphere { radius .1 translate <.25, .5, .25> } - sphere { radius .1 translate <-.25, .5, 0> } - sphere { radius .1 translate <-.25, .5, -.25> } - sphere { radius .1 translate <-.25, .5, .25> } - - material - { - color <1, 1, 1> - } - } - } -} diff --git a/scenes/dw-circle.fart b/scenes/dw-circle.fart deleted file mode 100644 index 0408914..0000000 --- a/scenes/dw-circle.fart +++ /dev/null @@ -1,134 +0,0 @@ - -scene -{ - options - { - ambient <0.2, 0.2, 0.2> - } - - define material dw_blue { - color <0.000, 0.520, 0.546> - specular <0.5, 0.5, 0.5> - } - - define material dw_brown { - color <0.634, 0.628, 0.126> - specular <0.5, 0.5, 0.5> - } - - define material grey_ground { - color <0.3, 0.3, 0.3> - specular <0, 0, 0> - } - - define shape dw_logo union { - subtract { - intersect { - cyl { - size <3.055, 3.055, 0.5> - translate <-4.454, 0.074, -0.25> - } - box { - size <6.01, 5.94, 1> - translate <-1.782, 0, 0> - } - } - cyl { - size <0.738, 0.738, 2> - translate <-3.645, 0.041, -1> - } - box { - size <1.96, 0.456, 2> - translate <-2.212, 0.048, 0> - } - material dw_blue - } - cyl { - size <0.307, 0.307, 0.5> - translate <-3.645, 0.041, -0.25> - material dw_brown - } - subtract { - extrude { - offset 0.5 - polygon { - <4.787, -2.971> - <4.787, 1.565> - <4.196, 1.565> - <2.756, -2.375> - <1.367, 1.052> - <0.007, -2.40192> - <-0.891, -0.174> - <-3, -0.174> - <-3, -2.971> - } - translate <0, 0, -0.25> - } - cyl { - size <3.488, 3.488, 2> - translate <-4.454, 0.074, -1> - } - material dw_blue - } - subtract { - extrude { - offset 0.5 - polygon { - <4.787, 2.025> - <4.787, 2.971> - <-3, 2.971> - <-3, 0.283> - <-0.588, 0.283> - <0.000, -1.179> - <1.368, 2.273> - <2.728, -1.083> - <3.877, 2.025> - } - translate <0, 0, -0.25> - } - cyl { - size <3.488, 3.488, 2> - translate <-4.454, 0.074, -1> - } - material dw_brown - } - scale 0.104 - } - - camera - { - position <0, 0, 10> - look_at <0, 0, 0> - up <0, 1, 0> - } - - light - { - position <100, -100, 100> - } - - plane - { - position <0, 0, 1>, 0 - material grey_ground - } - - for (local $i = 0; $i < 4; $i = $i + 1) - { - local $n_logos = 2 ^ ($i + 2) - for (local $j = 0; $j < $n_logos; $j = $j + 1) - { - shape dw_logo - { - rotate $j * 360 / $n_logos, <0, 0, 1> - translate <1.5 * ($i + 1), 0, 0.4 - 0.1 * $i> - if ($i > 0 && ($j + $i) % 2 == 1) - { - rotate 90, <0, 0, 1> - } - rotate -90, <0, 0, 1> - } - } - } - shape dw_logo { translate <0, 0, 0.5> } -} diff --git a/scenes/dw.fart b/scenes/dw.fart deleted file mode 100644 index 06d9206..0000000 --- a/scenes/dw.fart +++ /dev/null @@ -1,123 +0,0 @@ - -scene { - - define material dw_blue { - color <0.000, 0.520, 0.546> - specular <0.5, 0.5, 0.5> - } - - define material dw_brown { - color <0.634, 0.628, 0.126> - specular <0.5, 0.5, 0.5> - } - - define material grey_ground { - color <0.3, 0.3, 0.3> - shininess 30 - } - - define shape dw_logo union { - subtract { - intersect { - cyl { - size <3.055, 3.055, 0.5> - translate <-4.454, 0.074, -0.25> - } - box { - size <6.01, 5.94, 1> - translate <-1.782, 0, 0> - } - } - cyl { - size <0.738, 0.738, 2> - translate <-3.645, 0.041, -1> - } - box { - size <1.96, 0.456, 2> - translate <-2.212, 0.048, 0> - } - material dw_blue - } - cyl { - size <0.307, 0.307, 0.5> - translate <-3.645, 0.041, -0.25> - material dw_brown - } - subtract { - extrude { - offset 0.5 - polygon { - <4.787, -2.971> - <4.787, 1.565> - <4.196, 1.565> - <2.756, -2.375> - <1.367, 1.052> - <0.007, -2.40192> - <-0.891, -0.174> - <-3, -0.174> - <-3, -2.971> - } - translate <0, 0, -0.25> - } - cyl { - size <3.488, 3.488, 2> - translate <-4.454, 0.074, -1> - } - material dw_blue - } - subtract { - extrude { - offset 0.5 - polygon { - <4.787, 2.025> - <4.787, 2.971> - <-3, 2.971> - <-3, 0.283> - <-0.588, 0.283> - <0.000, -1.179> - <1.368, 2.273> - <2.728, -1.083> - <3.877, 2.025> - } - translate <0, 0, -0.25> - } - cyl { - size <3.488, 3.488, 2> - translate <-4.454, 0.074, -1> - } - material dw_brown - } - scale 0.104 - } - - shape dw_logo { - translate <0, 0.387, 0.309> - rotate 90, <1, 0, 0> - } - subtract { - plane { - position <0, 0, 1>, 0 - } - shape dw_logo { - translate <0, 0, -0.025> - } - material grey_ground - } - - camera { - position <-0.2, -0.8, 0.4> - look_at <-0.1, 0, 0.2> - up <0, 0, 1> - } - - light { - position <10, -12, 5> - radius 0.2 - jitter 3 - } - - options { - ambient_occlusion 5 - multisample 3 - } -} diff --git a/scenes/extrudes.fart b/scenes/extrudes.fart deleted file mode 100644 index 45f9e59..0000000 --- a/scenes/extrudes.fart +++ /dev/null @@ -1,53 +0,0 @@ - -scene -{ - options - { - ambient_occlusion 2 - multisample 2 - exposure 1.2 - } - - camera - { - position <0, -10, 10> - look_at <0, 0, 2> - } - - light { position <10, -12, 8> } - - plane - { - position <0, 0, 1>, 0 - material - { - color <0, 0.5, 0.1> - } - } - - subtract - { - extrude { ngon 5, 6 offset 2 } - extrude { ngon 5, 5 offset 3 translate <0, 0, -0.5> } - material { color <1, 0.7, 0> } - } - - union - { - extrude - { - ngon 6, 2 - offset 3 { scale 0.5 position <4, 0> } - offset 3 - offset 1 { scale 0 } - } - extrude - { - ngon 6, 2 - offset 3 { scale 0.5 position <-4, 0> } - offset 3 - offset 1 { scale 0 } - } - material { color <0, 0.9, 0.9> } - } -} diff --git a/scenes/for-test.fart b/scenes/for-test.fart deleted file mode 100644 index 8a28a01..0000000 --- a/scenes/for-test.fart +++ /dev/null @@ -1,55 +0,0 @@ - -scene -{ - camera - { - position <0, -40, 50> - look_at <0, 100, 0> - } - - light - { - position <100, -100, 50> - } - - define material mat - { - color <0, 0.8, 1> - } - - define material glass - { - transparency 1 - refraction 1.5 - } - - plane - { - position <0, 0, 1>, 0 - material - { - color <0, 0.7, 0> - } - } - - for (local $x = -200; $x <= 200; $x = $x + 40) - { - for (local $y = 0; $y <= 4000; $y = $y + 40) - { - sphere - { - radius 10 - translate <$x, $y, 10> - if ($x == 0 && $y == 0) - { - material glass - translate <0, 0, 20> - } - else - { - material mat - } - } - } - } -} diff --git a/scenes/if-test.fart b/scenes/if-test.fart deleted file mode 100644 index 27ac040..0000000 --- a/scenes/if-test.fart +++ /dev/null @@ -1,57 +0,0 @@ - -scene -{ - camera - { - position <0, -120, 80> - look_at <0, -40, 5> - } - - light - { - position <100, -100, 100> - } - - define material mat { color <0, 0.8, 1> } - define material mat2 { color <1, 0.7, 0> } - define material mat3 { transparency 0.5 reflectance 0.7 } - - plane - { - position <0, 0, 1>, 0 - material - { - color <0, 0.7, 0> - } - } - - local $m = 0 - for (local $x = -100; $x <= 100; $x = $x + 40) - { - for (local $y = -100; $y <= 100; $y = $y + 40) - { - sphere - { - radius 10 - translate <$x, $y, 10> - if ($m % 3 == 0) - { - material mat - } - elsif ($m % 3 == 1) - { - material mat2 - } - else - { - material - { - color <1, 0, 0> - transparency abs($x / 120) - } - } - } - $m = $m + 1 - } - } -} diff --git a/scenes/infinity.fart b/scenes/infinity.fart deleted file mode 100644 index d6c398c..0000000 --- a/scenes/infinity.fart +++ /dev/null @@ -1,54 +0,0 @@ - -scene -{ - options - { - multisample 4 - width 1024 - height 768 - max_depth 15 - } - - camera - { - position <0.00001, -1.9, -0.000001> - look_at <0, 0, 0> - up <0, 0, 1> - } - - define material mirror - { - color <0, 0, 0> - specular <0, 0, 0> - reflectance 1.0 - } - - plane { position <1, 0, 0>, 2 material mirror } - plane { position <-1, 0, 0>, 2 material mirror } - plane { position <0, 1, 0>, 2 material mirror } - plane { position <0, -1, 0>, 2 material mirror } - plane { position <0, 0, 1>, 2 material mirror } - plane { position <0, 0, -1>, 2 material mirror } - - sphere - { - radius 0.5 - material - { - reflectance 0.2 - ambient <0.5, 0.5, 0.5> - diffuse <0.5, 0.5, 0.5> - shininess 80 - } - } - - light - { - position <1, -1, 1> - } - - light - { - position <-1, 1, -1> - } -} diff --git a/scenes/shape-definitions.fart b/scenes/shape-definitions.fart deleted file mode 100644 index 0cd0c1a..0000000 --- a/scenes/shape-definitions.fart +++ /dev/null @@ -1,151 +0,0 @@ -scene -{ - options - { - ambient_occlusion 3 - multisample 3 - exposure 1.2 - } - - camera - { - position <5, -13, 9> - look_at <0, 0, 2> - } - - light { position <10, -12, 8> radius 0.2 jitter 4 } - - plane - { - position <0, 0, 1>, 0 - material - { - color <0, 0.5, 0.1> - } - } - - # define a reusable Die type - define shape Die subtract - { - union - { - box { size <1, 0.8, 0.8> } - box { size <0.8, 1, 0.8> } - box { size <0.8, 0.8, 1> } - - cyl { size <0.1, 0.1, 0.8> translate <0.4, 0.4, -0.4> } - cyl { size <0.1, 0.1, 0.8> translate <0.4, -0.4, -0.4> } - cyl { size <0.1, 0.1, 0.8> translate <-0.4, 0.4, -0.4> } - cyl { size <0.1, 0.1, 0.8> translate <-0.4, -0.4, -0.4> } - - cyl { - size <.1, .1, .8> - translate <.4, -.4, .4> - rotate -90, <1, 0, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, -.4, -.4> - rotate -90, <1, 0, 0> - } - cyl { - size <.1, .1, .8> - translate <-.4, -.4, .4> - rotate -90, <1, 0, 0> - } - cyl { - size <.1, .1, .8> - translate <-.4, -.4, -.4> - rotate -90, <1, 0, 0> - } - - cyl { - size <.1, .1, .8> - translate <.4, -.4, .4> - rotate -90, <0, 1, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, -.4, -.4> - rotate -90, <0, 1, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, .4, .4> - rotate -90, <0, 1, 0> - } - cyl { - size <.1, .1, .8> - translate <.4, .4, -.4> - rotate -90, <0, 1, 0> - } - - define shape Corner sphere { radius 0.1 } - translate <.4, .4, .4> { shape Corner } - translate <.4, .4, -.4> { shape Corner } - translate <.4, -.4, .4> { shape Corner } - translate <.4, -.4, -.4> { shape Corner } - translate <-.4, .4, .4> { shape Corner } - translate <-.4, .4, -.4> { shape Corner } - translate <-.4, -.4, .4> { shape Corner } - translate <-.4, -.4, -.4> { shape Corner } - - material - { - color <1, 0.4, 1> - transparency 0.4 - } - } - - union - { - define shape Pip sphere { radius 0.1 } - - translate <0, -.5, 0> { shape Pip } - - translate <-.5, .25, -.25> { shape Pip } - translate <-.5, -.25, .25> { shape Pip } - - translate <0, 0, -.5> { shape Pip } - translate <.25, -.25, -.5> { shape Pip } - translate <-.25, .25, -.5> { shape Pip } - - translate <-.25, -.25, .5> { shape Pip } - translate <-.25, .25, .5> { shape Pip } - translate <.25, -.25, .5> { shape Pip } - translate <.25, .25, .5> { shape Pip } - - translate <.5, 0, 0> { shape Pip } - translate <.5, .25, .25> { shape Pip } - translate <.5, .25, -.25> { shape Pip } - translate <.5, -.25, .25> { shape Pip } - translate <.5, -.25, -.25> { shape Pip } - - translate <.25, .5, 0> { shape Pip } - translate <.25, .5, -.25> { shape Pip } - translate <.25, .5, .25> { shape Pip } - translate <-.25, .5, 0> { shape Pip } - translate <-.25, .5, -.25> { shape Pip } - translate <-.25, .5, .25> { shape Pip } - - material - { - color <1, 1, 1> - } - } - } - - # Define an individual stack of dies - define shape DieStack union - { - translate <0, 0, 1.5> { scale 3 { shape Die } } - translate <0, 0, 4> { rotate 45, <0, 0, 1> { scale 2 { shape Die } } } - translate <0, 0, 5.5> { rotate 90, <0, 1, 0> { shape Die } } - } - - # Instantiate various DieStack objects - translate <-5, 0, 0> { shape DieStack } - translate <5, 0, 0> { rotate 90, <0, 0, 1> { shape DieStack } } - translate <0, 5, 0> { rotate 180, <0, 0, 1> { shape DieStack } } - translate <0, -5, 0> { rotate 270, <0, 0, 1> { shape DieStack } } -} diff --git a/scenes/simple.fart b/scenes/simple.fart deleted file mode 100644 index a1e918d..0000000 --- a/scenes/simple.fart +++ /dev/null @@ -1,27 +0,0 @@ -scene { - options { - width 400 - height 300 - } - camera { - position <5, -5, 4> - look_at <0, 0, 1> - } - light { - position <10, -10, 50> - } - plane { - position <0, 0, 1>, 0 - material { - color <0, 1, 0.2> - reflectance 0.4 - } - } - sphere { - radius 1 - translate <0, 0, 1> - material { - color <1, 1, 0> - } - } -} diff --git a/scenes/subtract-subtract.fart b/scenes/subtract-subtract.fart deleted file mode 100644 index 60b7b44..0000000 --- a/scenes/subtract-subtract.fart +++ /dev/null @@ -1,55 +0,0 @@ - -scene -{ - options - { - multisample 3 - ambient <0.2, 0.2, 0.2> - } - - camera - { - position <1, -2, 1> - look_at <0, 0, 0> - } - - light - { - position <-5, -15, 20> - jitter 5 - } - - plane - { - position <0, 0, 1>, 1 - material - { - color <0, 1, 1> - } - } - - subtract - { - box - { - size <1, 1, 1> - material { color <0.2, 0.2, 1> } - } - - subtract - { - sphere - { - radius 0.4 - material { color <1, 0, 0> } - translate <0, -0.5, 0> - } - box - { - size <1, 1, 0.2> - material { color <0, 1, 0> } - translate <0, -0.5, 0> - } - } - } -} diff --git a/scenes/trans-boxes.fart b/scenes/trans-boxes.fart deleted file mode 100644 index 100dbc3..0000000 --- a/scenes/trans-boxes.fart +++ /dev/null @@ -1,46 +0,0 @@ - -scene -{ - options - { - width 800 - height 600 - multisample 3 - } - - camera - { - position <2, -2.5, 3> - look_at <-0.5, 0, 0> - up <0, 0, 1> - } - - light { position <5, 0, 5> } - - plane - { - position <0, 0, 1>, 0 - material { color <0.8, 0.8, 0.8> } - } - - box - { - size <1, 1, 1> - translate <0, -1.5, 0.6> - material { color <0, 0, 1> transparency 0.8 } - } - - box - { - size <1, 1, 1> - translate <0, 0, 0.6> - material { color <0, 0, 1> transparency 0.4 } - } - - box - { - size <1, 1, 1> - translate <0, 1.5, 0.6> - material { color <0, 0, 1> transparency 0.1 } - } -} diff --git a/src/distrib/distrib.cc b/src/distrib/distrib.cc deleted file mode 100644 index 5908b13..0000000 --- a/src/distrib/distrib.cc +++ /dev/null @@ -1,438 +0,0 @@ - -#include "distrib.h" -#include -#include -#include -#include -#include -#include -#include /* gethostbyname() */ -#include /* memset() */ -#include /* fcntl(), F_GETFD, F_SETFD, FD_CLOEXEC */ -#include -#include -#include -#include /* TCP_NODELAY */ -using namespace std; - -#define MSG_WANT_DATA 1 -#define MSG_SEND_DATA 2 - -distrib::distrib() -{ - pthread_cond_init(&m_listen_cond, NULL); - pthread_cond_init(&m_tasks_complete_cond, NULL); - pthread_mutex_init(&m_listen_mutex, NULL); - pthread_mutex_init(&m_task_mutex, NULL); - pthread_mutex_init(&m_tasks_in_progress_mutex, NULL); - pthread_mutex_init(&m_tasks_complete_mutex, NULL); - m_num_clients = 0; - m_data = NULL; - m_server = true; - m_next_task = 0; - m_client_socket = -1; - m_tasks_complete = 0; -} - -distrib::~distrib() -{ - if (m_client_socket != -1) - close(m_client_socket); -} - -int distrib::readHostFile(const char * filename) -{ - ifstream ifs(filename); - - if ( ! ifs.is_open() ) - return 1; - - string host; - while ( ! ifs.eof() ) - { - ifs >> host; - if ( ifs.eof() ) - break; - m_hosts.push_back(host); - } - - ifs.close(); - return 0; -} - -int distrib::startClients(const std::vector & client_options) -{ - int ret = 0; - for (int i = 0, sz = m_hosts.size(); i < sz; i++) - { - ret += clientConnect(m_hosts[i], client_options); - } - return ret; -} - -int distrib::clientConnect(const string & host, - const std::vector & client_options) -{ - int id = fork(); - if (id < 0) /* check for fork() error */ - { - cerr << "Error forking: " << id << endl; - return 1; - } - else if (id > 0) /* in the parent */ - { - m_children.push_back(id); - m_num_clients++; - } - else /* in the child */ - { - char server_port_str[15]; - sprintf(server_port_str, "%d", m_serverport); - vector args; - args.push_back("ssh"); - args.push_back(host); - args.push_back("fart"); - args.push_back("--host"); - args.push_back(m_servername); - args.push_back("--port"); - args.push_back(server_port_str); - for (int i = 0, sz = client_options.size(); i < sz; i++) - args.push_back(client_options[i]); - const char * char_star_args[args.size() + 1]; - for (int i = 0, sz = args.size(); i < sz; i++) - char_star_args[i] = args[i].c_str(); - char_star_args[args.size()] = (char *) NULL; - -#if 0 - /* debug */ - cout << "executing: 'ssh', "; - for (int i = 0, sz = args.size(); i < sz; i++) - cout << "'" << char_star_args[i] << "', "; - cout << endl; -#endif - - execvp("ssh", (char * const *) char_star_args); - - /* we should not get here */ - cerr << "Error " << errno << " with execlp()!" << endl; - exit(33); - } - - return 0; -} - -void connection_thread(distrib::connection_thread_arg_t * arg) -{ - distrib * the_distrib = arg->the_distrib; - int client_socket = arg->client_socket; - delete arg; - - int flag = 1; - if (setsockopt(client_socket, - IPPROTO_TCP, - TCP_NODELAY, - (char *) &flag, - sizeof(flag)) < 0) - { - cerr << "Failed to set TCP_NODELAY on client socket in connection thread!" << endl; - } - - bool done = false; - /* loop listening for messages from the client */ - while (!done) - { - int msg_type; - size_t nread = read(client_socket, &msg_type, sizeof(msg_type)); - if (nread == sizeof(msg_type)) - { - switch (msg_type) - { - case MSG_WANT_DATA: - { - int task = the_distrib->getTask(); - if (write(client_socket, &task, sizeof(task)) < 0) - done = true; - } - break; - case MSG_SEND_DATA: - { - unsigned char data[3 * UNIT_TASK_SIZE]; - int task; - if (read(client_socket, &task, sizeof(task)) < 0) - done = true; - else if (read(client_socket, &data[0], sizeof(data)) < 0) - done = true; - else - the_distrib->send_data(task, &data[0], sizeof(data)); - } - break; - default: - break; - } - } - else if (nread > 0 && nread < sizeof(msg_type)) - { - cerr << "Error: nread = " << nread << "!" << endl; - } - else if (nread < 0) - { - break; - } - } - close(client_socket); - cerr << "Closing connection thread!" << endl; - pthread_exit(NULL); -} - -void distrib_server(distrib * the_distrib) -{ - char hostname[1000]; - gethostname(&hostname[0], 1000); - the_distrib->m_servername = hostname; - - int listen_socket = socket(PF_INET, SOCK_STREAM, 0); - if ( listen_socket == -1 ) - { - cerr << "Error " << errno << " creating listen socket!" << endl; - exit(39); - } - - int flags = fcntl(listen_socket, F_GETFD); - flags |= FD_CLOEXEC; - fcntl(listen_socket, F_SETFD, flags); - - if ( listen(listen_socket, 5) == -1 ) - { - cerr << "Error " << errno << " when trying to listen!" << endl; - exit(40); - } - - struct sockaddr_in addr; - int addr_len = sizeof(struct sockaddr_in); - getsockname(listen_socket, - (struct sockaddr *) &addr, - (socklen_t *) &addr_len); - - int ip_addr = ntohl(addr.sin_addr.s_addr); - the_distrib->m_serverport = ntohs(addr.sin_port); - cout << "Listening on " - << (unsigned int) ((ip_addr >> 24) & 0xFF) - << '.' - << (unsigned int) ((ip_addr >> 16) & 0xFF) - << '.' - << (unsigned int) ((ip_addr >> 8) & 0xFF) - << '.' - << (unsigned int) (ip_addr & 0xFF) - << ':' - << the_distrib->m_serverport - << endl; - - /* signal readiness of the listen thread */ - pthread_mutex_lock(&the_distrib->m_listen_mutex); - pthread_cond_signal(&the_distrib->m_listen_cond); - pthread_mutex_unlock(&the_distrib->m_listen_mutex); - - for (;;) - { - struct sockaddr_in client_addr; - socklen_t client_addr_len = sizeof(client_addr); - int client_socket = accept(listen_socket, - (struct sockaddr *) &client_addr, - &client_addr_len); - - if (client_socket < 0) - break; - -#if 0 - int cip = ntohl(client_addr.sin_addr.s_addr); - cout << "Connection from " - << (unsigned int) ((cip >> 24) & 0xFF) - << '.' - << (unsigned int) ((cip >> 16) & 0xFF) - << '.' - << (unsigned int) ((cip >> 8) & 0xFF) - << '.' - << (unsigned int) (cip & 0xFF) - << ':' - << client_addr.sin_port - << endl; -#endif - - distrib::connection_thread_arg_t * arg = - new distrib::connection_thread_arg_t; - arg->the_distrib = the_distrib; - arg->client_socket = client_socket; - - pthread_t client_thread; - pthread_create(&client_thread, - NULL, - (void * (*)(void *)) &connection_thread, - arg); - } - - cout << "Listen thread exiting!" << endl; -} - -int distrib::startServer() -{ - m_server = true; - - pthread_mutex_lock(&m_listen_mutex); - - /* start the listen thread */ - int ret = pthread_create(&m_server_thread, - NULL, - (void * (*)(void *)) distrib_server, - this); - if (ret) - return ret; - - /* wait for the listen thread to be running */ - pthread_cond_wait(&m_listen_cond, &m_listen_mutex); - pthread_mutex_unlock(&m_listen_mutex); - - return ret; -} - -int distrib::startClient(const char * server, int port) -{ - m_server = false; - - m_client_socket = socket(PF_INET, SOCK_STREAM, 0); - if (m_client_socket < 0) - { - cerr << "Error creating client socket: " << errno << endl; - return 1; - } - int flag = 1; - if (setsockopt(m_client_socket, - IPPROTO_TCP, - TCP_NODELAY, - (char *) &flag, - sizeof(flag)) < 0) - { - cerr << "Failed to set TCP_NODELAY on client socket!" << endl; - return 2; - } - - struct addrinfo hint; - memset(&hint, 0, sizeof(hint)); - hint.ai_family = AF_INET; - hint.ai_socktype = SOCK_STREAM; - - struct addrinfo * res; - char portstr[15]; - sprintf(portstr, "%d", port); - getaddrinfo(server, portstr, &hint, &res); - - if (connect(m_client_socket, res->ai_addr, res->ai_addrlen) == -1) - { - cerr << "Error connecting from client socket: " << errno << endl; - return 2; - } - - return 0; -} - -int distrib::send_data(int task, unsigned char * data, int num_bytes) -{ - if (m_server) - { - if (m_data != NULL) - { - int num_to_copy = num_bytes; - if (3 * task * UNIT_TASK_SIZE + num_to_copy > m_data_size) - num_to_copy = m_data_size - 3 * task * UNIT_TASK_SIZE; - if (num_to_copy > 0) - { - memcpy(m_data + 3 * task * UNIT_TASK_SIZE, data, num_to_copy); - } - taskDone(task); - } - } - else - { - int msg_header = MSG_SEND_DATA; /* send data */ - if ( write(m_client_socket, &msg_header, sizeof(msg_header)) < 0 - || write(m_client_socket, &task, sizeof(task)) < 0 - || write(m_client_socket, data, num_bytes) < 0) - { - return -1; - } - } - return 0; -} - -int distrib::getTask() -{ - int task = -1; - if (m_server) - { - pthread_mutex_lock(&m_task_mutex); - if (m_next_task < m_num_tasks) - { - task = m_next_task; - m_next_task++; - } - pthread_mutex_unlock(&m_task_mutex); - if (task > -1) - startTask(task); - else - { - pthread_mutex_lock(&m_tasks_in_progress_mutex); - std::map::const_iterator it = m_tasks_in_progress.begin(); - if (it != m_tasks_in_progress.end()) - { - task = it->first; - } - pthread_mutex_unlock(&m_tasks_in_progress_mutex); - } - } - else - { - int msg_header = MSG_WANT_DATA; - if (write(m_client_socket, &msg_header, sizeof(msg_header)) < 0) - return -1; - - /* wait for a message back */ - if (read(m_client_socket, &task, sizeof(task)) < 0) - return -1; - } - return task; -} - -void distrib::startTask(int task) -{ - pthread_mutex_lock(&m_tasks_in_progress_mutex); - m_tasks_in_progress[task] = 1; - pthread_mutex_unlock(&m_tasks_in_progress_mutex); -} - -void distrib::taskDone(int task) -{ - pthread_mutex_lock(&m_tasks_in_progress_mutex); - m_tasks_in_progress.erase(task); - m_tasks_complete++; - if (m_tasks_complete == m_num_tasks) - { - pthread_mutex_lock(&m_tasks_complete_mutex); - pthread_cond_signal(&m_tasks_complete_cond); - pthread_mutex_unlock(&m_tasks_complete_mutex); - } - pthread_mutex_unlock(&m_tasks_in_progress_mutex); -} - -void distrib::waitAllTasks() -{ - int done; - pthread_mutex_lock(&m_tasks_in_progress_mutex); - done = m_tasks_complete; - if (done < m_num_tasks) - pthread_mutex_lock(&m_tasks_complete_mutex); - pthread_mutex_unlock(&m_tasks_in_progress_mutex); - if (done < m_num_tasks) - { - pthread_cond_wait(&m_tasks_complete_cond, &m_tasks_complete_mutex); - pthread_mutex_unlock(&m_tasks_complete_mutex); - } -} diff --git a/src/distrib/distrib.h b/src/distrib/distrib.h deleted file mode 100644 index 16fdd14..0000000 --- a/src/distrib/distrib.h +++ /dev/null @@ -1,72 +0,0 @@ - -#ifndef DISTRIB_H -#define DISTRIB_H DISTRIB_H - -#include -#include -#include -#include - -#define UNIT_TASK_SIZE 100 - -class distrib -{ - public: - distrib(); - ~distrib(); - int readHostFile(const char * filename); - int startServer(); - int startClient(const char * server, int port); - int startClients(const std::vector & client_options); - int getNumClients() { return m_num_clients; } - void set_data(unsigned char * data, int size) - { - m_data = data; - m_data_size = size; - } - void set_num_tasks(int num_tasks) { m_num_tasks = num_tasks; } - int getTask(); - int send_data(int task, unsigned char * data, int num_bytes); - int getNumTasksInProgress() { return m_tasks_in_progress.size(); } - void waitAllTasks(); - std::string & getServerName() { return m_servername; } - int getServerPort() { return m_serverport; } - - typedef struct - { - distrib * the_distrib; - int client_socket; - } connection_thread_arg_t; - - friend void distrib_server(distrib * the_distrib); - friend void connection_thread(connection_thread_arg_t * arg); - - protected: - int clientConnect(const std::string & host, - const std::vector & client_options); - void startTask(int task); - void taskDone(int task); - - std::vector m_hosts; - std::vector m_children; - std::string m_servername; - int m_serverport; - int m_client_socket; - pthread_t m_server_thread; - pthread_cond_t m_listen_cond; - pthread_mutex_t m_listen_mutex; - int m_num_clients; - unsigned char * m_data; - int m_data_size; - int m_num_tasks; - int m_tasks_complete; - int m_next_task; - bool m_server; - pthread_mutex_t m_task_mutex; - std::map m_tasks_in_progress; - pthread_mutex_t m_tasks_in_progress_mutex; - pthread_mutex_t m_tasks_complete_mutex; - pthread_cond_t m_tasks_complete_cond; -}; - -#endif diff --git a/src/main/BMP.cc b/src/main/BMP.cc deleted file mode 100644 index c758950..0000000 --- a/src/main/BMP.cc +++ /dev/null @@ -1,130 +0,0 @@ -// BMP.cc -// extracts/inserts data from/into .bmp file -// Adapted by Josh Holtrop from the original access_bmp.c by gw -// Supports reading and creating 24-bit color BMP images - -#include "BMP.h" -#include -#include -using namespace std; - -BMP::BMP(const char * fileName) -{ - open(fileName); -} - -BMP::BMP(const char * fileName, int width, int height, unsigned char * data) -{ - create(fileName, width, height, data); -} - -BMP::~BMP() -{ - if (m_fp != NULL) - close(); -} - -bool BMP::open(const char * fileName) -{ - size_t bytes_read; - m_fp = fopen(fileName, "r+"); - if (m_fp != NULL) - { - // read file header - bytes_read = fread(&m_header, sizeof(m_header), 1, m_fp); - if (m_header.id[0] != 'B' || m_header.id[1] != 'M') - { - cerr << fileName << " does not appear to be a BMP file." << endl; - fclose(m_fp); - m_fp = NULL; - } - // read image information - bytes_read = fread(&m_info, sizeof(m_info), 1, m_fp); - } - (void)bytes_read; - return (m_fp != NULL); -} - -bool BMP::create(const char * fileName, int width, int height, - unsigned char * data) -{ - size_t bytes_written; - m_fp = fopen(fileName, "w+"); - if (m_fp != NULL) - { - /* Initialize the header structure */ - m_header.id[0] = 'B'; - m_header.id[1] = 'M'; - int row_padding = (3 * width) & 0x3; - if (row_padding) - row_padding = 4 - row_padding; - int row_bytes = (3 * width) + row_padding; - m_header.file_size = sizeof(m_header) + - sizeof(m_info) + - row_bytes * height; - m_header.reserved = 0; - m_header.offset = sizeof(m_header) + sizeof(m_info); - - /* Initialize the information structure */ - m_info.header_size = 40; - m_info.width = width; - m_info.height = height; - m_info.color_planes = 1; - m_info.color_depth = 24; - m_info.compression = 0; - m_info.image_size = 0; - m_info.xresolution = 2835; - m_info.yresolution = 2835; - m_info.num_colors = 0; - m_info.num_important_colors = 0; - - /* write them to the file */ - bytes_written = fwrite(&m_header, sizeof(m_header), 1, m_fp); - bytes_written = fwrite(&m_info, sizeof(m_info), 1, m_fp); - - unsigned int zero = 0; - unsigned char * data_ptr = data + (3 * width) * (height - 1); - for (int i = 0; i < height; i++) - { - bytes_written = fwrite(data_ptr, 3 * width, 1, m_fp); - if (row_padding) - bytes_written = fwrite(&zero, row_padding, 1, m_fp); - data_ptr -= 3 * width; - } - } - (void)bytes_written; - return (m_fp != NULL); -} - -void BMP::read(unsigned char * buf) -{ - size_t bytes_read; - if (m_fp != NULL) - { - int row_data_bytes = 3 * m_info.width; - int row_padding = row_data_bytes & 0x3; - if (row_padding) - row_padding = 4 - row_padding; - fseek(m_fp, - (m_header.offset != 0 - ? m_header.offset - : sizeof(m_header) + sizeof(m_info)), - SEEK_SET); - unsigned char * data_ptr = buf + row_data_bytes * (m_info.height - 1); - for (int i = 0; i < m_info.height; i++) - { - bytes_read = fread(data_ptr, row_data_bytes, 1, m_fp); - if (row_padding) - fseek(m_fp, row_padding, SEEK_CUR); - data_ptr -= row_data_bytes; - } - } - (void)bytes_read; -} - -void BMP::close() -{ - if (m_fp != NULL) - fclose(m_fp); - m_fp = NULL; -} diff --git a/src/main/BMP.h b/src/main/BMP.h deleted file mode 100644 index 4926de4..0000000 --- a/src/main/BMP.h +++ /dev/null @@ -1,54 +0,0 @@ -// BMP.h -// extracts/inserts data from/into .bmp file -// Adapted by Josh Holtrop from the original access_bmp.c by gw -// Supports reading and creating 24-bit color BMP images - -#include - -#define BMP_RED 2 -#define BMP_GREEN 1 -#define BMP_BLUE 0 - -class BMP -{ -public: - typedef struct - { - char id[2]; - int file_size; - int reserved; - int offset; - } __attribute__ ((packed)) header_t; - - typedef struct - { - int header_size; - int width; - int height; - unsigned short int color_planes; - unsigned short int color_depth; - unsigned int compression; - int image_size; - int xresolution; - int yresolution; - int num_colors; - int num_important_colors; - } __attribute__ ((packed)) info_t; - - BMP(const char * fileName); - BMP(const char * fileName, int width, int height, unsigned char * data); - ~BMP(); - void read(unsigned char * buf); - int getWidth() { return m_info.width; } - int getHeight() { return m_info.height; } - -protected: - FILE * m_fp; - header_t m_header; - info_t m_info; - - bool open(const char * fileName); - bool create(const char * fileName, int width, int height, - unsigned char * data); - void close(); -}; diff --git a/src/main/Light.cc b/src/main/Light.cc deleted file mode 100644 index bccaae2..0000000 --- a/src/main/Light.cc +++ /dev/null @@ -1,20 +0,0 @@ - -#include "Light.h" -#include "util/Vector.h" -#include "util/Ray.h" - -Light::Light() -{ - m_position = Vector(0, 0, 0); - m_diffuse_color = Color::white; - m_specular_color = Color::white; - m_jitter = 1; - m_radius = 1.0; -} - -Vector Light::getJitterPosition(int index) const -{ - if (index == 0) - return m_position; - return m_position + Vector::randomVector() * m_radius; -} diff --git a/src/main/Light.h b/src/main/Light.h deleted file mode 100644 index 9ee4299..0000000 --- a/src/main/Light.h +++ /dev/null @@ -1,48 +0,0 @@ - -#ifndef LIGHT_H -#define LIGHT_H LIGHT_H - -#include "util/Vector.h" -#include "util/Color.h" - -class Light -{ - public: - Light(); - - void setPosition(const Vector & position) { m_position = position; } - void setPosition(refptr vec) { setPosition(*vec); } - const Vector & getPosition() const { return m_position; } - - Vector getJitterPosition(int index) const; - - void setDiffuseColor(const Color & diffuse) - { - m_diffuse_color = diffuse; - } - const Color & getDiffuseColor() const { return m_diffuse_color; } - - void setSpecularColor(const Color & specular) - { - m_specular_color = specular; - } - const Color & getSpecularColor() const { return m_specular_color; } - - void setJitter(int j) { m_jitter = j >= 1 ? j : 1; } - int getJitter() const { return m_jitter; } - - void setRadius(double r) { m_radius = r; } - double getRadius() const { return m_radius; } - - protected: - Vector m_position; - Color m_diffuse_color; - Color m_specular_color; - double m_radius; - int m_jitter; -}; - -#include "PointLight.h" - -#endif - diff --git a/src/main/PointLight.cc b/src/main/PointLight.cc deleted file mode 100644 index 5b8d06b..0000000 --- a/src/main/PointLight.cc +++ /dev/null @@ -1,7 +0,0 @@ - -#include "PointLight.h" - -PointLight::PointLight() - : Light() -{ -} diff --git a/src/main/PointLight.h b/src/main/PointLight.h deleted file mode 100644 index 69bbed5..0000000 --- a/src/main/PointLight.h +++ /dev/null @@ -1,17 +0,0 @@ - -#ifndef POINTLIGHT_H -#define POINTLIGHT_H POINTLIGHT_H - -#include "Light.h" -#include "util/Color.h" - -class PointLight : public Light -{ - public: - PointLight(); - - protected: -}; - -#endif - diff --git a/src/main/Scene-load.cc b/src/main/Scene-load.cc deleted file mode 100644 index a83bc50..0000000 --- a/src/main/Scene-load.cc +++ /dev/null @@ -1,839 +0,0 @@ - -#include - -#include -#include - -#include "Scene.h" -#include "Light.h" -#include "util/stb_image.h" -#include "parser/parser.h" -#include "parser/nodes.h" -#include "util/Polygon.h" -#include "util/Scope.h" - -using namespace std; - -typedef vector< refptr >::const_iterator Node_Iterator; - -#ifdef NODE_TREE_DEBUG -static void dumpNodeTree(refptr node) -{ - static int depth = 0; - for (int i = 0; i < depth; i++) - cerr << ' '; - cerr << typeid(*node).name() << endl; - depth++; - for (Node_Iterator it = node->getChildren().begin(); it != node->getChildren().end(); it++) - { - dumpNodeTree(*it); - } - depth--; -} -#endif - -void Scene::load(const char * filename) -{ - refptr scope = new Scope(); - refptr node = parse(filename, scope); -#ifdef NODE_TREE_DEBUG - dumpNodeTree(node); -#endif - if ( ! node.isNull() ) - { - /* evaluate any scripting nodes in the node tree */ - refptr processed_scene = node->evaluate(); - node->evaluateChildren(processed_scene); - - /* now we have a new node tree under 'dummy' with no scripting nodes */ - processScene(processed_scene); - } -} - -void Scene::processScene(refptr node) -{ - /* first process any cameras present */ - int cameras_found = 0; - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(CameraNode) ) - { - cameras_found++; - if (cameras_found == 1) - processCamera(*it); - else - { - cerr << "Error: multiple camera definitions found!" << endl; - exit(5); - } - } - } - - /* then any other scene-specific items */ - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(LightNode) ) - { - refptr light = processLight(*it); - if ( ! light.isNull() ) - m_lights.push_back(light); - } - else if ( typeid(**it) == typeid(OptionsNode) ) - { - processOptions(*it); - } - } - - /* then any general items */ - vector shapes = processGeneralItems(node); - for (vector::iterator it = shapes.begin(); - it != shapes.end(); - it++) - { - m_shapes.push_back(*it); - } -} - -ShapeRef Scene::processShape(refptr node) -{ - if ( typeid(*node) == typeid(BoxNode) ) - { - return processBox(node); - } - else if ( typeid(*node) == typeid(PlaneNode) ) - { - return processPlane(node); - } - else if ( typeid(*node) == typeid(SphereNode) ) - { - return processSphere(node); - } - else if ( typeid(*node) == typeid(CylNode) ) - { - return processCyl(node); - } - else if ( typeid(*node) == typeid(IntersectNode) - || typeid(*node) == typeid(UnionNode) - || typeid(*node) == typeid(SubtractNode) ) - { - return processBool(node); - } - else if ( typeid(*node) == typeid(ExtrudeNode) ) - { - return processExtrude(node); - } - else if ( typeid(*node) == typeid(ShapeRefNode) ) - { - return processShapeRef(node); - } - else - { - cerr << "Error: Unknown shape!" << endl; - exit(3); - } - - return ShapeRef(NULL); -} - -void Scene::processCamera(refptr node) -{ - Vector position(0, 0, 0); - Vector look_at(0, 1, 0); - Vector up(0, 0, 1); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(PositionNode) ) - { - position = * (*it)->getVector(); - } - else if ( typeid(**it) == typeid(LookAtNode) ) - { - look_at = * (*it)->getVector(); - } - else if ( typeid(**it) == typeid(UpNode) ) - { - up = * (*it)->getVector(); - } - else if ( typeid(**it) == typeid(VFOVNode) ) - { - m_vfov = (*it)->getNumber(); - } - } - - m_transforms.top().lookAt(position, look_at, up); -} - -void Scene::processOptions(refptr node) -{ - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(WidthNode) ) - { - m_width = (*it)->getInteger(); - } - else if ( typeid(**it) == typeid(HeightNode) ) - { - m_height = (*it)->getInteger(); - } - else if ( typeid(**it) == typeid(ExposureNode) ) - { - m_exposure = (*it)->getNumber(); - if (m_exposure < 0.0) - m_exposure = 0.0; - } - else if ( typeid(**it) == typeid(MultisampleNode) ) - { - m_multisample_level = (*it)->getInteger(); - } - else if ( typeid(**it) == typeid(MaxDepthNode) ) - { - m_max_depth = (*it)->getInteger(); - } - else if ( typeid(**it) == typeid(AmbientNode) ) - { - setAmbientLight(Color((*it)->getVector())); - } - else if ( typeid(**it) == typeid(AmbientOcclusionNode) ) - { - m_ambient_occlusion_level = (*it)->getInteger(); - } - } -} - -vector Scene::processTransformBlock(refptr node) -{ - if ( typeid(*node) == typeid(TranslateBlockNode) ) - { - m_transforms.push(m_transforms.top()); - m_transforms.top().translate(node->getVector()); - } - else if ( typeid(*node) == typeid(RotateBlockNode) ) - { - m_transforms.push(m_transforms.top()); - m_transforms.top().rotate(node->getNumber(), - node->getVector()); - } - else if ( typeid(*node) == typeid(ScaleBlockNode) ) - { - m_transforms.push(m_transforms.top()); - m_transforms.top().scale(node->getVector()); - } - else - { - cerr << "Unknown transformation block node type!" << endl; - exit(4); - } - - vector shapes = processGeneralItems(node); - - m_transforms.pop(); - - return shapes; -} - -vector Scene::processGeneralItems(refptr node) -{ - vector shapes, incoming; - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ((*it)->isTransformBlock()) - { - incoming = processTransformBlock(*it); - } - else if ( typeid(**it) == typeid(MaterialDefinitionNode) ) - { - processMaterialDefinition(*it); - } - else if ( typeid(**it) == typeid(ShapeDefinitionNode) ) - { - processShapeDefinition(*it); - } - else if ( (*it)->isShape() ) - { - shapes.push_back(processShape(*it)); - } - while (incoming.size() > 0) - { - shapes.push_back(incoming[0]); - incoming.erase(incoming.begin()); - } - } - - return shapes; -} - -void Scene::processMaterialDefinition(refptr node) -{ - map< string, refptr >::iterator it = - m_materials.find(node->getString()); - if ( it == m_materials.end() ) - { - m_materials[node->getString()] = processMaterial(node); - } - else - { - cerr << "Error: duplicate material definition for material '" - << node->getString() << "'" << endl; - exit(4); - } -} - -refptr Scene::processMaterial(refptr node) -{ - if ( typeid(*node) == typeid(MaterialRefNode) ) - { - map< string, refptr >::iterator it = - m_materials.find(node->getString()); - if ( it == m_materials.end() ) - { - cerr << "Undefined material '" << node->getString() - << "' requested!" << endl; - exit(4); - } - - return m_materials[node->getString()]; - } - - refptr material = new Material(); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(ColorNode) ) - { - material->setDiffuseColor(Color((*it)->getVector())); - material->setAmbientColor(Color((*it)->getVector())); - } - else if ( typeid(**it) == typeid(AmbientNode) ) - { - material->setAmbientColor(Color((*it)->getVector())); - } - else if ( typeid(**it) == typeid(DiffuseNode) ) - { - material->setDiffuseColor(Color((*it)->getVector())); - } - else if ( typeid(**it) == typeid(SpecularNode) ) - { - material->setSpecularColor(Color((*it)->getVector())); - } - else if ( typeid(**it) == typeid(ReflectanceNode) ) - { - material->setReflectance((*it)->getNumber()); - } - else if ( typeid(**it) == typeid(RefractionNode) ) - { - material->setRefraction((*it)->getNumber()); - } - else if ( typeid(**it) == typeid(ShininessNode) ) - { - material->setShininess((*it)->getNumber()); - } - else if ( typeid(**it) == typeid(TransparencyNode) ) - { - material->setTransparency((*it)->getNumber()); - } - else if ( typeid(**it) == typeid(TextureNode) ) - { - string filename = (*it)->getString(); - Texture * texture = NULL; - if (m_textures.find(filename) != m_textures.end()) - { - /* texture already loaded */ - texture = m_textures[filename]; - } - else - { - texture = loadTexture(filename); - if (texture != NULL) - { - m_textures[filename] = texture; - } - } - if (texture != NULL) - { - material->setTexture(texture); - } - } - } - - return material; -} - -ShapeRef Scene::processBox(refptr node) -{ - refptr size = new Vector(1, 1, 1); - refptr material; - - bool restore_transform = processTransforms(node); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(SizeNode) ) - { - size = (*it)->getVector(); - } - else if ( (*it)->isMaterial() ) - { - material = processMaterial(*it); - } - } - - ShapeRef box = new Box(size); - if ( ! material.isNull() ) - box->setMaterial(material); - box->setTransform(m_transforms.top()); - - if (restore_transform) - m_transforms.pop(); - - return box; -} - -ShapeRef Scene::processCyl(refptr node) -{ - double radius1 = 1.0; - double radius2 = 1.0; - double height = 1.0; - refptr material; - - bool restore_transform = processTransforms(node); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(SizeNode) ) - { - refptr v = (*it)->getVector(); - radius1 = (*v)[0]; - radius2 = (*v)[1]; - height = (*v)[2]; - } - else if ( (*it)->isMaterial() ) - { - material = processMaterial(*it); - } - } - - ShapeRef cyl = new Cyl(radius1, radius2, height); - if ( ! material.isNull() ) - cyl->setMaterial(material); - cyl->setTransform(m_transforms.top()); - - if (restore_transform) - m_transforms.pop(); - - return cyl; -} - -refptr Scene::processLight(refptr node) -{ - refptr light = new PointLight(); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(PositionNode) ) - { - refptr v = (*it)->getVector(); - light->setPosition(m_transforms.top().transform_point(*v)); - } - else if ( typeid(**it) == typeid(DiffuseNode) ) - { - Color c((*it)->getVector()); - light->setDiffuseColor(c); - } - else if ( typeid(**it) == typeid(SpecularNode) ) - { - Color c((*it)->getVector()); - light->setSpecularColor(c); - } - else if ( typeid(**it) == typeid(ColorNode) ) - { - Color c((*it)->getVector()); - light->setDiffuseColor(c); - light->setSpecularColor(c); - } - else if ( typeid(**it) == typeid(RadiusNode) ) - { - light->setRadius((*it)->getNumber()); - } - else if ( typeid(**it) == typeid(JitterNode) ) - { - light->setJitter((*it)->getInteger()); - } - } - - return light; -} - -ShapeRef Scene::processPlane(refptr node) -{ - Vector normal(0, 0, 1); - double dist = 0; - refptr material; - - bool restore_transform = processTransforms(node); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(PlanePositionNode) ) - { - normal = *(*it)->getVector(); - dist = (*it)->getNumber(); - } - else if ( (*it)->isMaterial() ) - { - material = processMaterial(*it); - } - } - - ShapeRef plane = new Plane(normal[0], - normal[1], - normal[2], - dist); - if ( ! material.isNull() ) - plane->setMaterial(material); - plane->setTransform(m_transforms.top()); - - if (restore_transform) - m_transforms.pop(); - - return plane; -} - -ShapeRef Scene::processSphere(refptr node) -{ - double radius = 1.0; - refptr material; - - bool restore_transform = processTransforms(node); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(RadiusNode) ) - { - radius = (*it)->getNumber(); - } - else if ( (*it)->isMaterial() ) - { - material = processMaterial(*it); - } - } - - ShapeRef sphere = new Sphere(radius); - if ( ! material.isNull() ) - sphere->setMaterial(material); - sphere->setTransform(m_transforms.top()); - - if (restore_transform) - m_transforms.pop(); - - return sphere; -} - -ShapeRef Scene::processBool(refptr node) -{ - vector shapes; - refptr material; - - bool restore_transform = processTransforms(node); - m_transforms.push(Transform()); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( (*it)->isShape() ) - { - ShapeRef shape = processShape(*it); - if ( ! shape.isNull() ) - shapes.push_back(shape); - } - else if ( (*it)->isMaterial() ) - { - material = processMaterial(*it); - } - else if ( (*it)->isTransformBlock() ) - { - vector in = processTransformBlock(*it); - for (int i = 0, sz = in.size(); i < sz; i++) - { - shapes.push_back(in[i]); - } - } - else if ( typeid(**it) == typeid(ShapeDefinitionNode) ) - { - processShapeDefinition(*it); - } - } - - if (shapes.size() < 2) - { - cerr << "Error: boolean objects must have 2 or more sub-objects!" - << endl; - exit(3); - } - - ShapeRef shape; - if ( typeid(*node) == typeid(IntersectNode) ) - shape = new Intersect(shapes); - else if ( typeid(*node) == typeid(UnionNode) ) - shape = new Union(shapes); - else if ( typeid(*node) == typeid(SubtractNode) ) - shape = new Subtract(shapes); - else - { - cerr << __FILE__ << ": " << __LINE__ - << ": error: bool object unrecognized" << endl; - exit(3); - } - - if ( ! material.isNull() ) - shape->setMaterial(material); - - m_transforms.pop(); - shape->setTransform(m_transforms.top()); - if (restore_transform) - m_transforms.pop(); - - return shape; -} - -ShapeRef Scene::processExtrude(refptr node) -{ - refptr material; - Extrude * extrude = new Extrude(); - - bool restore_transform = processTransforms(node); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(PolygonNode) ) - { - extrude->addPolygon(processPolygon(*it)); - } - else if ( typeid(**it) == typeid(NGonNode) ) - { - extrude->addPolygon(processNGon(*it)); - } - else if ( typeid(**it) == typeid(OffsetNode) ) - { - double distance = (*it)->getNumber(); - if (distance <= 0.0) - { - cerr << "Error: extrude distance must be positive" << endl; - exit(3); - } - Vector scale(1, 1, 1); - Vector position(0, 0, 0); - for (Node_Iterator it2 = (*it)->getChildren().begin(); - it2 != (*it)->getChildren().end(); - it2++) - { - if ( typeid(**it2) == typeid(ScaleNode) ) - { - scale = * (*it2)->getVector(); - } - else if ( typeid(**it2) == typeid(PositionNode) ) - { - position = * (*it2)->getVector(); - } - } - if (scale[0] < 0.0 || scale[1] < 0.0) - { - cerr << "Error: extrude scale cannot be negative" << endl; - exit(3); - } - extrude->addOffset(distance, scale, position); - } - else if ( (*it)->isMaterial() ) - { - material = processMaterial(*it); - } - } - - if ( ! material.isNull() ) - extrude->setMaterial(material); - extrude->setTransform(m_transforms.top()); - - if (restore_transform) - m_transforms.pop(); - - return extrude; -} - -refptr Scene::processPolygon(refptr node) -{ - refptr p = new Polygon(); - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(VectorNode) ) - { - p->push_back((*it)->getVector()); - } - else - { - cerr << "Error: Unknown polygon sub-object" << endl; - exit(3); - } - } - if (p->size() < 3) - { - cerr << "Error: Polygon with fewer than three points!" << endl; - exit(3); - } - return p; -} - -refptr Scene::processNGon(refptr node) -{ - refptr p = new Polygon(); - double radius = node->getChildren()[0]->getNumber(); - int n = node->getInteger(); - int step = n < 0 ? -1 : 1; - n = abs(n); - if (n < 3) - n = 3; - int pos = 0; - double astep = 2.0 * M_PI / n; - for (int i = 0; i < n; i++) - { - p->push_back(new Vector( - radius * cos(pos * astep), - radius * sin(pos * astep), - 0.0)); - pos += step; - } - return p; -} - -ShapeRef Scene::processShapeRef(refptr node) -{ - if (m_shape_definitions.find(node->getString()) - == m_shape_definitions.end()) - { - cerr << "Error: no shape definition for '" << node->getString() - << "' found!" << endl; - exit(3); - } - - refptr material; - ShapeRef shape = m_shape_definitions[node->getString()]->clone(); - - bool restore_transform = processTransforms(node); - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( (*it)->isMaterial() ) - { - material = processMaterial(*it); - } - } - - if ( ! material.isNull() ) - shape->setMaterial(material); - shape->setTransform(m_transforms.top() * shape->getTransform()); - - if (restore_transform) - m_transforms.pop(); - - return shape; -} - -bool Scene::processTransforms(refptr node) -{ - bool did_any = false; - - for (Node_Iterator it = node->getChildren().begin(); - it != node->getChildren().end(); - it++) - { - if ( typeid(**it) == typeid(TranslateNode) ) - { - if (did_any == false) - { - m_transforms.push(m_transforms.top()); - did_any = true; - } - m_transforms.top().translate((*it)->getVector()); - } - else if ( typeid(**it) == typeid(RotateNode) ) - { - if (did_any == false) - { - m_transforms.push(m_transforms.top()); - did_any = true; - } - m_transforms.top().rotate((*it)->getNumber(), - (*it)->getVector()); - } - else if ( typeid(**it) == typeid(ScaleNode) ) - { - if (did_any == false) - { - m_transforms.push(m_transforms.top()); - did_any = true; - } - m_transforms.top().scale((*it)->getVector()); - } - } - - return did_any; -} - -void Scene::processShapeDefinition(refptr node) -{ - m_transforms.push(Transform()); - m_shape_definitions[node->getString()] - = processShape(node->getChildren()[0]); - m_transforms.pop(); -} - -Texture * Scene::loadTexture(const std::string & filename) -{ - int width = 0; - int height = 0; - int channels = 0; - /* request 4 channels so the data is always tightly packed RGBA */ - unsigned char * data = stbi_load(filename.c_str(), &width, &height, - &channels, 4); - if (data == NULL) - { - cerr << "Error: image \"" << filename << "\" could not be loaded: " - << stbi_failure_reason() << endl; - return NULL; - } - Texture * texture = new Texture; - texture->width = width; - texture->height = height; - texture->channels = 4; - texture->data = data; - return texture; -} diff --git a/src/main/Scene.cc b/src/main/Scene.cc deleted file mode 100644 index 19b4015..0000000 --- a/src/main/Scene.cc +++ /dev/null @@ -1,406 +0,0 @@ - -#include /* exp(), pow(), M_PI */ -#include - -#include -#include -#include /* pair */ -#include -#include /* sort() */ -#include /* typeid operator support */ - -#include "Scene.h" -#include "BMP.h" -#include "util/stb_image.h" -#include "util/Color.h" -#include "shapes/Shape.h" -#include "Light.h" - -using namespace std; - -#define MAX_AMBIENT_OCCLUSION_DISTANCE 50.0 - -Scene::Scene(const map & options, - const char * filename) -{ - m_width = 800; - m_height = 600; - m_multisample_level = 1; - m_vfov = 60.0; - m_ambient_light = Color(0.2, 0.2, 0.2); - m_max_depth = 10; - m_exposure = 1.0f; - m_ambient_occlusion_level = 0; - m_transforms.push(Transform()); - - load(filename); - - /* after loading the scene file, apply any command-line render options */ - for (map::const_iterator it = options.begin(); - it != options.end(); - it++) - { - if (it->first == "width") - { - m_width = atoi(it->second); - } - else if (it->first == "height") - { - m_height = atoi(it->second); - } - else if (it->first == "multisample") - { - m_multisample_level = atoi(it->second); - } - else if (it->first == "field-of-view") - { - m_vfov = atof(it->second); - } - else if (it->first == "max-depth") - { - m_max_depth = atoi(it->second); - } - else if (it->first == "ambient-occlusion") - { - m_ambient_occlusion_level = atoi(it->second); - } - } - - /* view plane distance is calculated based on the field of view */ - m_view_plane_dist = (m_height / 2.0) / tan(M_PI * m_vfov / 360.0); - m_sample_span = 1.0 / m_multisample_level; - m_half_sample_span = m_sample_span / 2.0; - m_multisample_level_squared = m_multisample_level * m_multisample_level; -} - -Scene::~Scene() -{ - /* clean up any textures loaded with stb_image */ - for (std::map< std::string, Texture * >::iterator it = m_textures.begin(); - it != m_textures.end(); - it++) - { - stbi_image_free(it->second->data); - delete it->second; - } -} - -void Scene::renderPixel(int x, int y, unsigned char * pixel) -{ - /* calculate the ray going from the camera through this pixel */ - Color finalColor; - for (int i = 0; i < m_multisample_level; i++) - { - for (int j = 0; j < m_multisample_level; j++) - { - double rx = (x + i * m_sample_span + m_half_sample_span) - - (m_width / 2.0); - double rz = (m_height / 2.0) - - (y + j * m_sample_span + m_half_sample_span); - - Ray ray(Vector(0, 0, 0), Vector(rx, m_view_plane_dist, rz)); - - finalColor += traceRay(ray); - } - } - - /* apply exposure formula so we aren't saturated */ - finalColor.r = 1.0f - - exp(-m_exposure * finalColor.r / m_multisample_level_squared); - finalColor.g = 1.0f - - exp(-m_exposure * finalColor.g / m_multisample_level_squared); - finalColor.b = 1.0f - - exp(-m_exposure * finalColor.b / m_multisample_level_squared); - -#if 0 - /* gamma correct */ - finalColor.r = pow(finalColor.r, 1 / 2.2); - finalColor.g = pow(finalColor.g, 1 / 2.2); - finalColor.b = pow(finalColor.b, 1 / 2.2); -#endif - - /* take the average of all the samples as the final pixel value */ - pixel[BMP_RED] = (unsigned char) (0xFF * finalColor.r); - pixel[BMP_GREEN] = (unsigned char) (0xFF * finalColor.g); - pixel[BMP_BLUE] = (unsigned char) (0xFF * finalColor.b); -} - -Color Scene::traceRay(const Ray & ray) -{ - return traceRayRecurse(ray, m_max_depth, 1.0, NULL); -} - -/** - * factor: the proportion of the final color that this computation is worth - */ -Color Scene::traceRayRecurse(const Ray & ray, int depth, double factor, - refptr last_material) -{ - static refptr air = new Material(); - Color color(0, 0, 0); - - if (last_material.isNull()) - last_material = air; - - Shape::Intersection hit = getRayClosestHit(ray); - - if ( ! hit.shape.isNull() ) - { - /* compute the Phong lighting for each hit */ - refptr material = hit.shape->getMaterial(); - - /* check for backfaces */ - bool frontface = ray.getDirection() % hit.normal < 0.0; - - if (frontface) - { - color = computePhong(material, - ray, - hit.position, - hit.normal); - - if (depth > 0 && factor > SCENE_FACTOR_THRESHOLD) - { - double reflectance = material->getReflectance(); - if (factor * reflectance > SCENE_FACTOR_THRESHOLD) - { - color *= (1.0 - reflectance); - Vector reflected_direction = - ray.getDirection().reflect(hit.normal); - Ray newRay(hit.position, reflected_direction); - Vector jitter_surface_point = newRay[0.0001]; - Ray jitterNewRay(jitter_surface_point, reflected_direction); - Color c = traceRayRecurse(jitterNewRay, - depth - 1, - factor * reflectance, - material); - color += c * reflectance; - } - - double transparency = material->getTransparency(); - if (factor * transparency > SCENE_FACTOR_THRESHOLD) - { - color *= (1.0 - transparency); - Vector jitter_surface_point = hit.position - + ray.getDirection() * 0.0001; - Vector refracted_direction = - ray.getDirection().refract(hit.normal, - last_material->getRefraction(), - material->getRefraction()); - Ray newRay(jitter_surface_point, refracted_direction); - Color c = traceRayRecurse(newRay, - depth - 1, - factor * transparency, - material); - color += c * transparency; - } - } - } - else - { - material = air; - Vector jitter_surface_point = hit.position - + ray.getDirection() * 0.0001; - Vector refracted_direction = - ray.getDirection().refract(-hit.normal, - last_material->getRefraction(), - material->getRefraction()); - Ray newRay(jitter_surface_point, refracted_direction); - color = traceRayRecurse(newRay, depth, factor, material); - } - } - - return color; -} - -Shape::Intersection Scene::getRayClosestHit(const Ray & ray) -{ - Shape::Intersection hit; - double min_dist = 0.0; - bool foundOne = false; - - /* loop through all shapes in the scene */ - for (vector< refptr >::iterator it = m_shapes.begin(); - it != m_shapes.end(); - it++) - { - Shape::IntersectionList intersections = (*it)->intersect(*it, ray); - - for (int i = 0, num_results = intersections.size(); - i < num_results; - i++) - { - refptr shape = intersections[i].shape; - const Vector & isect_point = intersections[i].position; - double intersect_dist = ray.getOrigin().dist_to(isect_point); - if (foundOne == false || intersect_dist < min_dist) - { - hit = intersections[i]; - min_dist = intersect_dist; - foundOne = true; - } - } - } - - return hit; -} - -Color Scene::computePhong(const refptr material, - const Ray & viewRay, - const Vector & surfacePoint, - const Vector & surfaceNormal) -{ - Color result = m_ambient_light * material->getAmbientColor(); - if (m_ambient_occlusion_level > 0) - { - result *= calculateAmbientOcclusion( - Ray(surfacePoint, surfaceNormal).shift(1e-7)); - } - - Vector viewDirection = -viewRay.getDirection(); - double shininess = material->getShininess(); - const Color & diffuseColor = material->getDiffuseColor(); - const Color & specularColor = material->getSpecularColor(); - - for (std::vector< refptr >::const_iterator it = m_lights.begin(); - it != m_lights.end(); - it++) - { - Vector lightC = (*it)->getPosition(); - double lightRadius = (*it)->getRadius(); - Vector directionToLightC = lightC - surfacePoint; - Vector lightPlaneX = directionToLightC.getPerpendicular().normalize(); - Vector lightPlaneY = (directionToLightC * lightPlaneX).normalize(); - int jitter_samples = 0, jitter_level = (*it)->getJitter();; - Color jitterResult; - for (int jitter_index = 0; jitter_index < jitter_level; jitter_index++) - { - double jitterRadius = jitter_index * lightRadius - / (jitter_level - 0.5); - for (int i = 0, num = (int) (M_PI * jitter_index) + 1; i < num; i++) - { - jitter_samples++; - double jitter_angle = i * 2.0 * M_PI / num; - Vector jitterPosition = lightC - + lightPlaneX * jitterRadius * cos(jitter_angle) - + lightPlaneY * jitterRadius * sin(jitter_angle); - Vector directionToLight = jitterPosition - surfacePoint; - directionToLight.normalize(); - Vector reflectedLightDirection = - (-directionToLight).reflect(surfaceNormal); - - Ray surfaceToLight(surfacePoint, directionToLight); - Color light_contribution = - calculateLightContribution(surfaceToLight.shift(0.0001), - jitterPosition); - - if ( light_contribution.r > 0.0 - || light_contribution.g > 0.0 - || light_contribution.b > 0.0 ) - { - /* calculate the diffuse term */ - double diffuse_coef = directionToLight % surfaceNormal; - if (diffuse_coef > 0.0) - { - jitterResult += diffuseColor - * (*it)->getDiffuseColor() - * diffuse_coef - * light_contribution; - } - - /* calculate the specular term */ - double specular_coef = reflectedLightDirection % viewDirection; - if (specular_coef > 0.0) - { - jitterResult += specularColor - * (*it)->getSpecularColor() - * pow(specular_coef, shininess) - * light_contribution; - } - } - } - } - jitterResult /= jitter_samples; - result += jitterResult; - } - - return result; -} - -Color Scene::calculateLightContribution(const Ray & toLight, - const Vector & lightPosition) -{ - Color contrib(1.0, 1.0, 1.0); - double dist_to_light = (lightPosition - toLight.getOrigin()).mag(); - double dist_so_far = 0.0; - - Ray currentRay = toLight; - - for (;;) - { - Shape::Intersection hit = getRayClosestHit(currentRay); - - if ( hit.shape.isNull() ) - break; - - double offset = currentRay.getOrigin().dist_to(hit.position) + 0.0001; - - if ( dist_so_far + offset > dist_to_light ) - break; - - contrib *= hit.shape->getMaterial()->getTransparency(); - contrib *= hit.shape->getMaterial()->getDiffuseColor(); - - if ( contrib.r < SCENE_FACTOR_THRESHOLD - && contrib.g < SCENE_FACTOR_THRESHOLD - && contrib.b < SCENE_FACTOR_THRESHOLD ) - break; - - dist_so_far += offset; - currentRay = currentRay.shift(offset); - } - - return contrib; -} - -Color Scene::calculateAmbientOcclusion(const Ray & surfaceNormal) -{ - Color result(1, 1, 1); - const int nISteps = m_ambient_occlusion_level * 6; - const int nJSteps = nISteps / 2; - int nRays = 0; - Vector perpX = surfaceNormal.getDirection().getPerpendicular().normalize(); - Vector perpY = (surfaceNormal.getDirection() * perpX).normalize(); - double istep = 2.0 * M_PI / nISteps; - double jstep = M_PI_2 / nJSteps; - for (int i = 0; i < nISteps; i++) - { - int lim = i > 0 ? nJSteps : 1; - for (int j = 0; j < lim; j++) - { - Vector direction = cos(i * istep) * sin(j * jstep) * perpX - + sin(i * istep) * sin(j * jstep) * perpY - + cos(j * jstep) * surfaceNormal.getDirection(); - Ray thisRay(surfaceNormal.getOrigin(), direction); - double dist = 0.0; - Color contrib(1, 1, 1); - while (contrib.r > 0.2 && contrib.g > 0.2 && contrib.b > 0.2) - { - Shape::Intersection hit = getRayClosestHit(thisRay); - if (hit.shape.isNull()) - break; - double hitDist = (hit.position - thisRay.getOrigin()).mag(); - dist += hitDist; - if (dist > MAX_AMBIENT_OCCLUSION_DISTANCE) - break; - contrib *= hit.shape->getMaterial()->getTransparency() - * hit.shape->getMaterial()->getDiffuseColor(); - thisRay = thisRay.shift(hitDist + 1E-7); - } - result += contrib; - nRays++; - } - } - result /= nRays; - return result; -} diff --git a/src/main/Scene.h b/src/main/Scene.h deleted file mode 100644 index 8d3e11e..0000000 --- a/src/main/Scene.h +++ /dev/null @@ -1,109 +0,0 @@ - -#ifndef SCENE_H -#define SCENE_H SCENE_H - -#include -#include -#include -#include -#include - -#include "util/refptr.h" -#include "util/Ray.h" -#include "util/Color.h" -#include "util/Material.h" -#include "util/Polygon.h" - -#include "shapes/shapes.h" - -#include "parser/parser.h" -#include "parser/nodes.h" - -#include "Light.h" - -#define SCENE_FACTOR_THRESHOLD 0.02 - -class Scene -{ - public: - Scene(const std::map & options, - const char * filename); - ~Scene(); - void setWidth(int width) { m_width = width; } - void setHeight(int height) { m_height = height; } - void setMultisampleLevel(int level) { m_multisample_level = level; } - void setVFOV(double vfov) { m_vfov = vfov; } - void setAmbientLight(const Color & al) { m_ambient_light = al; } - void renderPixel(int x, int y, unsigned char * pixel); - void setMaxDepth(int d) { m_max_depth = d; } - int getWidth() { return m_width; } - int getHeight() { return m_height; } - int getMultisampleLevel() { return m_multisample_level; } - int getAmbientOcclusionLevel() { return m_ambient_occlusion_level; } - double getVFOV() { return m_vfov; } - int getMaxDepth() { return m_max_depth; } - - protected: - /* private methods */ - Color traceRay(const Ray & ray); - Color traceRayRecurse(const Ray & ray, int depth, double factor, - refptr last_material); - Shape::Intersection getRayClosestHit(const Ray & ray); - Color computePhong(const refptr material, - const Ray & viewRay, - const Vector & surfacePoint, - const Vector & surfaceNormal); - Color calculateLightContribution(const Ray & toLight, - const Vector & lightPosition); - Color calculateAmbientOcclusion(const Ray & surfaceNormal); - - /* In Scene-load.cc */ - void load(const char * filename); - void processScene(refptr node); - refptr processMaterial(refptr node); - ShapeRef processBox(refptr node); - ShapeRef processCyl(refptr node); - refptr processLight(refptr node); - ShapeRef processPlane(refptr node); - ShapeRef processSphere(refptr node); - ShapeRef processShape(refptr node); - ShapeRef processBool(refptr node); - ShapeRef processExtrude(refptr node); - ShapeRef processShapeRef(refptr node); - refptr processPolygon(refptr node); - refptr processNGon(refptr node); - bool processTransforms(refptr node); - void processCamera(refptr node); - void processOptions(refptr node); - std::vector processTransformBlock(refptr node); - std::vector processGeneralItems(refptr node); - std::vector processForNode(refptr node); - void processMaterialDefinition(refptr node); - void processShapeDefinition(refptr node); - Texture * loadTexture(const std::string & filename); - - /* rendering parameters */ - int m_width; - int m_height; - int m_multisample_level; - double m_vfov; - Color m_ambient_light; - int m_max_depth; - double m_exposure; - int m_ambient_occlusion_level; - - /* private data */ - std::vector m_shapes; - std::map m_shape_definitions; - std::vector< refptr > m_lights; - std::stack m_transforms; - double m_view_plane_dist; - int m_multisample_level_squared; - double m_sample_span; - double m_half_sample_span; - std::map< std::string, refptr > m_materials; - std::map< std::string, Texture * > m_textures; -}; - -#endif - diff --git a/src/main/fart.cc b/src/main/fart.cc deleted file mode 100644 index 7797bad..0000000 --- a/src/main/fart.cc +++ /dev/null @@ -1,434 +0,0 @@ - -#include -#include /* sysconf() */ -#include /* rand(), srand() */ -#include /* time() */ -#include -#include /* gettimeofday() */ - -#include -#include -#include -#include - -#include -#include - -#include "Scene.h" -#include "distrib/distrib.h" -#include "BMP.h" - -using namespace std; - -/* - * Number of contiguous pixels each worker thread claims at a time. Pulling - * work in small chunks (rather than whole rows) keeps the load balanced even - * when individual rows vary wildly in render cost, while keeping the claimed - * pixels contiguous so cache locality and dispatch overhead stay close to the - * row-based baseline. See benchmarks: 64 was the sweet spot. - */ -#define RENDER_CHUNK_SIZE 64 - -/* - * State shared by the local multithreaded renderer. Worker threads pull - * fixed-size chunks of pixels off a lock-free atomic cursor until the image - * is complete. - */ -typedef struct -{ - Scene * scene; - unsigned char * data; - int width; - int total_pixels; - std::atomic next_pixel; /* dispatch cursor: next unclaimed pixel */ - std::atomic pixels_done; /* pixels finished, for progress */ - std::atomic last_permille; /* last tenth-of-a-percent printed */ -} render_thread_state_t; - -static void * render_thread(void * varg) -{ - render_thread_state_t * state = (render_thread_state_t *) varg; - const int width = state->width; - const int total_pixels = state->total_pixels; - - for (;;) - { - /* atomically claim the next chunk of contiguous pixels */ - int start = state->next_pixel.fetch_add(RENDER_CHUNK_SIZE, - std::memory_order_relaxed); - if (start >= total_pixels) - break; - int end = start + RENDER_CHUNK_SIZE; - if (end > total_pixels) - end = total_pixels; - - for (int pixel = start; pixel < end; pixel++) - { - int y = pixel / width; - int x = pixel % width; - state->scene->renderPixel(x, y, &state->data[3 * pixel]); - } - - /* report progress without locking: of the threads that advance the - * tenth-of-a-percent counter, only the one that wins the update prints, - * so the display stays monotonic and free of interleaved output */ - int done = state->pixels_done.fetch_add(end - start, - std::memory_order_relaxed) - + (end - start); - int permille = (int) (1000L * done / total_pixels); - int prev = state->last_permille.load(std::memory_order_relaxed); - while (permille > prev) - { - if (state->last_permille.compare_exchange_weak( - prev, permille, std::memory_order_relaxed)) - { - printf("\e[8D%2.1f%%", permille / 10.0); - fflush(stdout); - break; - } - /* prev reloaded by compare_exchange_weak; re-test permille > prev */ - } - } - - return NULL; -} - -static void renderThreaded(Scene & scene, - unsigned char * data, - int width, - int height, - int num_threads) -{ - /* a non-positive override means auto-detect the available cores */ - if (num_threads < 1) - { - num_threads = sysconf(_SC_NPROCESSORS_ONLN); - if (num_threads < 1) - num_threads = 1; - } - - render_thread_state_t state; - state.scene = &scene; - state.data = data; - state.width = width; - state.total_pixels = width * height; - state.next_pixel.store(0, std::memory_order_relaxed); - state.pixels_done.store(0, std::memory_order_relaxed); - state.last_permille.store(0, std::memory_order_relaxed); - - vector threads(num_threads); - for (int i = 0; i < num_threads; i++) - pthread_create(&threads[i], NULL, render_thread, &state); - for (int i = 0; i < num_threads; i++) - pthread_join(threads[i], NULL); - - printf("\e[8D"); -} - -void usage(const char * progname) -{ - cout << "Usage: " << progname << " [options] " << endl; - cout << " Options:" << endl; - cout << " -o|--output-file " << endl; - cout << " -w|--width " << endl; - cout << " -h|--height " << endl; - cout << " -m|--multisample " << endl; - cout << " -f|--field-of-view " << endl; - cout << " -d|--max-depth " << endl; - cout << " -a|--ambient-occlusion " << endl; - cout << " -p|--preview (means -w400 -h300 -m1 -d8 -a0)" << endl; - cout << " -j|--threads (default: number of cores)" << endl; - cout << " --hosts " << endl; - exit(42); -} - -void startChildren(const string & servername, - int serverport, - const vector options) -{ - char server_port_str[15]; - sprintf(server_port_str, "%d", serverport); - - vector args; - args.push_back("fart"); - args.push_back("--child"); - args.push_back("--host"); - args.push_back(servername); - args.push_back("--port"); - args.push_back(server_port_str); - for (int i = 0, sz = options.size(); i < sz; i++) - args.push_back(options[i]); - - const char * char_star_args[args.size() + 1]; - for (int i = 0, sz = args.size(); i < sz; i++) - char_star_args[i] = args[i].c_str(); - char_star_args[args.size()] = (char *) NULL; - - int num_children = sysconf(_SC_NPROCESSORS_CONF); - num_children--; - -#if 0 - /* debug */ - cout << "executing: 'fart', "; - for (int i = 0, sz = args.size(); i < sz; i++) - cout << "'" << char_star_args[i] << "', "; - cout << endl; -#endif - - for (int i = 0; i < num_children; i++) - { - int id = fork(); - if (id == 0) - { - /* child process */ - execvp("fart", (char * const *) char_star_args); - } - } -} - -int main(int argc, char * argv[]) -{ - int opt; - int option_index; - map scene_options; - vector client_options; - bool server = true; - bool distributed = false; - const char * hosts_file = NULL; - const char * server_name = NULL; - int server_port = 0; - unsigned char * data = NULL; - const char * output_file_name = "fart.bmp"; - bool child = false; - int num_threads = 0; /* 0 means auto-detect available cores */ - - static const struct option long_options[] = { - { "ambient-occlusion", required_argument, NULL, 'a' }, - { "output-file", required_argument, NULL, 'o' }, - { "width", required_argument, NULL, 'w' }, - { "height", required_argument, NULL, 'h' }, - { "multisample", required_argument, NULL, 'm' }, - { "field-of-view", required_argument, NULL, 'f' }, - { "max-depth", required_argument, NULL, 'd' }, - { "preview", no_argument, NULL, 'p' }, - { "threads", required_argument, NULL, 'j' }, - { "help", no_argument, NULL, 256 }, - { "host", required_argument, NULL, 257 }, - { "port", required_argument, NULL, 258 }, - { "hosts", required_argument, NULL, 259 }, - { "child", no_argument, NULL, 260 }, - { NULL, 0, NULL, 0 } - }; - - while ((opt = getopt_long(argc, argv, "a:o:w:h:m:f:d:pj:", - long_options, &option_index)) != -1) - { - switch (opt) - { - case 'a': - scene_options["ambient-occlusion"] = optarg; - client_options.push_back("--ambient-occlusion"); - client_options.push_back(optarg); - break; - case 'o': - output_file_name = optarg; - break; - case 'w': - scene_options["width"] = optarg; - client_options.push_back("--width"); - client_options.push_back(optarg); - break; - case 'h': - scene_options["height"] = optarg; - client_options.push_back("--height"); - client_options.push_back(optarg); - break; - case 'm': - scene_options["multisample"] = optarg; - client_options.push_back("--multisample"); - client_options.push_back(optarg); - break; - case 'f': - scene_options["field-of-view"] = optarg; - client_options.push_back("--field-of-view"); - client_options.push_back(optarg); - break; - case 'd': - scene_options["max-depth"] = optarg; - client_options.push_back("--max-depth"); - client_options.push_back(optarg); - break; - case 'p': - scene_options["ambient-occlusion"] = "0"; - scene_options["width"] = "400"; - scene_options["height"] = "300"; - scene_options["multisample"] = "1"; - scene_options["max-depth"] = "8"; - client_options.push_back("--preview"); - break; - case 'j': - num_threads = atoi(optarg); - break; - case 256: - usage(argv[0]); - break; - case 257: - server_name = optarg; - server = false; - distributed = true; - break; - case 258: - server_port = atoi(optarg); - distributed = true; - break; - case 259: - hosts_file = optarg; - distributed = true; - break; - case 260: - child = true; - break; - default: - usage(argv[0]); - break; - } - } - - if (optind >= argc) - { - usage(argv[0]); - } - - srand(time(NULL)); - - const char * filename = argv[optind]; - client_options.push_back(filename); - Scene scene(scene_options, filename); - - const int width = scene.getWidth(); - const int height = scene.getHeight(); - - if (server) - { - /* allocate data for the image */ - data = new unsigned char[3 * width * height]; - - cout << " *** Beginning scene render ***" << endl; - cout << "Parameters:" << endl; - cout << "----------------------------------------" << endl; - cout << " Width: " << width << endl; - cout << " Height: " << height << endl; - cout << " Multisample Level: " << scene.getMultisampleLevel() << endl; - cout << " Ambient Occlusion Level: " << scene.getAmbientOcclusionLevel() << endl; - cout << " Vertical Field of View: " << scene.getVFOV() << endl; - cout << " Max Depth: " << scene.getMaxDepth() << endl; - cout << "----------------------------------------" << endl; - } - - distrib the_distrib; - - struct timeval before, after; - gettimeofday(&before, NULL); /* start timing */ - - if (distributed) - { - /* start the distribution infrastructure */ - if (server) - { - if (strcmp(hosts_file, "")) - the_distrib.readHostFile(hosts_file); - - int num_tasks = (width * height + (UNIT_TASK_SIZE - 1)) - / UNIT_TASK_SIZE; - the_distrib.set_num_tasks(num_tasks); - the_distrib.set_data(data, 3 * width * height); - - the_distrib.startServer(); - the_distrib.startClients(client_options); - - /* wait until all tasks are complete */ - the_distrib.waitAllTasks(); - } - else - { - if (!child) - { - startChildren(server_name, server_port, client_options); - } - - the_distrib.startClient(server_name, server_port); - - unsigned char data[3 * UNIT_TASK_SIZE]; - for (;;) - { - int task_id = the_distrib.getTask(); - if (task_id < 0) - break; - int pixel = task_id * UNIT_TASK_SIZE; - int i = pixel / width; - int j = pixel % width; - for (int t = 0; t < UNIT_TASK_SIZE; t++) - { - scene.renderPixel(j, i, &data[3 * t]); - j++; - if (j >= width) - { - j = 0; - i++; - if (i >= height) - break; - } - } - int ret = the_distrib.send_data(task_id, - &data[0], - 3 * UNIT_TASK_SIZE); - if (ret != 0) - break; - } - } - } - else - { - /* local multithreaded render; num_threads of 0 auto-detects cores */ - renderThreaded(scene, data, width, height, num_threads); - } - - gettimeofday(&after, NULL); /* stop timing */ - - if (server) - { - cout << " *** Ending scene render ***" << endl; - cout << "Writing output file '" << output_file_name << '\'' << endl; - - /* write the image */ - BMP outputImage(output_file_name, width, height, data); - - /* print how much time has elapsed */ - double time_before = before.tv_sec + before.tv_usec / 1000000.0; - double time_after = after.tv_sec + after.tv_usec / 1000000.0; - double total_seconds = time_after - time_before; - cout << "Render time: " << total_seconds << " seconds"; - - double seconds = total_seconds; - int days = (int) (seconds / (60.0 * 60.0 * 24.0)); - seconds -= days * 60.0 * 60.0 * 24.0; - int hours = (int) (seconds / (60.0 * 60.0)); - seconds -= hours * 60.0 * 60.0; - int minutes = (int) (seconds / 60.0); - seconds -= minutes * 60.0; - if (days || hours || minutes) - { - cout << " ("; - if (days) - cout << days << (days == 1 ? " day, " : " days, "); - if (days || hours) - cout << hours << (hours == 1 ? " hour, " : " hours, "); - cout << minutes << (minutes == 1 ? " minute, " : " minutes, "); - cout << seconds << (seconds == 1 ? " second)" : " seconds)"); - } - cout << endl; - } - - exit(0); - return 0; -} diff --git a/src/parser/nodes.cc b/src/parser/nodes.cc deleted file mode 100644 index b2bedd4..0000000 --- a/src/parser/nodes.cc +++ /dev/null @@ -1,283 +0,0 @@ - -#include -#include - -#include -#include -#include -#include - -#include "nodes.h" - -using namespace std; - -typedef NodeRef (*Function)(NodeRef args); - -NodeRef CosFunction(NodeRef args); -NodeRef SinFunction(NodeRef args); -NodeRef SqrtFunction(NodeRef args); -NodeRef AbsFunction(NodeRef args); - -static const struct { - const char * fn_name; - Function fn; -} functions[] = { - {"cos", CosFunction}, - {"sin", SinFunction}, - {"sqrt", SqrtFunction}, - {"abs", AbsFunction} -}; - -class FunctionMap : public map -{ - public: - FunctionMap() - { - for (unsigned int i = 0; - i < sizeof(functions)/sizeof(functions[0]); - i++) - { - (*this)[functions[i].fn_name] = functions[i].fn; - } - } - bool contains(const string & key) - { - return find(key) != end(); - } -}; - -static FunctionMap function_map; - -void Node::evaluateChildren(refptr parent) -{ - /* recursively evaluate all children nodes */ - for (std::vector< refptr >::iterator it = m_children.begin(); - it != m_children.end(); - it++) - { - refptr evaluated = (*it)->evaluate(); - if ( ! evaluated.isNull() ) - { - if (typeid(*evaluated) == typeid(EvaluatePropagateNode)) - { - for (vector::iterator it2 - = evaluated->getChildren().begin(); - it2 != evaluated->getChildren().end(); - it2++) - { - parent->addChild(*it2); - } - } - else - { - (*it)->evaluateChildren(evaluated); - parent->addChild(evaluated); - } - } - } -} - -void Node::addChildren(NodeRef other) -{ - if (other.isNull()) - return; - - for (vector::const_iterator it = other->m_children.begin(); - it != other->m_children.end(); - it++) - { - addChild(*it); - } -} - -Node::~Node() -{ -} - -NodeRef BinOpNode::evaluate() -{ - double o = one->evaluate()->getNumber(); - double t = two->evaluate()->getNumber(); - double r = 0.0; - switch (m_op) - { - case '*': - r = o * t; - break; - case '/': - r = o / t; - break; - case '+': - r = o + t; - break; - case '-': - r = o - t; - break; - case '%': - r = (int) o % (int) t; - break; - case '^': - r = pow(o, t); - break; - default: - cerr << "Error: BinOpNode created with op '" << m_op << "'" << endl; - exit(-3); - } - return new NumberNode(r); -} - -NodeRef BoolExpressionNode::evaluate() -{ - double o = 0, t = 0; - double r = 0; - if (m_op != '!' && m_op != '&' && m_op != '|') - { - o = one->evaluate()->getNumber(); - t = two->evaluate()->getNumber(); - } - switch (m_op) - { - case '<': - r = o < t ? 1 : 0; - break; - case 'l': - r = o <= t ? 1 : 0; - break; - case '>': - r = o > t ? 1 : 0; - break; - case 'g': - r = o >= t ? 1 : 0; - break; - case '=': - r = o == t ? 1 : 0; - break; - case 'n': - r = o != t ? 1 : 0; - break; - case '&': - r = one->evaluate()->getInteger(); - if (r != 0) - { - r = two->evaluate()->getInteger(); - } - break; - case '|': - r = one->evaluate()->getInteger(); - if (r == 0) - { - r = two->evaluate()->getInteger(); - } - break; - case '!': - r = ! one->evaluate()->getInteger(); - break; - case 'T': - r = 1; - break; - } - return new NumberNode(r); -} - -NodeRef ForNode::evaluate() -{ - NodeRef eval = new EvaluatePropagateNode(); - - if (!m_nodes[0].isNull()) - { - m_nodes[0]->evaluate(); - } - - while (m_nodes[1]->evaluate()->getInteger() != 0) - { - evaluateChildren(eval); - - if (!m_nodes[2].isNull()) - { - m_nodes[2]->evaluate(); - } - } - - return eval; -} - -NodeRef IfNode::evaluate() -{ - NodeRef eval = new EvaluatePropagateNode(); - - int if_val = m_test_expr->evaluate()->getInteger(); - - if (if_val != 0) - { - evaluateChildren(eval); - } - else if ( ! m_elses.isNull() ) - { - return m_elses->evaluate(); - } - - return eval; -} - -NodeRef ElseNode::evaluate() -{ - NodeRef eval = new EvaluatePropagateNode(); - evaluateChildren(eval); - return eval; -} - -NodeRef FunctionCallNode::evaluate() -{ - if (function_map.contains(m_name->getString())) - { - return function_map[m_name->getString()](m_parameters); - } - cerr << "Error: no function \"" << m_name->getString() << "\" defined!" - << endl; - exit(4); -} - - -/************************************************************************** - * Scene file functions * - *************************************************************************/ -NodeRef CosFunction(NodeRef args) -{ - if (args->getChildren().size() != 1) - { - cerr << "Error: cos function requires 1 argument" << endl; - exit(4); - } - return new NumberNode(cos(args->getChildren()[0]->evaluate()->getNumber())); -} - -NodeRef SinFunction(NodeRef args) -{ - if (args->getChildren().size() != 1) - { - cerr << "Error: sin function requires 1 argument" << endl; - exit(4); - } - return new NumberNode(sin(args->getChildren()[0]->evaluate()->getNumber())); -} - -NodeRef SqrtFunction(NodeRef args) -{ - if (args->getChildren().size() != 1) - { - cerr << "Error: sqrt function requires 1 argument" << endl; - exit(4); - } - return new NumberNode(sqrt(args->getChildren()[0]->evaluate()->getNumber())); -} - -NodeRef AbsFunction(NodeRef args) -{ - if (args->getChildren().size() != 1) - { - cerr << "Error: abs function requires 1 argument" << endl; - exit(4); - } - return new NumberNode(fabs(args->getChildren()[0]->evaluate()->getNumber())); -} - diff --git a/src/parser/nodes.h b/src/parser/nodes.h deleted file mode 100644 index 4b855dc..0000000 --- a/src/parser/nodes.h +++ /dev/null @@ -1,791 +0,0 @@ - -#ifndef NODES_H -#define NODES_H NODES_H - -#include /* exit() */ - -#include -#include -#include - -#include "util/refptr.h" -#include "util/Vector.h" -#include "util/Scope.h" - -extern refptr parser_scope; - -class Node -{ - public: - virtual ~Node(); - void addChild(refptr child) { m_children.push_back(child); } - void addChildren(refptr other); - std::vector< refptr > & getChildren() { return m_children; } - - virtual int getInteger() { return getNumber(); } - - virtual double getNumber() - { - std::cerr << "Warning: Node::getNumber() called!" << std::endl; - return 0.0; - } - virtual refptr getVector() - { - std::cerr << "Warning: Node::getVector() called!" << std::endl; - return refptr(NULL); - } - virtual std::string getString() - { - std::cerr << "Warning: Node::getString() called!" << std::endl; - return ""; - } - virtual refptr evaluate() - { - std::cerr << "Warning: Node::evaluate() called!" << std::endl; - return NULL; - } - virtual void evaluateChildren(refptr parent); - - virtual bool isShape() { return false; } - virtual bool isMaterial() { return false; } - virtual bool isTransformBlock() { return false; } - virtual bool isExpression() { return false; } - - protected: - std::vector< refptr > m_children; -}; - -typedef refptr NodeRef; - - -class NumberNode : public Node -{ - public: - NumberNode(double number) - : m_number(number), m_direct(true) - { - } - NumberNode(NodeRef expr) - : m_direct(false) - { - m_expr = expr; - } - virtual double getNumber() - { - return m_direct ? m_number : m_expr->getNumber(); - } - virtual refptr evaluate() - { - return m_direct - ? new NumberNode(m_number) - : new NumberNode(m_expr->evaluate()); - } - - protected: - double m_number; - bool m_direct; - NodeRef m_expr; -}; - -class VectorNode : public Node -{ - public: - VectorNode(NodeRef a, NodeRef b, NodeRef c) - : m_a(a), m_b(b), m_c(c), m_direct(true) - { - } - VectorNode(NodeRef node) - : m_vector(node), m_direct(false) - { - } - refptr getVector() - { - return m_direct - ? new Vector(m_a->getNumber(), - m_b->getNumber(), - m_c->getNumber()) - : m_vector->getVector(); - } - virtual NodeRef evaluate() - { - return m_direct - ? new VectorNode(m_a->evaluate(), - m_b->evaluate(), - m_c->evaluate()) - : m_vector->evaluate(); - } - protected: - NodeRef m_a, m_b, m_c, m_vector; - bool m_direct; -}; - - -class AmbientNode : public VectorNode -{ - public: - AmbientNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new AmbientNode(m_vector->evaluate()); - } -}; - -class AmbientOcclusionNode : public NumberNode -{ - public: - AmbientOcclusionNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new AmbientOcclusionNode(m_expr->evaluate()); - } -}; - -class BoxNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() - { - return new BoxNode(); - } -}; - -class CameraNode : public Node -{ - public: - virtual NodeRef evaluate() - { - return new CameraNode(); - } -}; - -class ColorNode : public VectorNode -{ - public: - ColorNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new ColorNode(m_vector->evaluate()); - } -}; - -class CylNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() - { - return new CylNode(); - } -}; - -class DiffuseNode : public VectorNode -{ - public: - DiffuseNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new DiffuseNode(m_vector->evaluate()); - } -}; - -class ExposureNode : public NumberNode -{ - public: - ExposureNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new ExposureNode(m_expr->evaluate()); - } -}; - -class ExtrudeNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() - { - return new ExtrudeNode(); - } -}; - -class HeightNode : public NumberNode -{ - public: - HeightNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new HeightNode(m_expr->evaluate()); - } -}; - -class IdentifierNode : public Node -{ - public: - IdentifierNode(const std::string & str) { m_string = str; } - std::string getString() { return m_string; } - virtual NodeRef evaluate() - { - return new IdentifierNode(m_string); - } - protected: - std::string m_string; -}; - -class IntersectNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() - { - return new IntersectNode(); - } -}; - -class ItemsNode : public Node -{ - public: - virtual NodeRef evaluate() - { - return new ItemsNode(); - } -}; - -class JitterNode : public NumberNode -{ - public: - JitterNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new JitterNode(m_expr->evaluate()); - } -}; - -class LightNode : public Node -{ - public: - virtual NodeRef evaluate() { return new LightNode(); } -}; - -class LookAtNode : public VectorNode -{ - public: - LookAtNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new LookAtNode(m_vector->evaluate()); - } -}; - -class MaterialNode : public Node -{ - public: - bool isMaterial() { return true; } - virtual NodeRef evaluate() { return new MaterialNode(); } -}; - -class MaterialDefinitionNode : public IdentifierNode -{ - public: - MaterialDefinitionNode(const std::string & str) : IdentifierNode(str) {} - virtual NodeRef evaluate() - { - return new MaterialDefinitionNode(m_string); - } -}; - -class MaterialRefNode : public IdentifierNode -{ - public: - MaterialRefNode(const std::string & str) : IdentifierNode(str) {} - bool isMaterial() { return true; } - virtual NodeRef evaluate() { return new MaterialRefNode(m_string); } -}; - -class MaxDepthNode : public NumberNode -{ - public: - MaxDepthNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new MaxDepthNode(m_expr->evaluate()); - } -}; - -class MultisampleNode : public NumberNode -{ - public: - MultisampleNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new MultisampleNode(m_expr->evaluate()); - } -}; - -class NGonNode : public NumberNode -{ - public: - NGonNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new NGonNode(m_expr->evaluate()); - } -}; - -class OffsetNode : public NumberNode -{ - public: - OffsetNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new OffsetNode(m_expr->evaluate()); - } -}; - -class OptionsNode : public Node -{ - public: - virtual NodeRef evaluate() { return new OptionsNode(); } -}; - -class PlaneNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() { return new PlaneNode(); } -}; - -class PlanePositionNode : public VectorNode -{ - public: - PlanePositionNode(NodeRef vec_node, NodeRef dist) - : VectorNode(vec_node) - { - m_dist = dist; - } - double getNumber() { return m_dist->getNumber(); } - virtual NodeRef evaluate() - { - return new PlanePositionNode(m_vector->evaluate(), - m_dist->evaluate()); - } - - protected: - NodeRef m_dist; -}; - -class PolygonNode : public Node -{ - public: - virtual NodeRef evaluate() { return new PolygonNode(); } -}; - -class PositionNode : public VectorNode -{ - public: - PositionNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new PositionNode(m_vector->evaluate()); - } -}; - -class RadiusNode : public NumberNode -{ - public: - RadiusNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new RadiusNode(m_expr->evaluate()); - } -}; - -class ReflectanceNode : public NumberNode -{ - public: - ReflectanceNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new ReflectanceNode(m_expr->evaluate()); - } -}; - -class RefractionNode : public NumberNode -{ - public: - RefractionNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new RefractionNode(m_expr->evaluate()); - } -}; - -class RotateNode : public VectorNode -{ - public: - RotateNode(NodeRef angle, NodeRef vec_node) - : VectorNode(vec_node) - { - m_angle = angle; - } - double getNumber() { return m_angle->getNumber(); } - virtual NodeRef evaluate() - { - return new RotateNode(m_angle->evaluate(), m_vector->evaluate()); - } - - protected: - NodeRef m_angle; -}; - -class RotateBlockNode : public RotateNode -{ - public: - RotateBlockNode(NodeRef angle, NodeRef vec_node) - : RotateNode(angle, vec_node) {} - bool isTransformBlock() { return true; } - virtual NodeRef evaluate() - { - return new RotateBlockNode(m_angle->evaluate(), m_vector->evaluate()); - } -}; - -class ScaleNode : public VectorNode -{ - public: - ScaleNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new ScaleNode(m_vector->evaluate()); - } -}; - -class ScaleBlockNode : public ScaleNode -{ - public: - ScaleBlockNode(NodeRef vector) : ScaleNode(vector) {} - bool isTransformBlock() { return true; } - virtual NodeRef evaluate() - { - return new ScaleBlockNode(m_vector->evaluate()); - } -}; - -class ScaleScalarNode : public Node -{ - public: - ScaleScalarNode(NodeRef expr) - : m_expr(expr) - { - } - virtual NodeRef evaluate() - { - NodeRef n = m_expr->evaluate(); - return new VectorNode(n, n, n); - } - protected: - NodeRef m_expr; -}; - -class SceneNode : public Node -{ - public: - virtual NodeRef evaluate() { return new SceneNode(); } -}; - -class ShapeDefinitionNode : public IdentifierNode -{ - public: - ShapeDefinitionNode(const std::string & str) : IdentifierNode(str) {} - virtual NodeRef evaluate() { return new ShapeDefinitionNode(m_string); } -}; - -class ShapeRefNode : public IdentifierNode -{ - public: - ShapeRefNode(const std::string & str) : IdentifierNode(str) {} - bool isShape() { return true; } - virtual NodeRef evaluate() { return new ShapeRefNode(m_string); } -}; - -class ShininessNode : public NumberNode -{ - public: - ShininessNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new ShininessNode(m_expr->evaluate()); - } -}; - -class SizeNode : public VectorNode -{ - public: - SizeNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new SizeNode(m_vector->evaluate()); - } -}; - -class SpecularNode : public VectorNode -{ - public: - SpecularNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new SpecularNode(m_vector->evaluate()); - } -}; - -class SphereNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() { return new SphereNode(); } -}; - -class SubtractNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() { return new SubtractNode(); } -}; - -class TextureNode : public IdentifierNode -{ - public: - TextureNode(const std::string & str) : IdentifierNode(str) {} - virtual NodeRef evaluate() { return new TextureNode(m_string); } -}; - -class TranslateNode : public VectorNode -{ - public: - TranslateNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new TranslateNode(m_vector->evaluate()); - } -}; - -class TranslateBlockNode : public TranslateNode -{ - public: - TranslateBlockNode(NodeRef vector) : TranslateNode(vector) {} - bool isTransformBlock() { return true; } - virtual NodeRef evaluate() - { - return new TranslateBlockNode(m_vector->evaluate()); - } -}; - -class TransparencyNode : public NumberNode -{ - public: - TransparencyNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new TransparencyNode(m_expr->evaluate()); - } -}; - -class UnionNode : public Node -{ - public: - bool isShape() { return true; } - virtual NodeRef evaluate() { return new UnionNode(); } -}; - -class UpNode : public VectorNode -{ - public: - UpNode(NodeRef vector) : VectorNode(vector) {} - virtual NodeRef evaluate() - { - return new UpNode(m_vector->evaluate()); - } -}; - -class VFOVNode : public NumberNode -{ - public: - VFOVNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new VFOVNode(m_expr->evaluate()); - } -}; - -class WidthNode : public NumberNode -{ - public: - WidthNode(NodeRef e) : NumberNode(e) {} - virtual NodeRef evaluate() - { - return new WidthNode(m_expr->evaluate()); - } -}; - -/******** scripting nodes ********/ - -class ExpressionNode : public Node -{ - public: - bool isExpression() { return true; } - virtual NodeRef evaluate() = 0; -}; - -class AssignmentNode : public ExpressionNode -{ - public: - AssignmentNode(NodeRef varref, NodeRef expr) - : m_varref(varref), m_expr(expr) - { - } - std::string getString() { return m_varref->getString(); } - virtual NodeRef evaluate() - { - double n = m_expr->evaluate()->getNumber(); - parser_scope->putGlobal(getString(), n); - return new NumberNode(n); - } - protected: - NodeRef m_varref; - NodeRef m_expr; -}; - -class LocalAssignmentNode : public ExpressionNode -{ - public: - LocalAssignmentNode(NodeRef varref, NodeRef expr) - : m_varref(varref), m_expr(expr) - { - } - std::string getString() { return m_varref->getString(); } - virtual NodeRef evaluate() - { - double n = m_expr->evaluate()->getNumber(); - parser_scope->putLocal(getString(), n); - return new NumberNode(n); - } - protected: - NodeRef m_varref; - NodeRef m_expr; -}; - -class LocalDeclNode : public ExpressionNode -{ - public: - LocalDeclNode(NodeRef varref) : m_varref(varref) { } - virtual NodeRef evaluate() - { - parser_scope->putLocal(m_varref->getString(), 0.0); - return NULL; - } - protected: - NodeRef m_varref; -}; - -class BinOpNode : public ExpressionNode -{ - public: - BinOpNode(char op, NodeRef one, NodeRef two) - : m_op(op), one(one), two(two) - { - } - virtual NodeRef evaluate(); - protected: - char m_op; - NodeRef one; - NodeRef two; -}; - -class BoolExpressionNode : public Node -{ - public: - BoolExpressionNode(char op, NodeRef one, NodeRef two) - : m_op(op), one(one), two(two) - { - } - virtual NodeRef evaluate(); - protected: - char m_op; - NodeRef one; - NodeRef two; -}; - -class VarRefNode : public Node -{ - public: - VarRefNode(const std::string & str) { m_string = str; } - std::string getString() { return m_string; } - virtual NodeRef evaluate() - { - if (parser_scope->contains(m_string)) - { - return new NumberNode(parser_scope->get(m_string)); - } - std::cerr << "Error: No identifier '" << m_string << "' in scope" - << std::endl; - exit(4); - } - protected: - std::string m_string; -}; - -class ForNode : public Node -{ - public: - ForNode(NodeRef e1, NodeRef e2, NodeRef e3) - { - m_nodes[0] = e1; - m_nodes[1] = e2; - m_nodes[2] = e3; - } - virtual NodeRef evaluate(); - protected: - NodeRef m_nodes[3]; -}; - -class IfNode : public Node -{ - public: - IfNode(NodeRef test_expr, NodeRef elses) - { - m_test_expr = test_expr; - m_elses = elses; - } - virtual NodeRef evaluate(); - protected: - NodeRef m_test_expr, m_elses; -}; - -class ElseNode : public Node -{ - public: - virtual NodeRef evaluate(); -}; - -class FunctionCallNode : public Node -{ - public: - FunctionCallNode(NodeRef name, NodeRef parameters) - { - m_name = name; - m_parameters = parameters; - } - virtual NodeRef evaluate(); - protected: - NodeRef m_name, m_parameters; -}; - -/* this class is only used to hold a set of items coming out of a class's - * evaluate() from above. the evaluateChildren() top-level method will - * propagate children of this class up to the level of their parent */ -class EvaluatePropagateNode : public Node -{ -}; - -#endif - diff --git a/src/parser/parser.h b/src/parser/parser.h deleted file mode 100644 index a231518..0000000 --- a/src/parser/parser.h +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef PARSER_H -#define PARSER_H PARSER_H - -#include "nodes.h" -#include "util/refptr.h" -#include "util/Scope.h" - -#define YYSTYPE refptr - -refptr parse(const char * fileName, refptr scope); - -#endif diff --git a/src/parser/parser.ll b/src/parser/parser.ll deleted file mode 100644 index ffe0e36..0000000 --- a/src/parser/parser.ll +++ /dev/null @@ -1,157 +0,0 @@ - -%option nounput -%option noyywrap -%option bison-locations - -%{ - -#include - -#include "nodes.h" -#include "parser.h" -#include "parser.hh" - -#define YY_USER_ACTION yylloc->first_column += yyleng; - -static std::string build_string; - -%} - -%x str - -%% - -\+ return PLUS; -- return MINUS; -\* return TIMES; -\/ return DIVIDE; -% return MOD; -\^ return POW; -= return ASSIGN; -== return EQUALS; -!= return NOTEQUALS; -\< return LESS; -\<= return LESSEQ; -\> return GREATER; -\>= return GREATEREQ; -&& return AND; -\|\| return OR; -! return NOT; - -; return SEMICOLON; -: return COLON; -\? return QUESTION; -\$ return DOLLAR; -\. return DOT; -, return COMMA; - -\{ return LCURLY; -\} return RCURLY; -\[ return LBRACKET; -\] return RBRACKET; -\( return LPAREN; -\) return RPAREN; - -[0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER; -[0-9]*\.[0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER; - -ambient return AMBIENT; -ambient_occlusion return AMBIENT_OCCLUSION; -box return BOX; -camera return CAMERA; -color return COLOR; -cyl return CYL; -define return DEFINE; -diffuse return DIFFUSE; -exposure return EXPOSURE; -extrude return EXTRUDE; -height return HEIGHT; -intersect return INTERSECT; -jitter return JITTER; -light return LIGHT; -look_at return LOOKAT; -material return MATERIAL; -max_depth return MAXDEPTH; -multisample return MULTISAMPLE; -ngon return NGON; -offset return OFFSET; -options return OPTIONS; -plane return PLANE; -polygon return POLYGON; -position return POSITION; -radius return RADIUS; -reflectance return REFLECTANCE; -refraction return REFRACTION; -rotate return ROTATE; -scale return SCALE; -scene return SCENE; -shape return SHAPE; -shininess return SHININESS; -size return SIZE; -specular return SPECULAR; -sphere return SPHERE; -subtract return SUBTRACT; -texture return TEXTURE; -translate return TRANSLATE; -transparency return TRANSPARENCY; -union return UNION; -up return UP; -vfov return VFOV; -width return WIDTH; - -else return ELSE; -elsif return ELSIF; -for return FOR; -if return IF; -while return WHILE; -local return LOCAL; - -[a-zA-Z_][a-zA-Z_0-9]* { - *yylval = new IdentifierNode(yytext); - return IDENTIFIER; -} -\$[a-zA-Z_][a-zA-Z_0-9]* { - *yylval = new VarRefNode(yytext+1); - return VARREF; -} - -#.*\n { - yylloc->first_line++; yylloc->last_line++; - yylloc->first_column = yylloc->last_column = 0; -} -\n { - yylloc->first_line++; yylloc->last_line++; - yylloc->first_column = yylloc->last_column = 0; -} -[ \t\v] /* ignore whitespace */ - - /* strings */ -\" build_string = ""; BEGIN(str); - -{ - -\" { - /* end of the string literal */ - BEGIN(INITIAL); - *yylval = new IdentifierNode(build_string); - return STRING; -} -\\x[0-9A-Fa-f]{2} { - /* hexadecimal escape code */ - unsigned int val; - (void) sscanf(yytext + 2, "%x", &val); - build_string += (char) val; -} -\\n build_string += '\n'; -\\t build_string += '\t'; -\\r build_string += '\r'; -\\b build_string += '\b'; -\\f build_string += '\f'; -\\(.|\n) build_string += yytext[1]; -[^\\\"]+ build_string += yytext; - -} - -. return yytext[0]; - -%% diff --git a/src/parser/parser.yy b/src/parser/parser.yy deleted file mode 100644 index 3889073..0000000 --- a/src/parser/parser.yy +++ /dev/null @@ -1,511 +0,0 @@ - -%{ - -#include -#include -#include "util/Vector.h" -#include "util/refptr.h" -#include "util/Scope.h" -#include "nodes.h" -#include "parser.h" -#include "parser.hh" /* bison-generated header with YY[SL]TYPE */ -using namespace std; - -#define yyerror(msg) errFunc(msg, &yylloc) - -int yylex(YYSTYPE *, YYLTYPE *); - -extern FILE * yyin; - -void errFunc(const char * str, YYLTYPE * yyllocp); - -static refptr parsed_scene_node; -refptr parser_scope; - -%} - -%define api.pure -%locations -%define parse.error verbose - -%initial-action { - /* Reference yynerrs so the generated parser does not warn that it is - set but never used; this grammar has no error-recovery rules. */ - (void) yynerrs; -} - -%token PLUS; -%token MINUS; -%token TIMES; -%token DIVIDE; -%token MOD; -%token POW; -%token ASSIGN; -%token EQUALS; -%token NOTEQUALS; -%token LESS; -%token LESSEQ; -%token GREATER; -%token GREATEREQ; -%token AND -%token OR -%token NOT; - -%token SEMICOLON; -%token COLON; -%token QUESTION; -%token DOLLAR; -%token DOT; -%token COMMA; - -%token LCURLY; -%token RCURLY; -%token LBRACKET; -%token RBRACKET; -%token LPAREN; -%token RPAREN; - -%token REAL_NUMBER; -%token STRING; - -%token AMBIENT; -%token AMBIENT_OCCLUSION; -%token BOX; -%token CAMERA; -%token COLOR; -%token CYL; -%token DEFINE; -%token DIFFUSE; -%token EXPOSURE; -%token EXTRUDE; -%token HEIGHT; -%token INTERSECT; -%token JITTER; -%token LIGHT; -%token LOOKAT; -%token MATERIAL; -%token MAXDEPTH; -%token MULTISAMPLE; -%token NGON; -%token OFFSET; -%token OPTIONS; -%token PLANE; -%token POLYGON; -%token POSITION; -%token RADIUS; -%token REFLECTANCE; -%token REFRACTION; -%token ROTATE; -%token SCALE; -%token SCENE; -%token SHAPE; -%token SHININESS; -%token SIZE; -%token SPECULAR; -%token SPHERE; -%token SUBTRACT; -%token TEXTURE; -%token TRANSLATE; -%token TRANSPARENCY; -%token UNION; -%token UP; -%token VFOV; -%token WIDTH; - -%token IDENTIFIER; -%token VARREF; - -%token ELSE; -%token ELSIF; -%token FOR; -%token IF; -%token WHILE; -%token LOCAL; - -%right ASSIGN -%left AND OR NOT -%left PLUS MINUS -%left TIMES DIVIDE MOD -%right POW -%left UMINUS - -%% - -scene: SCENE LCURLY general_items RCURLY { - $$ = new SceneNode(); - $$->addChildren($3); - parsed_scene_node = $$; - } - ; - -box: BOX LCURLY general_items RCURLY { - $$ = new BoxNode(); - $$->addChildren($3); - } - ; - -camera: CAMERA LCURLY general_items RCURLY { - $$ = new CameraNode(); - $$->addChildren($3); - } - ; - -cyl: CYL LCURLY general_items RCURLY { - $$ = new CylNode(); - $$->addChildren($3); - } - ; - -extrude: EXTRUDE LCURLY general_items RCURLY { - $$ = new ExtrudeNode(); - $$->addChildren($3); - } - ; - -general_items: /* empty */ { $$ = NULL; } - | general_item general_items { - $$ = new ItemsNode(); - $$->addChild($1); - $$->addChildren($2); - } - ; - -general_item: AMBIENT vector3 { $$ = new AmbientNode($2); } - | AMBIENT_OCCLUSION expression { - $$ = new AmbientOcclusionNode($2); - } - | camera { $$ = $1; } - | COLOR vector3 { $$ = new ColorNode($2); } - | DIFFUSE vector3 { $$ = new DiffuseNode($2); } - | EXPOSURE expression { $$ = new ExposureNode($2); } - | for { $$ = $1; } - | HEIGHT expression { $$ = new HeightNode($2); } - | if { $$ = $1; } - | JITTER expression { $$ = new JitterNode($2); } - | light { $$ = $1; } - | LOOKAT vector3 { $$ = new LookAtNode($2); } - | material { $$ = $1; } - | material_definition { $$ = $1; } - | material_ref { $$ = $1; } - | MAXDEPTH expression { $$ = new MaxDepthNode($2); } - | MULTISAMPLE expression { $$ = new MultisampleNode($2); } - | ngon { $$ = $1; } - | offset { $$ = $1; } - | options { $$ = $1; } - | polygon { $$ = $1; } - | POSITION vector3 { $$ = new PositionNode($2); } - | POSITION vector3 COMMA expression { - $$ = new PlanePositionNode($2, $4); - } - | RADIUS expression { $$ = new RadiusNode($2); } - | REFLECTANCE expression { $$ = new ReflectanceNode($2); } - | REFRACTION expression { $$ = new RefractionNode($2); } - | ROTATE expression COMMA vector3 { $$ = new RotateNode($2, $4); } - | SCALE expression { $$ = new ScaleNode(new ScaleScalarNode($2)); } - | SCALE vector2 { $$ = new ScaleNode($2); } - | SCALE vector3 { $$ = new ScaleNode($2); } - | shape { $$ = $1; } - | shape_definition { $$ = $1; } - | SHININESS expression { $$ = new ShininessNode($2); } - | SIZE vector3 { $$ = new SizeNode($2); } - | SPECULAR vector3 { $$ = new SpecularNode($2); } - | stmt_expression { $$ = $1; } - | TEXTURE STRING { $$ = new TextureNode($2->getString()); } - | transform_block { $$ = $1; } - | TRANSLATE vector3 { $$ = new TranslateNode($2); } - | TRANSPARENCY expression { $$ = new TransparencyNode($2); } - | UP vector3 { $$ = new UpNode($2); } - | vector2 { $$ = $1; } - | VFOV expression { $$ = new VFOVNode($2); } - | while { $$ = $1; } - | WIDTH expression { $$ = new WidthNode($2); } - ; - - -intersect: INTERSECT LCURLY general_items RCURLY { - $$ = new IntersectNode(); - $$->addChildren($3); - } - ; - -light: LIGHT LCURLY general_items RCURLY { - $$ = new LightNode(); - $$->addChildren($3); - } - ; - -material: MATERIAL LCURLY general_items RCURLY { - $$ = new MaterialNode(); - $$->addChildren($3); - } - ; - -material_definition: DEFINE MATERIAL IDENTIFIER LCURLY general_items RCURLY { - $$ = new MaterialDefinitionNode($3->getString()); - $$->addChildren($5); - } - ; - -material_ref: MATERIAL IDENTIFIER { - $$ = new MaterialRefNode($2->getString()); - } - ; - -number: REAL_NUMBER { $$ = $1; } - ; - -ngon: NGON expression COMMA expression { - $$ = new NGonNode($2); - $$->addChild(new RadiusNode($4)); - } - ; - -offset: OFFSET expression { - $$ = new OffsetNode($2); - } - | OFFSET expression LCURLY general_items RCURLY { - $$ = new OffsetNode($2); - $$->addChildren($4); - } - ; - -options: OPTIONS LCURLY general_items RCURLY { - $$ = new OptionsNode(); - $$->addChildren($3); - } - ; - -plane: PLANE LCURLY general_items RCURLY { - $$ = new PlaneNode(); - $$->addChildren($3); - } - ; - -polygon: POLYGON LCURLY general_items RCURLY { - $$ = new PolygonNode(); - $$->addChildren($3); - } - ; - -shape: plane { $$ = $1; } - | sphere { $$ = $1; } - | box { $$ = $1; } - | cyl { $$ = $1; } - | union { $$ = $1; } - | intersect { $$ = $1; } - | subtract { $$ = $1; } - | extrude { $$ = $1; } - | shape_ref { $$ = $1; } - ; - -shape_definition: DEFINE SHAPE IDENTIFIER shape { - $$ = new ShapeDefinitionNode($3->getString()); - $$->addChild($4); - } - ; - -shape_ref: SHAPE IDENTIFIER shape_ref_more { - $$ = new ShapeRefNode($2->getString()); - $$->addChildren($3); - } - ; - -shape_ref_more: /* empty */ { $$ = NULL; } - | LCURLY general_items RCURLY { $$ = $2; } - ; - -sphere: SPHERE LCURLY general_items RCURLY { - $$ = new SphereNode(); - $$->addChildren($3); - } - ; - -subtract: SUBTRACT LCURLY general_items RCURLY { - $$ = new SubtractNode(); - $$->addChildren($3); - } - ; - -transform_block: TRANSLATE vector3 LCURLY general_items RCURLY { - $$ = new TranslateBlockNode($2); - $$->addChildren($4); - } - | ROTATE expression COMMA vector3 LCURLY general_items RCURLY { - $$ = new RotateBlockNode($2, $4); - $$->addChildren($6); - } - | SCALE vector3 LCURLY general_items RCURLY { - $$ = new ScaleBlockNode($2); - $$->addChildren($4); - } - | SCALE expression LCURLY general_items RCURLY { - $$ = new ScaleBlockNode(new ScaleScalarNode($2)); - $$->addChildren($4); - } - ; - -union: UNION LCURLY general_items RCURLY { - $$ = new UnionNode(); - $$->addChildren($3); - } - ; - -vector2: LESS expression COMMA expression GREATER { - $$ = new VectorNode($2, $4, new NumberNode(0.0)); - } - ; - -vector3: LESS expression COMMA expression COMMA expression GREATER { - $$ = new VectorNode($2, $4, $6); - } - ; - -expression: expression TIMES expression { $$ = new BinOpNode('*', $1, $3); } - | expression DIVIDE expression { $$ = new BinOpNode('/', $1, $3); } - | expression PLUS expression { $$ = new BinOpNode('+', $1, $3); } - | expression MINUS expression { $$ = new BinOpNode('-', $1, $3); } - | expression MOD expression { $$ = new BinOpNode('%', $1, $3); } - | expression POW expression { $$ = new BinOpNode('^', $1, $3); } - | MINUS expression %prec UMINUS { - $$ = new BinOpNode('-', new NumberNode(0.0), $2); - } - | stmt_expression { $$ = $1; } - | function_call { $$ = $1; } - | number { $$ = $1; } - | VARREF { $$ = $1; } - | LPAREN expression RPAREN { $$ = $2; } - ; - -maybe_expression: /* empty */ { $$ = NULL; } - | expression { $$ = $1; } - ; - -stmt_expression: assignment { $$ = $1; } - | local_assignment { $$ = $1; } - | local_decl { $$ = $1; } - ; - -bool_expression: expression LESS expression { - $$ = new BoolExpressionNode('<', $1, $3); - } - | expression LESSEQ expression { - $$ = new BoolExpressionNode('l', $1, $3); - } - | expression GREATER expression { - $$ = new BoolExpressionNode('>', $1, $3); - } - | expression GREATEREQ expression { - $$ = new BoolExpressionNode('g', $1, $3); - } - | expression EQUALS expression { - $$ = new BoolExpressionNode('=', $1, $3); - } - | expression NOTEQUALS expression { - $$ = new BoolExpressionNode('n', $1, $3); - } - | bool_expression AND bool_expression { - $$ = new BoolExpressionNode('&', $1, $3); - } - | bool_expression OR bool_expression { - $$ = new BoolExpressionNode('|', $1, $3); - } - | NOT bool_expression { - $$ = new BoolExpressionNode('!', $2, NULL); - } - | LPAREN bool_expression RPAREN { - $$ = $2; - } - ; - -assignment: VARREF ASSIGN expression { - $$ = new AssignmentNode($1, $3); - } - ; - -local_assignment: LOCAL VARREF ASSIGN expression { - $$ = new LocalAssignmentNode($2, $4); - } - ; - -local_decl: LOCAL VARREF { - $$ = new LocalDeclNode($2); - } - ; - -for: FOR LPAREN maybe_expression SEMICOLON bool_expression SEMICOLON maybe_expression RPAREN LCURLY general_items RCURLY { - $$ = new ForNode($3, $5, $7); - $$->addChildren($10); - } - ; - -while: WHILE LPAREN bool_expression RPAREN LCURLY general_items RCURLY { - $$ = new ForNode(NULL, $3, NULL); - $$->addChildren($6); - } - ; - -if: IF LPAREN bool_expression RPAREN LCURLY general_items RCURLY if_more { - $$ = new IfNode($3, $8); - $$->addChildren($6); - } - ; - -if_more: /* empty */ { $$ = NULL; } - | ELSIF LPAREN bool_expression RPAREN LCURLY general_items RCURLY if_more { - $$ = new IfNode($3, $8); - $$->addChildren($6); - } - | ELSE LCURLY general_items RCURLY { - $$ = new ElseNode(); - $$->addChildren($3); - } - ; - -function_call: IDENTIFIER LPAREN function_call_parameters RPAREN { - $$ = new FunctionCallNode($1, $3); - } - ; - -function_call_parameters: /* empty */ { $$ = NULL; } - | expression function_call_more_parameters { - $$ = new ItemsNode(); - $$->addChild($1); - $$->addChildren($2); - } - ; - -function_call_more_parameters: /* empty */ { $$ = NULL; } - | COMMA expression function_call_more_parameters { - $$ = new ItemsNode(); - $$->addChild($2); - $$->addChildren($3); - } - ; - -%% - -refptr parse(const char * fileName, refptr scope) -{ - parser_scope = scope; - - yyin = fopen(fileName, "r"); - if (yyin == NULL) - { - cerr << "Failed to open file '" << fileName << "'" << endl; - return refptr(NULL); - } - if (yyparse()) - { - cerr << "Aborting." << endl; - exit(1); - } - return parsed_scene_node; -} - -void errFunc(const char * str, YYLTYPE * yyllocp) -{ - fprintf(stderr, "error: %s: line %d, column %d\n", - str, - yyllocp->first_line, - yyllocp->first_column); -} diff --git a/src/parser/preparser.cc b/src/parser/preparser.cc deleted file mode 100644 index 2471a9d..0000000 --- a/src/parser/preparser.cc +++ /dev/null @@ -1,34 +0,0 @@ - -#include -#include -#include -#include -#include -using namespace std; - -int preprocess(const char * fileName) -{ - struct stat st; - if (stat(fileName, &st)) - { - cerr << "Error accessing " << fileName << endl; - return -1; - } - - ifstream ifs(fileName); - - if ( ! ifs.is_open() ) - { - cerr << "Error opening " << fileName << endl; - return -2; - } - - char * buff = new char[st.st_size]; - while ( ! ifs.eof() ) - { - ifs.getline(buff, st.st_size); - } - delete[] buff; - - return 0; -} diff --git a/src/shapes/BoolShape.cc b/src/shapes/BoolShape.cc deleted file mode 100644 index 3695963..0000000 --- a/src/shapes/BoolShape.cc +++ /dev/null @@ -1,9 +0,0 @@ - -#include "BoolShape.h" - -void BoolShape::setMaterial(refptr material) -{ - m_material = material; - m_shape1->setMaterial(material); - m_shape2->setMaterial(material); -} diff --git a/src/shapes/BoolShape.h b/src/shapes/BoolShape.h deleted file mode 100644 index f95f176..0000000 --- a/src/shapes/BoolShape.h +++ /dev/null @@ -1,19 +0,0 @@ - -#ifndef BOOLSHAPE_H -#define BOOLSHAPE_H BOOLSHAPE_H - -#include "Shape.h" - -class BoolShape : public Shape -{ - public: - virtual IntersectionList intersect(refptr _this, const Ray & ray) = 0; - virtual void setMaterial(refptr material); - virtual refptr clone() = 0; - - protected: - refptr m_shape1; - refptr m_shape2; -}; - -#endif diff --git a/src/shapes/Box.cc b/src/shapes/Box.cc deleted file mode 100644 index 12d0a75..0000000 --- a/src/shapes/Box.cc +++ /dev/null @@ -1,111 +0,0 @@ - -#include "Box.h" -#include "util/Solver.h" -#include -#include -using namespace std; - -#define FP_EQUAL(x,y) (fabs((x)-(y)) < 0.000001) - -Box::Box(refptr size) -{ - m_size = *size; - m_size[0] = fabs(m_size[0]) / 2.0; - m_size[1] = fabs(m_size[1]) / 2.0; - m_size[2] = fabs(m_size[2]) / 2.0; -} - -Shape::IntersectionList Box::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - - IntersectionList res; - - /*** optimization ***/ - if (ray_inv.getOrigin()[0] > m_size[0]) - { - if (ray_inv.getDirection() % Vector::X > 0) - return res; - } - else if (ray_inv.getOrigin()[0] < -m_size[0]) - { - if (ray_inv.getDirection() % Vector::X < 0) - return res; - } - if (ray_inv.getOrigin()[1] > m_size[1]) - { - if (ray_inv.getDirection() % Vector::Y > 0) - return res; - } - else if (ray_inv.getOrigin()[1] < -m_size[1]) - { - if (ray_inv.getDirection() % Vector::Y < 0) - return res; - } - if (ray_inv.getOrigin()[2] > m_size[2]) - { - if (ray_inv.getDirection() % Vector::Z > 0) - return res; - } - else if (ray_inv.getOrigin()[2] < -m_size[2]) - { - if (ray_inv.getDirection() % Vector::Z < 0) - return res; - } - /*** end optimization ***/ - - /* - * Ray equation: R = R0 + tRd - * x = R0x + tRdx - * y = R0y + tRdy - * z = R0z + tRdz - * Side equation: x - size_x = 0 - * Combined: R0x + (t)Rdx - size_x = 0 - */ - for (int dim = 0; dim < 3; dim++) - { - for (int side = -1; side <= 1; side += 2) - { - LinearSolver solver(ray_inv.getDirection()[dim], - ray_inv.getOrigin()[dim] - + side * m_size[dim]); - Solver::Result solutions = solver.solve(); - for (int i = 0; i < solutions.numResults; i++) - { - if (solutions.results[i] >= 0.0) - { - Vector isect_point = ray_inv[solutions.results[i]]; - if ( (dim == 0 || fabs(isect_point[0]) <= m_size[0]) - && (dim == 1 || fabs(isect_point[1]) <= m_size[1]) - && (dim == 2 || fabs(isect_point[2]) <= m_size[2]) ) - { - Vector normal(0, 0, -1); - - if ( FP_EQUAL(isect_point[0], m_size[0]) ) - normal = Vector(1, 0, 0); - else if ( FP_EQUAL(isect_point[0], -m_size[0]) ) - normal = Vector(-1, 0, 0); - else if ( FP_EQUAL(isect_point[1], m_size[1]) ) - normal = Vector(0, 1, 0); - else if ( FP_EQUAL(isect_point[1], -m_size[1]) ) - normal = Vector(0, -1, 0); - else if ( FP_EQUAL(isect_point[2], m_size[2]) ) - normal = Vector(0, 0, 1); - - res.add(Intersection(_this, - m_transform.transform_point(isect_point), - m_transform.transform_normal(normal)) - ); - } - } - } - } - } - - return res; -} - -refptr Box::clone() -{ - return new Box(*this); -} diff --git a/src/shapes/Box.h b/src/shapes/Box.h deleted file mode 100644 index c474be7..0000000 --- a/src/shapes/Box.h +++ /dev/null @@ -1,19 +0,0 @@ - -#ifndef BOX_H -#define BOX_H BOX_H - -#include "Shape.h" - -class Box : public Shape -{ - public: - Box(refptr size); - IntersectionList intersect(refptr _this, const Ray & ray); - virtual refptr clone(); - - protected: - Vector m_size; -}; - -#endif - diff --git a/src/shapes/Cyl.cc b/src/shapes/Cyl.cc deleted file mode 100644 index bb4ec33..0000000 --- a/src/shapes/Cyl.cc +++ /dev/null @@ -1,141 +0,0 @@ - -#include "Cyl.h" -#include "util/Solver.h" -#include -#include -using namespace std; - -#define FP_EQUAL(x,y) (fabs((x)-(y)) < 0.000001) - -Cyl::Cyl(double bottom_radius, double top_radius, double height) -{ - m_bottom_radius = fabs(bottom_radius); - m_bottom_radius_2 = bottom_radius * bottom_radius; - m_top_radius = fabs(top_radius); - m_top_radius_2 = top_radius * top_radius; - m_height = fabs(height); - if (m_height == 0.0) - m_height = 1.0; - m_slope = (m_top_radius - m_bottom_radius) / m_height; /* rise over run */ - if ( ! FP_EQUAL(m_slope, 0.0) ) - m_inv_slope = -1.0 / m_slope; -} - -Shape::IntersectionList Cyl::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - IntersectionList res; - - /* First intersect with the bottom plane, if it has positive area */ - if (m_bottom_radius > 0.0) - { - LinearSolver solver(-ray_inv.getDirection()[2], - -ray_inv.getOrigin()[2]); - Solver::Result solutions = solver.solve(); - if (solutions.numResults > 0 && solutions.results[0] > 0.0) - { - Vector isect_point = ray_inv[solutions.results[0]]; - if (isect_point[0]*isect_point[0] + isect_point[1]*isect_point[1] - <= m_bottom_radius_2) - { - res.add(Intersection(_this, - m_transform.transform_point(isect_point), - m_transform.transform_normal(Vector(0, 0, -1)))); - } - } - } - - /* Same for the top plane */ - if (m_top_radius > 0.0) - { - LinearSolver solver(ray_inv.getDirection()[2], - ray_inv.getOrigin()[2] - m_height); - Solver::Result solutions = solver.solve(); - if (solutions.numResults > 0 && solutions.results[0] > 0.0) - { - Vector isect_point = ray_inv[solutions.results[0]]; - if (isect_point[0]*isect_point[0] + isect_point[1]*isect_point[1] - <= m_top_radius_2) - { - res.add(Intersection(_this, - m_transform.transform_point(isect_point), - m_transform.transform_normal(Vector(0, 0, 1)))); - } - } - } - - /* - * Now see if the ray hit the side of the cylinder/cone thingy - * Ray equation: R = R0 + tRd - * x = R0x + tRdx - * y = R0y + tRdy - * z = R0z + tRdz - * Side equation: x^2 + y^2 = (m*z + b)^2 - * Combined: (R0x+t*Rdx)^2 + (R0y+t*Rdy)^2 = (m*(R0z+t*Rdz) + b)^2 - * Expanded: (R0x*R0x + (t*t)*Rdx*Rdx + 2*R0x*t*Rdx) - * + (R0y*R0y + (t*t)*Rdy*Rdy + 2*R0y*t*Rdy) - * = ((m*R0z+m*t*Rdz)^2 + b*b + 2*m*(R0z+t*Rdz)*b) - * = ((m*R0z*m*R0z + m*m*t*t*Rdz*Rdz + 2*m*R0z*m*t*Rdz) - * + b*b + 2*m*R0z*b + 2*m*t*Rdz*b) - * Quadratic form: (t*t)(Rdx*Rdx + Rdy*Rdy - m*m*Rdz*Rdz) - * + (t)(2*R0x*Rdx + 2*R0y*Rdy - 2*m*R0z*m*Rdz - 2*m*Rdz*b) - * + (R0x*R0x + R0y*R0y - m*m*R0z*R0z - b*b - 2*m*R0z*b) - * = 0 - */ - double Rdx = ray_inv.getDirection()[0]; - double Rdy = ray_inv.getDirection()[1]; - double Rdz = ray_inv.getDirection()[2]; - double R0x = ray_inv.getOrigin()[0]; - double R0y = ray_inv.getOrigin()[1]; - double R0z = ray_inv.getOrigin()[2]; - double m = m_slope; - double m2 = m*m; - double b = m_bottom_radius; - QuadraticSolver solver(Rdx * Rdx + Rdy * Rdy - m2 * Rdz * Rdz, - 2.0 * (R0x*Rdx + R0y*Rdy - m2*R0z*Rdz - m*Rdz*b), - R0x*R0x + R0y*R0y - m2*R0z*R0z - b*b - 2*m*R0z*b); - - Solver::Result solutions = solver.solve(); - for (int i = 0; i < solutions.numResults; i++) - { - if (solutions.results[i] >= 0.0) - { - Vector isect_point = ray_inv[solutions.results[i]]; - if (isect_point[2] > 0.0 && isect_point[2] < m_height) - { - Vector normal; - - if ( FP_EQUAL(m_slope, 0.0) ) - { - normal = Vector(isect_point[0], isect_point[1], 0.0); - } - else - { - double x = isect_point[0]; - double y = isect_point[1]; - double dist = sqrt( isect_point[0] * isect_point[0] - + isect_point[1] * isect_point[1] ); - if (dist > 0.0) - { - double scale = 1.0 / dist; - x *= scale; - y *= scale; - } - normal = Vector(x, y, m_inv_slope); - } - normal.normalize(); - - res.add(Intersection(_this, - m_transform.transform_point(isect_point), - m_transform.transform_normal(normal))); - } - } - } - - return res; -} - -refptr Cyl::clone() -{ - return new Cyl(*this); -} diff --git a/src/shapes/Cyl.h b/src/shapes/Cyl.h deleted file mode 100644 index f0873c5..0000000 --- a/src/shapes/Cyl.h +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef CYL_H -#define CYL_H CYL_H - -#include "Shape.h" - -class Cyl : public Shape -{ - public: - Cyl(double bottom_radius, double top_radius, double height); - IntersectionList intersect(refptr _this, const Ray & ray); - virtual refptr clone(); - - protected: - double m_bottom_radius; - double m_bottom_radius_2; - double m_top_radius; - double m_top_radius_2; - double m_height; - double m_slope; - double m_inv_slope; -}; - -#endif - diff --git a/src/shapes/Extrude.cc b/src/shapes/Extrude.cc deleted file mode 100644 index 9fb697b..0000000 --- a/src/shapes/Extrude.cc +++ /dev/null @@ -1,267 +0,0 @@ - -#include - -#include -#include /* sort() */ - -#include "Extrude.h" -#include "util/Polygon.h" -#include "util/Solver.h" - -using namespace std; - -#define FP_EQUAL(x,y) (fabs((x)-(y)) < 0.000001) - -Extrude::Extrude() -{ -} - -class IntersectListComparator -{ - public: - IntersectListComparator(Vector start) : m_start(start) {} - bool operator()(const Shape::Intersection & i1, - const Shape::Intersection & i2) const - { - double d1 = (i1.position - m_start).mag2(); - double d2 = (i2.position - m_start).mag2(); - return d1 < d2; - } - protected: - Vector m_start; -}; - -Shape::IntersectionList Extrude::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - IntersectionList res; - - /*** optimization ***/ - if (ray_inv.getOrigin()[0] > m_aabb.max[0]) - { - if (ray_inv.getDirection() % Vector::X > 0) - return res; - } - else if (ray_inv.getOrigin()[0] < m_aabb.min[0]) - { - if (ray_inv.getDirection() % Vector::X < 0) - return res; - } - if (ray_inv.getOrigin()[1] > m_aabb.max[1]) - { - if (ray_inv.getDirection() % Vector::Y > 0) - return res; - } - else if (ray_inv.getOrigin()[1] < m_aabb.min[1]) - { - if (ray_inv.getDirection() % Vector::Y < 0) - return res; - } - if (ray_inv.getOrigin()[2] > m_aabb.max[2]) - { - if (ray_inv.getDirection() % Vector::Z > 0) - return res; - } - else if (ray_inv.getOrigin()[2] < m_aabb.min[2]) - { - if (ray_inv.getDirection() % Vector::Z < 0) - return res; - } - /*** end optimization ***/ - - int n_polygons = m_polygons.size(); - int n_offsets = m_offsets.size(); - - double distance = 0.0; - Vector scale(1.0, 1.0, 1.0); - Vector shift(0.0, 0.0, 0.0); - for (int p = 0; p < n_polygons; p++) - { - refptr polygon = m_polygons[p]; - for (int o = 0; o < n_offsets; o++) - { - Offset & offset = m_offsets[o]; - for (int pt = 0, n_pts = polygon->size(); pt < n_pts; pt++) - { - Vector p1 = scale.mult(*(*polygon)[pt]) + shift; - Vector p2 = scale.mult(*(*polygon)[(pt+1) % n_pts]) + shift; - Vector p3 = scale.mult(offset.scale) - .mult(*(*polygon)[(pt+1) % n_pts]) - + shift + offset.shift; - Vector p4 = scale.mult(offset.scale).mult(*(*polygon)[pt]) - + shift + offset.shift; - p1[2] += distance; - p2[2] += distance; - p3[2] += distance + offset.distance; - p4[2] += distance + offset.distance; - Vector e1 = p2 - p1; - Vector e2 = p3 - p2; - Vector normal = (e1 * e2).normalize(); - double a = normal[0], b = normal[1], c = normal[2]; - double d = -(a * p1[0] + b * p1[1] + c * p1[2]); - LinearSolver solver( a * ray_inv.getDirection()[0] - + b * ray_inv.getDirection()[1] - + c * ray_inv.getDirection()[2], - a * ray_inv.getOrigin()[0] - + b * ray_inv.getOrigin()[1] - + c * ray_inv.getOrigin()[2] - + d); - Solver::Result solutions = solver.solve(); - if (solutions.numResults > 0 && solutions.results[0] > 0.0) - { - Vector ipoint = ray_inv[solutions.results[0]]; - Polygon quad; - quad.add(p1).add(p2).add(p3).add(p4); - if (quad.containsPointConvex(ipoint)) - { - res.add(Intersection(_this, - m_transform.transform_point(ipoint), - m_transform.transform_normal(normal))); - } - } - } - distance += offset.distance; - scale = scale.mult(offset.scale); - shift += offset.shift; - } - } - - double a = 0, b = 0, c = -1.0, d = 0.0; - LinearSolver solver( a * ray_inv.getDirection()[0] - + b * ray_inv.getDirection()[1] - + c * ray_inv.getDirection()[2], - a * ray_inv.getOrigin()[0] - + b * ray_inv.getOrigin()[1] - + c * ray_inv.getOrigin()[2] - + d); - Solver::Result solutions = solver.solve(); - if (solutions.numResults > 0 && solutions.results[0] > 0.0) - { - Vector ipoint = ray_inv[solutions.results[0]]; - for (int p = 0; p < n_polygons; p++) - { - refptr polygon = m_polygons[p]; - if (polygon->containsPoint2D(ipoint)) - { - res.add(Intersection(_this, - m_transform.transform_point(ipoint), - m_transform.transform_normal(Vector(a, b, c)))); - } - } - } - if (scale[0] > 0.0 && scale[1] > 0.0) - { - a = 0, b = 0, c = 1.0, d = -distance; - LinearSolver solver( a * ray_inv.getDirection()[0] - + b * ray_inv.getDirection()[1] - + c * ray_inv.getDirection()[2], - a * ray_inv.getOrigin()[0] - + b * ray_inv.getOrigin()[1] - + c * ray_inv.getOrigin()[2] - + d); - Solver::Result solutions = solver.solve(); - if (solutions.numResults > 0 && solutions.results[0] > 0.0) - { - Vector ipoint = ray_inv[solutions.results[0]]; - for (int p = 0; p < n_polygons; p++) - { - Polygon tp = *m_polygons[p]; - for (int i = 0, sz = tp.size(); i < sz; i++) - { - tp[i] = new Vector(tp[i]->mult(scale) + shift); - (*tp[i])[2] += distance; - } - if (tp.containsPoint2D(ipoint)) - { - res.add(Intersection(_this, - m_transform.transform_point(ipoint), - m_transform.transform_normal(Vector(a, b, c)))); - break; - } - } - } - } - - sort(res.begin(), res.end(), IntersectListComparator(ray.getOrigin())); - - return res; -} - -void Extrude::addPolygon(refptr polygon) -{ - m_polygons.push_back(polygon); - updateAABB(); -} - -void Extrude::addOffset(double distance, - const Vector & scale, const Vector & shift) -{ - m_offsets.push_back(Offset(distance, scale, shift)); - updateAABB(); -} - -void Extrude::updateAABB() -{ - int n_polygons = m_polygons.size(); - int n_offsets = m_offsets.size(); - bool first = true; - double distance = 0.0; - Vector scale(1.0, 1.0, 1.0); - Vector shift(0.0, 0.0, 0.0); - for (int p = 0; p < n_polygons; p++) - { - refptr polygon = m_polygons[p]; - for (int o = 0; o < n_offsets; o++) - { - Offset & offset = m_offsets[o]; - for (int pt = 0, n_pts = polygon->size(); pt < n_pts; pt++) - { - Vector p1 = scale.mult(*(*polygon)[pt]) + shift; - Vector p2 = scale.mult(*(*polygon)[(pt+1) % n_pts]) + shift; - Vector p3 = scale.mult(offset.scale) - .mult(*(*polygon)[(pt+1) % n_pts]) - + shift + offset.shift; - Vector p4 = scale.mult(offset.scale).mult(*(*polygon)[pt]) - + shift + offset.shift; - p1[2] += distance; - p2[2] += distance; - p3[2] += distance + offset.distance; - p4[2] += distance + offset.distance; - if (first) - { - m_aabb.min = p1; - m_aabb.max = p1; - first = false; - } - expandAABB(p1); - expandAABB(p2); - expandAABB(p3); - expandAABB(p4); - } - distance += offset.distance; - scale = scale.mult(offset.scale); - shift += offset.shift; - } - } -} - -void Extrude::expandAABB(const Vector & v) -{ - if (v[0] < m_aabb.min[0]) - m_aabb.min[0] = v[0]; - if (v[0] > m_aabb.max[0]) - m_aabb.max[0] = v[0]; - if (v[1] < m_aabb.min[1]) - m_aabb.min[1] = v[1]; - if (v[1] > m_aabb.max[1]) - m_aabb.max[1] = v[1]; - if (v[2] < m_aabb.min[2]) - m_aabb.min[2] = v[2]; - if (v[2] > m_aabb.max[2]) - m_aabb.max[2] = v[2]; -} - -refptr Extrude::clone() -{ - return new Extrude(*this); -} diff --git a/src/shapes/Extrude.h b/src/shapes/Extrude.h deleted file mode 100644 index 93e63bf..0000000 --- a/src/shapes/Extrude.h +++ /dev/null @@ -1,43 +0,0 @@ - -#ifndef EXTRUDE_H -#define EXTRUDE_H EXTRUDE_H - -#include - -#include "util/Polygon.h" -#include "util/AABB.h" - -#include "Shape.h" - -class Extrude : public Shape -{ - public: - Extrude(); - IntersectionList intersect(refptr _this, const Ray & ray); - void addPolygon(refptr polygon); - void addOffset(double distance, - const Vector & scale, const Vector & shift); - class Offset - { - public: - Offset(double d, const Vector & s, const Vector & p) - : distance(d), scale(s), shift(p) - { - } - double distance; - Vector scale; - Vector shift; - }; - virtual refptr clone(); - - protected: - std::vector< refptr > m_polygons; - std::vector m_offsets; - AABB m_aabb; - - void updateAABB(); - void expandAABB(const Vector & v); -}; - -#endif - diff --git a/src/shapes/Intersect.cc b/src/shapes/Intersect.cc deleted file mode 100644 index e0d2dc8..0000000 --- a/src/shapes/Intersect.cc +++ /dev/null @@ -1,115 +0,0 @@ - -#include "Intersect.h" -#include -using namespace std; - -Intersect::Intersect(const vector< refptr > & shapes) -{ - int num_shapes = shapes.size(); - if (num_shapes > 2) - { - m_shape2 = shapes[num_shapes - 1]; - vector< refptr > rest = shapes; - rest.pop_back(); - m_shape1 = new Intersect(rest); - } - else if (num_shapes == 2) - { - m_shape1 = shapes[0]; - m_shape2 = shapes[1]; - } - else - { - cerr << __FILE__ << ": " << __LINE__ - << ": error: Intersect::Intersect() called with only " - << num_shapes - << " sub-shapes!" - << endl; - exit(4); - } -} - -Shape::IntersectionList Intersect::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - IntersectionList res1 = m_shape1->intersect(m_shape1, ray_inv); - - /*** optimization ***/ - if (res1.size() == 0) - return res1; - /*** end optimization ***/ - - IntersectionList res2 = m_shape2->intersect(m_shape2, ray_inv); - BoolIntersectionList merged(res1, res2, ray_inv.getOrigin()); - - IntersectionList res; - bool in1 = false, in2 = false; - - /* initially go through the merged intersections to see whether - * the ray started inside one of the sub-objects */ - for (int i = 0, sz = merged.size(), saw1 = 0, saw2 = 0; - i < sz && (!saw1 || !saw2); - i++) - { - Vector normal = merged[i].intersection.normal; - double dot = - (ray_inv.getDirection() % normal); - bool back = dot < 0.0; - bool left = merged[i].left; - if (back) - { - if (left && !saw1) - in1 = true; - else if (!left && !saw2) - in2 = true; - } - if (left) - saw1 = 1; - else - saw2 = 1; - } - - bool in_bool = in1 && in2; - for (int i = 0, sz = merged.size(); i < sz; i++) - { - Vector normal = merged[i].intersection.normal; - double dot = - (ray_inv.getDirection() % normal); - bool front = dot > 0.0; - bool left = merged[i].left; - if (front) - { - if (left) - in1 = true; - else - in2 = true; - if (!in_bool && in1 && in2) - { - /* we found an intersection point with the boolean object */ - in_bool = true; - res.add( merged[i].intersection.transform(m_transform) ); - } - } - else - { - if (in_bool && in1 && in2) - { - /* we found an intersection point with the boolean object */ - res.add( merged[i].intersection.transform(m_transform) ); - } - if (left) - in1 = false; - else - in2 = false; - in_bool = false; - } - } - - return res; -} - -refptr Intersect::clone() -{ - Intersect * s = new Intersect(*this); - s->m_shape1 = m_shape1->clone(); - s->m_shape2 = m_shape2->clone(); - return refptr(s); -} diff --git a/src/shapes/Intersect.h b/src/shapes/Intersect.h deleted file mode 100644 index 6d33d8a..0000000 --- a/src/shapes/Intersect.h +++ /dev/null @@ -1,17 +0,0 @@ - -#ifndef INTERSECT_H -#define INTERSECT_H INTERSECT_H - -#include "BoolShape.h" -#include - -class Intersect : public BoolShape -{ - public: - Intersect(const std::vector< refptr > & shapes); - IntersectionList intersect(refptr _this, const Ray & ray); - refptr clone(); -}; - -#endif - diff --git a/src/shapes/Plane.cc b/src/shapes/Plane.cc deleted file mode 100644 index b3afbc0..0000000 --- a/src/shapes/Plane.cc +++ /dev/null @@ -1,57 +0,0 @@ - -#include "Plane.h" -#include "util/Solver.h" -#include -#include -using namespace std; - -Plane::Plane(double a, double b, double c, double d) -{ - m_a = a; - m_b = b; - m_c = c; - m_d = d; - m_normal = Vector(m_a, m_b, m_c); - m_normal.normalize(); -} - -Shape::IntersectionList Plane::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - - IntersectionList res; - /* - * Plane equation: ax + by + cz + d = 0 - * Ray equation: R = R0 + tRd - * x = R0x + tRdx - * y = R0y + tRdy - * z = R0z + tRdz - * Combined: a(R0x + tRdx) + b(R0y + tRdy) + c(R0z + tRdz) + d = 0 - * aR0x + (t)aRdx + bR0y + (t)bRdy + cR0z + (t)cRdz + d = 0 - * (t)(aRdx + bRdy + cRdz) + aR0x + bR0y + cR0z + d = 0 - */ - LinearSolver solver( m_a * ray_inv.getDirection()[0] - + m_b * ray_inv.getDirection()[1] - + m_c * ray_inv.getDirection()[2], - m_a * ray_inv.getOrigin()[0] - + m_b * ray_inv.getOrigin()[1] - + m_c * ray_inv.getOrigin()[2] - + m_d); - Solver::Result solutions = solver.solve(); - if (solutions.numResults > 0) - { - if (solutions.results[0] > 0.0) - { - Vector isect_point = ray_inv[solutions.results[0]]; - res.add(Intersection(_this, - m_transform.transform_point(isect_point), - m_transform.transform_normal(m_normal))); - } - } - return res; -} - -refptr Plane::clone() -{ - return new Plane(*this); -} diff --git a/src/shapes/Plane.h b/src/shapes/Plane.h deleted file mode 100644 index 73aeec1..0000000 --- a/src/shapes/Plane.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef PLANE_H -#define PLANE_H PLANE_H - -#include "Shape.h" - -class Plane : public Shape -{ - public: - Plane(double a, double b, double c, double d); - IntersectionList intersect(refptr _this, const Ray & ray); - virtual refptr clone(); - - protected: - double m_a, m_b, m_c, m_d; - Vector m_normal; -}; - -#endif - diff --git a/src/shapes/Shape.cc b/src/shapes/Shape.cc deleted file mode 100644 index fd9562b..0000000 --- a/src/shapes/Shape.cc +++ /dev/null @@ -1,66 +0,0 @@ - -#include "Shape.h" -#include /* sort() */ -#include -using namespace std; - -static refptr default_material; -static bool default_material_initialized = false; - -Shape::Shape() -{ - if (default_material_initialized == false) - { - default_material = new Material(); - default_material_initialized = true; - } - m_material = default_material; -} - -Shape::~Shape() -{ -} - -void Shape::setMaterial(refptr material) -{ - m_material = material; -} - -class BoolIntersectionComparator -{ - public: - BoolIntersectionComparator(const Vector & refPoint) - { - m_refPoint = refPoint; - } - bool operator()(const Shape::BoolIntersection & i1, - const Shape::BoolIntersection & i2) const - { - return ( m_refPoint.dist_to(i1.intersection.position) - < m_refPoint.dist_to(i2.intersection.position) ); - } - protected: - Vector m_refPoint; -}; - -Shape::BoolIntersectionList::BoolIntersectionList(const IntersectionList & l1, - const IntersectionList & l2, - const Vector & startPoint) -{ - for (size_t i = 0, sz = l1.size(); - i < sz; - i++) - { - m_intersections.push_back( BoolIntersection(l1[i], true) ); - } - for (size_t i = 0, sz = l2.size(); - i < sz; - i++) - { - m_intersections.push_back( BoolIntersection(l2[i], false) ); - } - - sort(m_intersections.begin(), - m_intersections.end(), - BoolIntersectionComparator(startPoint)); -} diff --git a/src/shapes/Shape.h b/src/shapes/Shape.h deleted file mode 100644 index df6d083..0000000 --- a/src/shapes/Shape.h +++ /dev/null @@ -1,131 +0,0 @@ - -#ifndef SHAPE_H -#define SHAPE_H SHAPE_H - -#include "util/Solver.h" -#include "util/Ray.h" -#include "util/Vector.h" -#include "util/Transform.h" -#include "util/Material.h" -#include "util/refptr.h" -#include -#include - -class Shape -{ - public: - class Intersection - { - public: - Intersection() {}; - Intersection(refptr shape, - const Vector & position, - const Vector & normal) - { - this->shape = shape; - this->position = position; - this->normal = normal; - } - refptr shape; - Vector position; - Vector normal; - Intersection transform(Transform & t) - { - return Intersection(shape, - t.transform_point(position), - t.transform_normal(normal)); - } - }; - class BoolIntersection - { - public: - BoolIntersection() {}; - BoolIntersection(const Intersection & intersection, bool left) - { - this->intersection = intersection; - this->left = left; - } - Intersection intersection; - bool left; - }; - class IntersectionList - { - public: - void add(const Intersection & i) - { - m_intersections.push_back(i); - } - Intersection & operator[](int i) - { - return m_intersections[i]; - } - const Intersection & operator[](int i) const - { - return m_intersections[i]; - } - size_t size() const { return m_intersections.size(); } - std::vector::iterator begin() - { - return m_intersections.begin(); - } - std::vector::iterator end() - { - return m_intersections.end(); - } - protected: - std::vector< Intersection > m_intersections; - }; - class BoolIntersectionList - { - public: - BoolIntersectionList(const IntersectionList & l1, - const IntersectionList & l2, - const Vector & startPoint); - BoolIntersection & operator[](int i) - { - return m_intersections[i]; - } - const BoolIntersection & operator[](int i) const - { - return m_intersections[i]; - } - size_t size() const { return m_intersections.size(); } - std::vector::iterator begin() - { - return m_intersections.begin(); - } - std::vector::iterator end() - { - return m_intersections.end(); - } - - protected: - std::vector< BoolIntersection > m_intersections; - }; - - Shape(); - virtual ~Shape(); - virtual IntersectionList intersect(refptr _this, - const Ray & ray) = 0; - virtual refptr clone() = 0; - - void setTransform(const Transform & t) - { - m_transform = t; - m_inverse = m_transform.getInverse(); - } - Transform & getTransform() { return m_transform; } - - virtual void setMaterial(refptr material); - refptr getMaterial() const { return m_material; } - - protected: - Transform m_transform; - Transform m_inverse; - refptr m_material; -}; - -typedef refptr ShapeRef; - -#endif - diff --git a/src/shapes/Sphere.cc b/src/shapes/Sphere.cc deleted file mode 100644 index c8794bd..0000000 --- a/src/shapes/Sphere.cc +++ /dev/null @@ -1,49 +0,0 @@ - -#include "Sphere.h" -#include "util/Solver.h" -#include -#include -using namespace std; - -Sphere::Sphere(double radius) -{ - m_radius = radius; - m_radius2 = radius * radius; -} - -Shape::IntersectionList Sphere::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - - IntersectionList res; - - QuadraticSolver solver(1.0, - 2 * ( ray_inv.getOrigin()[0] * ray_inv.getDirection()[0] - + ray_inv.getOrigin()[1] * ray_inv.getDirection()[1] - + ray_inv.getOrigin()[2] * ray_inv.getDirection()[2] ), - ray_inv.getOrigin()[0] * ray_inv.getOrigin()[0] - + ray_inv.getOrigin()[1] * ray_inv.getOrigin()[1] - + ray_inv.getOrigin()[2] * ray_inv.getOrigin()[2] - - m_radius2); - Solver::Result quadSolutions = solver.solve(); - for (int i = 0; i < quadSolutions.numResults; i++) - { - if (quadSolutions.results[i] >= 0.0) - { - Vector isect_point = ray_inv[quadSolutions.results[i]]; - Vector normal = isect_point; - normal.normalize(); - res.add( - Intersection(_this, - m_transform.transform_point(isect_point), - m_transform.transform_normal(normal)) - ); - } - } - return res; -} - -refptr Sphere::clone() -{ - return new Sphere(*this); -} diff --git a/src/shapes/Sphere.h b/src/shapes/Sphere.h deleted file mode 100644 index 19ce427..0000000 --- a/src/shapes/Sphere.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef SPHERE_H -#define SPHERE_H SPHERE_H - -#include "Shape.h" - -class Sphere : public Shape -{ - public: - Sphere(double radius); - IntersectionList intersect(refptr _this, const Ray & ray); - virtual refptr clone(); - - protected: - double m_radius; - double m_radius2; -}; - -#endif - diff --git a/src/shapes/Subtract.cc b/src/shapes/Subtract.cc deleted file mode 100644 index 5b4eed1..0000000 --- a/src/shapes/Subtract.cc +++ /dev/null @@ -1,115 +0,0 @@ - -#include "Subtract.h" -#include -using namespace std; - -Subtract::Subtract(const vector< refptr > & shapes) -{ - int num_shapes = shapes.size(); - if (num_shapes > 2) - { - m_shape2 = shapes[num_shapes - 1]; - vector< refptr > rest = shapes; - rest.pop_back(); - m_shape1 = new Subtract(rest); - } - else if (num_shapes == 2) - { - m_shape1 = shapes[0]; - m_shape2 = shapes[1]; - } - else - { - cerr << __FILE__ << ": " << __LINE__ - << ": error: Subtract::Subtract() called with only " - << num_shapes - << " sub-shapes!" - << endl; - exit(4); - } -} - -Shape::IntersectionList Subtract::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - IntersectionList res1 = m_shape1->intersect(m_shape1, ray_inv); - - /*** optimization ***/ - if (res1.size() == 0) - return res1; - /*** end optimization ***/ - - IntersectionList res2 = m_shape2->intersect(m_shape2, ray_inv); - BoolIntersectionList merged(res1, res2, ray_inv.getOrigin()); - - IntersectionList res; - bool in1 = false, in2 = false; - - /* initially go through the merged intersections to see whether - * the ray started inside one of the sub-objects */ - for (int i = 0, sz = merged.size(), saw1 = 0, saw2 = 0; - i < sz && (!saw1 || !saw2); - i++) - { - Vector normal = merged[i].intersection.normal; - double dot = - (ray_inv.getDirection() % normal); - bool back = dot < 0.0; - bool left = merged[i].left; - if (back) - { - if (left && !saw1) - in1 = true; - else if (!left && !saw2) - in2 = true; - } - if (left) - saw1 = 1; - else - saw2 = 1; - } - - bool in_bool = in1 && !in2; - for (int i = 0, sz = merged.size(); i < sz; i++) - { - Vector normal = merged[i].intersection.normal; - double dot = - (ray_inv.getDirection() % normal); - bool front = dot > 0.0; - bool left = merged[i].left; - if (left) - in1 = front; - else - in2 = front; - if (!in_bool && in1 && !in2) - { - /* we found an intersection point - * to get into the boolean object */ - in_bool = true; - BoolIntersection bi = merged[i]; - Intersection i = bi.intersection; - if ( ! left ) /* if this point came from object B (A - B) */ - i.normal = - i.normal; - res.add(i.transform(m_transform)); - } - else if (in_bool && !(in1 && !in2)) - { - /* we found an intersection point - * to get out of the boolean object */ - BoolIntersection bi = merged[i]; - Intersection i = bi.intersection; - if ( ! left ) /* if this point came from object B (A - B) */ - i.normal = - i.normal; - res.add(i.transform(m_transform)); - in_bool = false; - } - } - - return res; -} - -refptr Subtract::clone() -{ - Subtract * s = new Subtract(*this); - s->m_shape1 = m_shape1->clone(); - s->m_shape2 = m_shape2->clone(); - return refptr(s); -} diff --git a/src/shapes/Subtract.h b/src/shapes/Subtract.h deleted file mode 100644 index 5faf573..0000000 --- a/src/shapes/Subtract.h +++ /dev/null @@ -1,17 +0,0 @@ - -#ifndef SUBTRACT_H -#define SUBTRACT_H SUBTRACT_H - -#include "BoolShape.h" -#include - -class Subtract : public BoolShape -{ - public: - Subtract(const std::vector< refptr > & shapes); - IntersectionList intersect(refptr _this, const Ray & ray); - refptr clone(); -}; - -#endif - diff --git a/src/shapes/Union.cc b/src/shapes/Union.cc deleted file mode 100644 index e8d81d8..0000000 --- a/src/shapes/Union.cc +++ /dev/null @@ -1,110 +0,0 @@ - -#include "Union.h" -#include -#include -using namespace std; - -Union::Union(const vector< refptr > & shapes) -{ - int num_shapes = shapes.size(); - if (num_shapes > 2) - { - m_shape2 = shapes[num_shapes - 1]; - vector< refptr > rest = shapes; - rest.pop_back(); - m_shape1 = new Union(rest); - } - else if (num_shapes == 2) - { - m_shape1 = shapes[0]; - m_shape2 = shapes[1]; - } - else - { - cerr << __FILE__ << ": " << __LINE__ - << ": error: Union::Union() called with only " - << num_shapes - << " sub-shapes!" - << endl; - exit(4); - } -} - -Shape::IntersectionList Union::intersect(refptr _this, const Ray & ray) -{ - Ray ray_inv = m_inverse.transform_ray(ray); - IntersectionList res1 = m_shape1->intersect(m_shape1, ray_inv); - IntersectionList res2 = m_shape2->intersect(m_shape2, ray_inv); - BoolIntersectionList merged(res1, res2, ray_inv.getOrigin()); - - IntersectionList res; - bool in1 = false, in2 = false; - - /* initially go through the merged intersections to see whether - * the ray started inside one of the sub-objects */ - for (int i = 0, sz = merged.size(), saw1 = 0, saw2 = 0; - i < sz && (!saw1 || !saw2); - i++) - { - Vector normal = merged[i].intersection.normal; - double dot = - (ray_inv.getDirection() % normal); - bool back = dot < 0.0; - bool left = merged[i].left; - if (back) - { - if (left && !saw1) - in1 = true; - else if (!left && !saw2) - in2 = true; - } - if (left) - saw1 = 1; - else - saw2 = 1; - } - - bool in_bool = in1 || in2; - for (int i = 0, sz = merged.size(); i < sz; i++) - { - Vector normal = merged[i].intersection.normal; - double dot = - (ray_inv.getDirection() % normal); - bool front = dot > 0.0; - bool left = merged[i].left; - if (front) - { - if (left) - in1 = true; - else - in2 = true; - if (!in_bool && (in1 || in2)) - { - /* we found an intersection point with the boolean object */ - in_bool = true; - res.add( merged[i].intersection.transform(m_transform) ); - } - } - else - { - if (left) - in1 = false; - else - in2 = false; - if (in_bool && !(in1 || in2)) - { - /* we found an intersection point with the boolean object */ - res.add( merged[i].intersection.transform(m_transform) ); - in_bool = false; - } - } - } - - return res; -} - -refptr Union::clone() -{ - Union * s = new Union(*this); - s->m_shape1 = m_shape1->clone(); - s->m_shape2 = m_shape2->clone(); - return refptr(s); -} diff --git a/src/shapes/Union.h b/src/shapes/Union.h deleted file mode 100644 index 90af728..0000000 --- a/src/shapes/Union.h +++ /dev/null @@ -1,17 +0,0 @@ - -#ifndef UNION_H -#define UNION_H UNION_H - -#include "BoolShape.h" -#include - -class Union : public BoolShape -{ - public: - Union(const std::vector< refptr > & shapes); - IntersectionList intersect(refptr _this, const Ray & ray); - refptr clone(); -}; - -#endif - diff --git a/src/shapes/shapes.h b/src/shapes/shapes.h deleted file mode 100644 index afbbd05..0000000 --- a/src/shapes/shapes.h +++ /dev/null @@ -1,10 +0,0 @@ - -#include "BoolShape.h" -#include "Box.h" -#include "Cyl.h" -#include "Extrude.h" -#include "Intersect.h" -#include "Plane.h" -#include "Sphere.h" -#include "Subtract.h" -#include "Union.h" diff --git a/src/util/AABB.h b/src/util/AABB.h deleted file mode 100644 index b953dda..0000000 --- a/src/util/AABB.h +++ /dev/null @@ -1,21 +0,0 @@ - -#ifndef AABB_H -#define AABB_H - -class AABB -{ - public: - Vector min; - Vector max; - - AABB() - { - } - - AABB(const Vector & min, const Vector & max) - : min(min), max(max) - { - } -}; - -#endif /* AABB_H */ diff --git a/src/util/Color.cc b/src/util/Color.cc deleted file mode 100644 index 92904ac..0000000 --- a/src/util/Color.cc +++ /dev/null @@ -1,17 +0,0 @@ - -#include "Color.h" - -const Color Color::black = Color(0, 0, 0); -const Color Color::white = Color(1, 1, 1); -const Color Color::red = Color(1, 0, 0); -const Color Color::green = Color(0, 1, 0); -const Color Color::blue = Color(0, 0, 1); -const Color Color::yellow = Color(1, 1, 0); -const Color Color::cyan = Color(0, 1, 1); -const Color Color::magenta = Color(1, 0, 1); - -std::ostream & operator<<(std::ostream & out, const Color & color) -{ - out << "[" << color.r << ", " << color.g << ", " << color.b << "]"; - return out; -} diff --git a/src/util/Color.h b/src/util/Color.h deleted file mode 100644 index fccdb53..0000000 --- a/src/util/Color.h +++ /dev/null @@ -1,132 +0,0 @@ - -#ifndef COLOR_H -#define COLOR_H COLOR_H - -#include "refptr.h" -#include -#include "util/Vector.h" - -class Color -{ - public: - double r, g, b; - - Color() - { - r = g = b = 0.0; - } - - Color(double r, double g, double b) - { - this->r = r; - this->g = g; - this->b = b; - } - - Color(const Vector & v) - { - r = v[0]; - g = v[1]; - b = v[2]; - } - - Color(refptr v) - { - r = (*v)[0]; - g = (*v)[1]; - b = (*v)[2]; - } - - Color operator*(const Color & other) const - { - Color result; - result.r = r * other.r; - result.g = g * other.g; - result.b = b * other.b; - return result; - } - - Color operator*(double scale) const - { - return Color(r * scale, g * scale, b * scale); - } - - Color operator/(double scale) const - { - return Color(r / scale, g / scale, b / scale); - } - - Color & operator+=(const Color & other) - { - r += other.r; - g += other.g; - b += other.b; - return *this; - } - - Color & operator-=(const Color & other) - { - r += other.r; - g += other.g; - b += other.b; - return *this; - } - - Color & operator*=(double scale) - { - r *= scale; - g *= scale; - b *= scale; - return *this; - } - - Color & operator*=(const Color & other) - { - r *= other.r; - g *= other.g; - b *= other.b; - return *this; - } - - Color & operator/=(double scale) - { - r /= scale; - g /= scale; - b /= scale; - return *this; - } - - Color & operator/=(const Color & other) - { - r /= other.r; - g /= other.g; - b /= other.b; - return *this; - } - - Color operator+(const Color & c2) - { - return Color(r + c2.r, g + c2.g, b + c2.b); - } - - Color operator-(const Color & c2) - { - return Color(r - c2.r, g - c2.g, b - c2.b); - } - - static const Color black; - static const Color white; - static const Color red; - static const Color green; - static const Color blue; - static const Color yellow; - static const Color cyan; - static const Color magenta; -}; - -static inline Color operator*(double d, const Color & c) { return c * d; } -static inline Color operator/(double d, const Color & c) { return c / d; } -std::ostream & operator<<(std::ostream & out, const Color & color); - -#endif - diff --git a/src/util/Material.h b/src/util/Material.h deleted file mode 100644 index 9d71bff..0000000 --- a/src/util/Material.h +++ /dev/null @@ -1,72 +0,0 @@ - -#ifndef MATERIAL_H -#define MATERIAL_H MATERIAL_H - -#include "Texture.h" -#include "Color.h" - -class Material -{ - public: - Material() - { - m_ambient_color = Color::white; - m_diffuse_color = Color::white; - m_specular_color = Color::white; - m_shininess = 50.0; - m_reflectance = 0.0; - m_transparency = 0.0; - m_refraction = 1.0; - m_texture = NULL; - } - - void setAmbientColor(const Color & ambient) - { - m_ambient_color = ambient; - } - const Color & getAmbientColor() const { return m_ambient_color; } - - void setDiffuseColor(const Color & diffuse) - { - m_diffuse_color = diffuse; - } - const Color & getDiffuseColor() const { return m_diffuse_color; } - - void setSpecularColor(const Color & specular) - { - m_specular_color = specular; - } - const Color & getSpecularColor() const { return m_specular_color; } - - void setShininess(double shininess) { m_shininess = shininess; } - double getShininess() const { return m_shininess; } - - void setReflectance(double reflectance) { m_reflectance = reflectance; } - double getReflectance() const { return m_reflectance; } - - void setRefraction(double refraction) - { - if (refraction > 0.0) - m_refraction = refraction; - } - double getRefraction() const { return m_refraction; } - - void setTransparency(double t) { m_transparency = t; } - double getTransparency() const { return m_transparency; } - - void setTexture(Texture * texture) { m_texture = texture; } - Texture * getTexture() const { return m_texture; } - - protected: - Color m_ambient_color; - Color m_diffuse_color; - Color m_specular_color; - double m_shininess; - double m_reflectance; - double m_refraction; - double m_transparency; - Texture * m_texture; -}; - -#endif - diff --git a/src/util/Matrix.cc b/src/util/Matrix.cc deleted file mode 100644 index ebf11bb..0000000 --- a/src/util/Matrix.cc +++ /dev/null @@ -1,241 +0,0 @@ - -#include "Matrix.h" -#include /* fabs() */ -#include -#include /* setprecision() */ - -#define FP_EQ(x,y) (fabs((x)-(y)) < 0.00001) - -Matrix::Matrix() -{ - /* set matrix to the identity matrix */ - for (int i = 0; i < 4; i++) - { - for (int j = 0; j < 4; j++) - { - m_matrix[i][j] = i == j ? 1.0 : 0.0; - } - } - m_inverse_calculated = false; -} - -Matrix Matrix::identity() -{ - Matrix res; - for (int i = 0; i < 4; i++) - { - for (int j = 0; j < 4; j++) - { - res[i][j] = i == j ? 1.0 : 0.0; - } - } - return res; -} - -/* Formulas from http://www.cvl.iis.u-tokyo.ac.jp/~miyazaki/tech/teche23.html */ -double Matrix::determinant() -{ - return m_matrix[0][0] * m_matrix[1][1] * m_matrix[2][2] * m_matrix[3][3] - + m_matrix[0][0] * m_matrix[1][2] * m_matrix[2][3] * m_matrix[3][1] - + m_matrix[0][0] * m_matrix[1][3] * m_matrix[2][1] * m_matrix[3][2] - + m_matrix[0][1] * m_matrix[1][0] * m_matrix[2][3] * m_matrix[3][2] - - + m_matrix[0][1] * m_matrix[1][2] * m_matrix[2][0] * m_matrix[3][3] - + m_matrix[0][1] * m_matrix[1][3] * m_matrix[2][2] * m_matrix[3][0] - + m_matrix[0][2] * m_matrix[1][0] * m_matrix[2][1] * m_matrix[3][3] - + m_matrix[0][2] * m_matrix[1][1] * m_matrix[2][3] * m_matrix[3][0] - - + m_matrix[0][2] * m_matrix[1][3] * m_matrix[2][0] * m_matrix[3][1] - + m_matrix[0][3] * m_matrix[1][0] * m_matrix[2][2] * m_matrix[3][1] - + m_matrix[0][3] * m_matrix[1][1] * m_matrix[2][0] * m_matrix[3][2] - + m_matrix[0][3] * m_matrix[1][2] * m_matrix[2][1] * m_matrix[3][0] - - - m_matrix[0][0] * m_matrix[1][1] * m_matrix[2][3] * m_matrix[3][2] - - m_matrix[0][0] * m_matrix[1][2] * m_matrix[2][1] * m_matrix[3][3] - - m_matrix[0][0] * m_matrix[1][3] * m_matrix[2][2] * m_matrix[3][1] - - m_matrix[0][1] * m_matrix[1][0] * m_matrix[2][2] * m_matrix[3][3] - - - m_matrix[0][1] * m_matrix[1][2] * m_matrix[2][3] * m_matrix[3][0] - - m_matrix[0][1] * m_matrix[1][3] * m_matrix[2][0] * m_matrix[3][2] - - m_matrix[0][2] * m_matrix[1][0] * m_matrix[2][3] * m_matrix[3][1] - - m_matrix[0][2] * m_matrix[1][1] * m_matrix[2][0] * m_matrix[3][3] - - - m_matrix[0][2] * m_matrix[1][3] * m_matrix[2][1] * m_matrix[3][0] - - m_matrix[0][3] * m_matrix[1][0] * m_matrix[2][1] * m_matrix[3][2] - - m_matrix[0][3] * m_matrix[1][1] * m_matrix[2][2] * m_matrix[3][0] - - m_matrix[0][3] * m_matrix[1][2] * m_matrix[2][0] * m_matrix[3][1]; -} - -/* Formulas from http://www.cvl.iis.u-tokyo.ac.jp/~miyazaki/tech/teche23.html */ -void Matrix::calculateInverse() -{ - if (m_inverse_calculated) - return; - m_inverse_calculated = true; - m_inverse_valid = false; - double det = determinant(); - if (det == 0.0) - return; - m_inverse[0][0] = m_matrix[1][1] * m_matrix[2][2] * m_matrix[3][3] - + m_matrix[1][2] * m_matrix[2][3] * m_matrix[3][1] - + m_matrix[1][3] * m_matrix[2][1] * m_matrix[3][2] - - m_matrix[1][1] * m_matrix[2][3] * m_matrix[3][2] - - m_matrix[1][2] * m_matrix[2][1] * m_matrix[3][3] - - m_matrix[1][3] * m_matrix[2][2] * m_matrix[3][1]; - m_inverse[0][1] = m_matrix[0][1] * m_matrix[2][3] * m_matrix[3][2] - + m_matrix[0][2] * m_matrix[2][1] * m_matrix[3][3] - + m_matrix[0][3] * m_matrix[2][2] * m_matrix[3][1] - - m_matrix[0][1] * m_matrix[2][2] * m_matrix[3][3] - - m_matrix[0][2] * m_matrix[2][3] * m_matrix[3][1] - - m_matrix[0][3] * m_matrix[2][1] * m_matrix[3][2]; - m_inverse[0][2] = m_matrix[0][1] * m_matrix[1][2] * m_matrix[3][3] - + m_matrix[0][2] * m_matrix[1][3] * m_matrix[3][1] - + m_matrix[0][3] * m_matrix[1][1] * m_matrix[3][2] - - m_matrix[0][1] * m_matrix[1][3] * m_matrix[3][2] - - m_matrix[0][2] * m_matrix[1][1] * m_matrix[3][3] - - m_matrix[0][3] * m_matrix[1][2] * m_matrix[3][1]; - m_inverse[0][3] = m_matrix[0][1] * m_matrix[1][3] * m_matrix[2][2] - + m_matrix[0][2] * m_matrix[1][1] * m_matrix[2][3] - + m_matrix[0][3] * m_matrix[1][2] * m_matrix[2][1] - - m_matrix[0][1] * m_matrix[1][2] * m_matrix[2][3] - - m_matrix[0][2] * m_matrix[1][3] * m_matrix[2][1] - - m_matrix[0][3] * m_matrix[1][1] * m_matrix[2][2]; - m_inverse[1][0] = m_matrix[1][0] * m_matrix[2][3] * m_matrix[3][2] - + m_matrix[1][2] * m_matrix[2][0] * m_matrix[3][3] - + m_matrix[1][3] * m_matrix[2][2] * m_matrix[3][0] - - m_matrix[1][0] * m_matrix[2][2] * m_matrix[3][3] - - m_matrix[1][2] * m_matrix[2][3] * m_matrix[3][0] - - m_matrix[1][3] * m_matrix[2][0] * m_matrix[3][2]; - m_inverse[1][1] = m_matrix[0][0] * m_matrix[2][2] * m_matrix[3][3] - + m_matrix[0][2] * m_matrix[2][3] * m_matrix[3][0] - + m_matrix[0][3] * m_matrix[2][0] * m_matrix[3][2] - - m_matrix[0][0] * m_matrix[2][3] * m_matrix[3][2] - - m_matrix[0][2] * m_matrix[2][0] * m_matrix[3][3] - - m_matrix[0][3] * m_matrix[2][2] * m_matrix[3][0]; - m_inverse[1][2] = m_matrix[0][0] * m_matrix[1][3] * m_matrix[3][2] - + m_matrix[0][2] * m_matrix[1][0] * m_matrix[3][3] - + m_matrix[0][3] * m_matrix[1][2] * m_matrix[3][0] - - m_matrix[0][0] * m_matrix[1][2] * m_matrix[3][3] - - m_matrix[0][2] * m_matrix[1][3] * m_matrix[3][0] - - m_matrix[0][3] * m_matrix[1][0] * m_matrix[3][2]; - m_inverse[1][3] = m_matrix[0][0] * m_matrix[1][2] * m_matrix[2][3] - + m_matrix[0][2] * m_matrix[1][3] * m_matrix[2][0] - + m_matrix[0][3] * m_matrix[1][0] * m_matrix[2][2] - - m_matrix[0][0] * m_matrix[1][3] * m_matrix[2][2] - - m_matrix[0][2] * m_matrix[1][0] * m_matrix[2][3] - - m_matrix[0][3] * m_matrix[1][2] * m_matrix[2][0]; - m_inverse[2][0] = m_matrix[1][0] * m_matrix[2][1] * m_matrix[3][3] - + m_matrix[1][1] * m_matrix[2][3] * m_matrix[3][0] - + m_matrix[1][3] * m_matrix[2][0] * m_matrix[3][1] - - m_matrix[1][0] * m_matrix[2][3] * m_matrix[3][1] - - m_matrix[1][1] * m_matrix[2][0] * m_matrix[3][3] - - m_matrix[1][3] * m_matrix[2][1] * m_matrix[3][0]; - m_inverse[2][1] = m_matrix[0][0] * m_matrix[2][3] * m_matrix[3][1] - + m_matrix[0][1] * m_matrix[2][0] * m_matrix[3][3] - + m_matrix[0][3] * m_matrix[2][1] * m_matrix[3][0] - - m_matrix[0][0] * m_matrix[2][1] * m_matrix[3][3] - - m_matrix[0][1] * m_matrix[2][3] * m_matrix[3][0] - - m_matrix[0][3] * m_matrix[2][0] * m_matrix[3][1]; - m_inverse[2][2] = m_matrix[0][0] * m_matrix[1][1] * m_matrix[3][3] - + m_matrix[0][1] * m_matrix[1][3] * m_matrix[3][0] - + m_matrix[0][3] * m_matrix[1][0] * m_matrix[3][1] - - m_matrix[0][0] * m_matrix[1][3] * m_matrix[3][1] - - m_matrix[0][1] * m_matrix[1][0] * m_matrix[3][3] - - m_matrix[0][3] * m_matrix[1][1] * m_matrix[3][0]; - m_inverse[2][3] = m_matrix[0][0] * m_matrix[1][3] * m_matrix[2][1] - + m_matrix[0][1] * m_matrix[1][0] * m_matrix[2][3] - + m_matrix[0][3] * m_matrix[1][1] * m_matrix[2][0] - - m_matrix[0][0] * m_matrix[1][1] * m_matrix[2][3] - - m_matrix[0][1] * m_matrix[1][3] * m_matrix[2][0] - - m_matrix[0][3] * m_matrix[1][0] * m_matrix[2][1]; - m_inverse[3][0] = m_matrix[1][0] * m_matrix[2][2] * m_matrix[3][1] - + m_matrix[1][1] * m_matrix[2][0] * m_matrix[3][2] - + m_matrix[1][2] * m_matrix[2][1] * m_matrix[3][0] - - m_matrix[1][0] * m_matrix[2][1] * m_matrix[3][2] - - m_matrix[1][1] * m_matrix[2][2] * m_matrix[3][0] - - m_matrix[1][2] * m_matrix[2][0] * m_matrix[3][1]; - m_inverse[3][1] = m_matrix[0][0] * m_matrix[2][1] * m_matrix[3][2] - + m_matrix[0][1] * m_matrix[2][2] * m_matrix[3][0] - + m_matrix[0][2] * m_matrix[2][0] * m_matrix[3][1] - - m_matrix[0][0] * m_matrix[2][2] * m_matrix[3][1] - - m_matrix[0][1] * m_matrix[2][0] * m_matrix[3][2] - - m_matrix[0][2] * m_matrix[2][1] * m_matrix[3][0]; - m_inverse[3][2] = m_matrix[0][0] * m_matrix[1][2] * m_matrix[3][1] - + m_matrix[0][1] * m_matrix[1][0] * m_matrix[3][2] - + m_matrix[0][2] * m_matrix[1][1] * m_matrix[3][0] - - m_matrix[0][0] * m_matrix[1][1] * m_matrix[3][2] - - m_matrix[0][1] * m_matrix[1][2] * m_matrix[3][0] - - m_matrix[0][2] * m_matrix[1][0] * m_matrix[3][1]; - m_inverse[3][3] = m_matrix[0][0] * m_matrix[1][1] * m_matrix[2][2] - + m_matrix[0][1] * m_matrix[1][2] * m_matrix[2][0] - + m_matrix[0][2] * m_matrix[1][0] * m_matrix[2][1] - - m_matrix[0][0] * m_matrix[1][2] * m_matrix[2][1] - - m_matrix[0][1] * m_matrix[1][0] * m_matrix[2][2] - - m_matrix[0][2] * m_matrix[1][1] * m_matrix[2][0]; - for (int i = 0; i < 4; i++) - { - for (int j = 0; j < 4; j++) - { - m_inverse[i][j] /= det; - } - } - m_inverse_valid = true; -} - -Matrix Matrix::getInverse() -{ - calculateInverse(); - Matrix m; - for (int i = 0; i < 4; i++) - { - for (int j = 0; j < 4; j++) - { - m.m_matrix[i][j] = m_inverse[i][j]; - m.m_inverse[i][j] = m_matrix[i][j]; - } - } - m.m_inverse_calculated = true; - m.m_inverse_valid = m_inverse_valid; - return m; -} - -Matrix & Matrix::operator*=(const Matrix & other) -{ - Matrix temp = (*this) * other; - (*this) = temp; - return (*this); -} - -bool operator==(const Matrix & m1, const Matrix & m2) -{ - for (int i = 0; i < 4; i++) - { - for (int j = 0; j < 4; j++) - { - if (! FP_EQ(m1[i][j], m2[i][j])) - return false; - } - } - return true; -} - -std::ostream & operator<<(std::ostream & out, const Matrix & m) -{ - out << std::setprecision(3); - for (int i = 0; i < 4; i++) - { - out << (i == 0 ? "[ " : " "); - out << "[ "; - for (int j = 0; j < 4; j++) - { - out << m[i][j]; - if (j < 3) - out << ", "; - } - out << " ]"; - if (i == 3) - out << " ]"; - out << std::endl; - } - return out; -} diff --git a/src/util/Matrix.h b/src/util/Matrix.h deleted file mode 100644 index d03263f..0000000 --- a/src/util/Matrix.h +++ /dev/null @@ -1,75 +0,0 @@ - -#ifndef MATRIX_H -#define MATRIX_H MATRIX_H - -#include "Vector.h" -#include - -class Matrix -{ - public: - Matrix(); - typedef double Matrix_row_t[4]; - Matrix_row_t & operator[](int idx) { return m_matrix[idx]; } - const Matrix_row_t & operator[](int idx) const { return m_matrix[idx]; } - static Matrix identity(); - double determinant(); - Matrix getInverse(); - Matrix & operator*=(const Matrix & other); - - Matrix operator*(const Matrix & m2) const - { - Matrix res; - for (int i = 0; i < 4; i++) - { - for (int j = 0; j < 4; j++) - { - res[i][j] = m_matrix[i][0] * m2.m_matrix[0][j] - + m_matrix[i][1] * m2.m_matrix[1][j] - + m_matrix[i][2] * m2.m_matrix[2][j] - + m_matrix[i][3] * m2.m_matrix[3][j]; - } - } - return res; - } - - /* transform a point */ - Vector operator*(const Vector & v) - { - Vector res; - for (int i = 0; i < 3; i++) - { - res[i] = m_matrix[i][0] * v[0] - + m_matrix[i][1] * v[1] - + m_matrix[i][2] * v[2] - + m_matrix[i][3]; /* v[3] is implicitly 1.0 */ - } - return res; - } - - /* transform a direction */ - Vector operator%(const Vector & v) - { - Vector res; - for (int i = 0; i < 3; i++) - { - res[i] = m_matrix[i][0] * v[0] - + m_matrix[i][1] * v[1] - + m_matrix[i][2] * v[2]; - } - return res; - } - - protected: - double m_matrix[4][4]; - double m_inverse[4][4]; - bool m_inverse_calculated; - bool m_inverse_valid; - void calculateInverse(); -}; - -bool operator==(const Matrix & m1, const Matrix & m2); -std::ostream & operator<<(std::ostream & out, const Matrix & m); - -#endif - diff --git a/src/util/Polygon.cc b/src/util/Polygon.cc deleted file mode 100644 index eab5079..0000000 --- a/src/util/Polygon.cc +++ /dev/null @@ -1,95 +0,0 @@ - -#include /* acos(), M_PI */ - -#include "Polygon.h" - -#define FP_EQUAL(x,y) (fabs((x)-(y)) < 1E-3) - -/* - * from http://local.wasp.uwa.edu.au/~pbourke/geometry/insidepoly/ - * Return the angle between two vectors on a plane - * The angle is from vector 1 to vector 2, positive anticlockwise - * The result is between -pi -> pi -*/ -static double angle2D(double x1, double y1, double x2, double y2) -{ - double dtheta, theta1, theta2; - - theta1 = atan2(y1,x1); - theta2 = atan2(y2,x2); - dtheta = theta2 - theta1; - while (dtheta > M_PI) - dtheta -= 2.0 * M_PI; - while (dtheta < -M_PI) - dtheta += 2.0 * M_PI; - - return dtheta; -} - -static bool similarPoint(const Vector & v, const Vector & w) -{ - return FP_EQUAL(v[0], w[0]) && FP_EQUAL(v[1], w[1]) && FP_EQUAL(v[2], w[2]); -} - -Polygon & Polygon::add(const Vector & v) -{ - int sz = size(); - if (sz < 1 || !similarPoint(v, *(*this)[sz-1])) - { - push_back(new Vector(v)); - } - return *this; -} - -Polygon & Polygon::add(refptr v) -{ - int sz = size(); - if (sz < 1 || !similarPoint(*v, *(*this)[sz-1])) - { - push_back(v); - } - return *this; -} - -bool Polygon::containsPoint2D(const Vector & v) -{ - if (size() < 3) - { - return false; - } - if (similarPoint(*(*this)[0], *(*this)[size()-1])) - { - pop_back(); - } - double angle_sum = 0.0; - for (int i = 0, sz = size(); i < sz; i++) - { - Vector v1 = *(*this)[i] - v; - Vector v2 = *(*this)[(i+1) % sz] - v; - double angle = angle2D(v1[0], v1[1], v2[0], v2[1]); - angle_sum += angle; - } - return FP_EQUAL(angle_sum, 2.0 * M_PI); -} - -bool Polygon::containsPointConvex(const Vector & v) -{ - if (size() < 3) - { - return false; - } - if (similarPoint(*(*this)[0], *(*this)[size()-1])) - { - pop_back(); - } - double angle_sum = 0.0; - for (int i = 0, sz = size(); i < sz; i++) - { - Vector v1 = *(*this)[i] - v; - Vector v2 = *(*this)[(i+1) % sz] - v; - double cosine = (v1 % v2) / (v1.mag() * v2.mag()); - double angle = acos(cosine); - angle_sum += angle; - } - return FP_EQUAL(angle_sum, 2.0 * M_PI); -} diff --git a/src/util/Polygon.h b/src/util/Polygon.h deleted file mode 100644 index 678e8c5..0000000 --- a/src/util/Polygon.h +++ /dev/null @@ -1,19 +0,0 @@ - -#ifndef POLYGON_H -#define POLYGON_H - -#include - -#include "refptr.h" -#include "Vector.h" - -class Polygon : public std::vector< refptr > -{ - public: - Polygon & add(const Vector & v); - Polygon & add(refptr v); - bool containsPoint2D(const Vector & v); - bool containsPointConvex(const Vector & v); -}; - -#endif diff --git a/src/util/Ray.cc b/src/util/Ray.cc deleted file mode 100644 index fe1a509..0000000 --- a/src/util/Ray.cc +++ /dev/null @@ -1,17 +0,0 @@ - -#include /* rand() */ - -#include - -#include "Ray.h" - -Ray Ray::randomRay() -{ - return Ray(Vector(0, 0, 0), Vector::randomVector()); -} - -std::ostream & operator<<(std::ostream & out, const Ray & r) -{ - out << "(" << r.getOrigin() << " -> " << r.getDirection() << ")"; - return out; -} diff --git a/src/util/Ray.h b/src/util/Ray.h deleted file mode 100644 index a38dd60..0000000 --- a/src/util/Ray.h +++ /dev/null @@ -1,58 +0,0 @@ - -#ifndef RAY_H -#define RAY_H RAY_H - -#include "Vector.h" -#include - -class Ray -{ - public: - Ray() - { - } - - Ray(const Vector & origin, const Vector & direction) - : m_origin(origin), m_direction(direction) - { - m_direction.normalize(); - } - - /* - * return a vector for the point at distance dist - * from the ray's origin point, along its direction. - */ - Vector getPositionAt(double dist) const - { - return Vector( - m_origin[0] + dist * m_direction[0], - m_origin[1] + dist * m_direction[1], - m_origin[2] + dist * m_direction[2]); - } - - Ray shift(double amt) - { - return Ray(getPositionAt(amt), m_direction, false); - } - - const Vector & getOrigin() const { return m_origin; } - const Vector & getDirection() const { return m_direction; } - - static Ray randomRay(); - Vector operator[](double dist) const { return getPositionAt(dist); } - - protected: - Ray(const Vector & origin, const Vector & direction, bool no_norm) - : m_origin(origin), m_direction(direction) - { - /* no normalize version */ - } - - Vector m_origin; - Vector m_direction; -}; - -std::ostream & operator<<(std::ostream & out, const Ray & r); - -#endif - diff --git a/src/util/Scope.h b/src/util/Scope.h deleted file mode 100644 index 1c58051..0000000 --- a/src/util/Scope.h +++ /dev/null @@ -1,73 +0,0 @@ - -#ifndef SCOPE_H -#define SCOPE_H - -#include -#include -#include - -class Scope -{ - public: - Scope() { push(); } - bool contains(const std::string & key) - { - for (m_list_type::const_reverse_iterator it = m_list.rbegin(); - it != m_list.rend(); - it++) - { - if (it->find(key) != it->end()) - { - return true; - } - } - return false; - } - double get(const std::string & key) - { - for (m_list_type::reverse_iterator it = m_list.rbegin(); - it != m_list.rend(); - it++) - { - if (it->find(key) != it->end()) - { - return (*it)[key]; - } - } - return 0.0; - } - void putLocal(const std::string & key, double val) - { - (*m_list.rbegin())[key] = val; - } - void putGlobal(const std::string & key, double val) - { - for (m_list_type::reverse_iterator it = m_list.rbegin(); - it != m_list.rend(); - it++) - { - if (it->find(key) != it->end()) - { - (*it)[key] = val; - return; - } - } - putLocal(key, val); - } - void push() - { - m_list.push_back(std::map< std::string, double >()); - } - void pop() - { - if (m_list.size() > 1) - { - m_list.pop_back(); - } - } - protected: - typedef std::list< std::map< std::string, double > > m_list_type; - m_list_type m_list; -}; - -#endif diff --git a/src/util/Solver.cc b/src/util/Solver.cc deleted file mode 100644 index 0e38237..0000000 --- a/src/util/Solver.cc +++ /dev/null @@ -1,127 +0,0 @@ - -#include "Solver.h" -#include - -/* Generic Solver constructor */ -Solver::Solver(double a, double b, double c, double d, double e) -{ - this->a = a; - this->b = b; - this->c = c; - this->d = d; - this->e = e; -} - -Solver::~Solver() -{ -} - -Solver::Result::Result() -{ - numResults = 0; -} - - -/************************************************************************** - * LinearSolver methods * - *************************************************************************/ -LinearSolver::LinearSolver(double a, double b) - : Solver(a, b) -{ -} - -/* solve a linear equation */ -Solver::Result LinearSolver::solve() -{ - /* equation ax + b = 0 */ - Result res; - if (a == 0.0) - { - if (b == 0.0) - { - res.numResults = 1; - res.results[0] = 0.0; - } - else - { - res.numResults = 0; - } - } - else - { - res.numResults = 1; - res.results[0] = -b / a; - } - return res; -} - - -/************************************************************************** - * QuadraticSolver methods * - *************************************************************************/ -QuadraticSolver::QuadraticSolver(double a, double b, double c) - : Solver(a, b, c) -{ -} - -/* solve a quadratic equation */ -Solver::Result QuadraticSolver::solve() -{ - Result res; - double discriminant = b * b - 4 * a * c; - if (discriminant < 0.0) - { - res.numResults = 0; - } - else - { - double sqrt_discriminant = sqrt(discriminant); - double two_a = 2.0 * a; - if (sqrt_discriminant == 0.0) - { - res.numResults = 1; - res.results[0] = (-b) / two_a; - } - else - { - res.numResults = 2; - res.results[0] = (-b - sqrt_discriminant) / two_a; - res.results[1] = (-b + sqrt_discriminant) / two_a; - } - } - - return res; -} - - -/************************************************************************** - * CubicSolver methods * - *************************************************************************/ -CubicSolver::CubicSolver(double a, double b, double c, double d) - : Solver(a, b, c, d) -{ -} - -Solver::Result CubicSolver::solve() -{ - Result res; - /* TODO: fill in */ - return res; -} - - -/************************************************************************** - * QuarticSolver methods * - *************************************************************************/ -QuarticSolver::QuarticSolver(double a, double b, double c, double d, double e) - : Solver(a, b, c, d, e) -{ -} - -Solver::Result QuarticSolver::solve() -{ - Result res; - /* TODO: fill in */ - return res; -} - diff --git a/src/util/Solver.h b/src/util/Solver.h deleted file mode 100644 index ad4b666..0000000 --- a/src/util/Solver.h +++ /dev/null @@ -1,57 +0,0 @@ - -#ifndef SOLVER_H -#define SOLVER_H SOLVER_H - -class Solver -{ - public: - class Result - { - public: - Result(); - int numResults; - double results[4]; - }; - - Solver(double a = 0.0, - double b = 0.0, - double c = 0.0, - double d = 0.0, - double e = 0.0); - virtual ~Solver(); - virtual Result solve() = 0; - - protected: - double a, b, c, d, e; -}; - -class LinearSolver : public Solver -{ - public: - LinearSolver(double a, double b); - Result solve(); -}; - -class QuadraticSolver : public Solver -{ - public: - QuadraticSolver(double a, double b, double c); - Result solve(); -}; - -class CubicSolver : public Solver -{ - public: - CubicSolver(double a, double b, double c, double d); - Result solve(); -}; - -class QuarticSolver : public Solver -{ - public: - QuarticSolver(double a, double b, double c, double d, double e); - Result solve(); -}; - -#endif - diff --git a/src/util/Texture.h b/src/util/Texture.h deleted file mode 100644 index a33f1a7..0000000 --- a/src/util/Texture.h +++ /dev/null @@ -1,16 +0,0 @@ - -#ifndef TEXTURE_H -#define TEXTURE_H TEXTURE_H - -/* A loaded image texture. Pixel data is stored as tightly packed RGBA - * bytes (4 channels) and is owned by this struct -- free it with - * stbi_image_free(). */ -struct Texture -{ - int width; - int height; - int channels; - unsigned char * data; -}; - -#endif diff --git a/src/util/Transform.cc b/src/util/Transform.cc deleted file mode 100644 index dc16242..0000000 --- a/src/util/Transform.cc +++ /dev/null @@ -1,72 +0,0 @@ - -#include "Transform.h" -#include - -void Transform::lookAt(const Vector & eye, - const Vector & focus, - const Vector & up) -{ - Vector forward = focus - eye; - forward.normalize(); - Vector perpendicular_up = (up - up.proj(forward)).normalize(); - Vector right = forward * perpendicular_up; - Matrix mult; - mult[0][0] = right[0]; - mult[0][1] = right[1]; - mult[0][2] = right[2]; - mult[1][0] = forward[0]; - mult[1][1] = forward[1]; - mult[1][2] = forward[2]; - mult[2][0] = perpendicular_up[0]; - mult[2][1] = perpendicular_up[1]; - mult[2][2] = perpendicular_up[2]; - m_matrix *= mult; - translate(-eye[0], -eye[1], -eye[2]); -} - -void Transform::translate(double x, double y, double z) -{ - Matrix t = Matrix::identity(); - t[0][3] = x; - t[1][3] = y; - t[2][3] = z; - m_matrix *= t; -} - -void Transform::rotate(double angle, double xv, double yv, double zv) -{ - /* formula from http://en.wikipedia.org/wiki/Rotation_matrix */ - Vector l(xv, yv, zv); - l.normalize(); - - double c = cos(M_PI * angle / 180.0); - double s = sin(M_PI * angle / 180.0); - - double lx2 = l[0] * l[0]; - double ly2 = l[1] * l[1]; - double lz2 = l[2] * l[2]; - - Matrix t = Matrix::identity(); - t[0][0] = lx2 + (1 - lx2) * c; - t[0][1] = l[0] * l[1] * (1 - c) - l[2] * s; - t[0][2] = l[0] * l[2] * (1 - c) + l[1] * s; - - t[1][0] = l[0] * l[1] * (1 - c) + l[2] * s; - t[1][1] = ly2 + (1 - ly2) * c; - t[1][2] = l[1] * l[2] * (1 - c) - l[0] * s; - - t[2][0] = l[0] * l[2] * (1 - c) - l[1] * s; - t[2][1] = l[1] * l[2] * (1 - c) + l[0] * s; - t[2][2] = lz2 + (1 - lz2) * c; - - m_matrix *= t; -} - -void Transform::scale(double xs, double ys, double zs) -{ - Matrix t = Matrix::identity(); - t[0][0] = xs; - t[1][1] = ys; - t[2][2] = zs; - m_matrix *= t; -} diff --git a/src/util/Transform.h b/src/util/Transform.h deleted file mode 100644 index 37849bd..0000000 --- a/src/util/Transform.h +++ /dev/null @@ -1,72 +0,0 @@ - -#ifndef TRANSFORM_H -#define TRANSFORM_H TRANSFORM_H - -#include "refptr.h" -#include "Matrix.h" -#include "Ray.h" -#include "Vector.h" -#include - -class Transform -{ - public: - Transform getInverse() - { - Transform inv; - inv.m_matrix = m_matrix.getInverse(); - return inv; - } - - void lookAt(const Vector & eye, - const Vector & focus, - const Vector & up); - void translate(double x, double y, double z); - void translate(refptr vec) - { - translate((*vec)[0], (*vec)[1], (*vec)[2]); - } - void rotate(double angle, double xv, double yv, double zv); - void rotate(double angle, refptr vec) - { - rotate(angle, (*vec)[0], (*vec)[1], (*vec)[2]); - } - void scale(double xs, double ys, double zs); - void scale(refptr vec) - { - scale((*vec)[0], (*vec)[1], (*vec)[2]); - } - Matrix & getMatrix() { return m_matrix; } - Vector transform_point(const Vector & v) - { - return m_matrix * v; - } - - Vector transform_direction(const Vector & v) - { - return m_matrix % v; - } - - Vector transform_normal(const Vector & v) - { - return (m_matrix % v).normalize(); - } - - Ray transform_ray(const Ray & r) - { - return Ray(m_matrix * r.getOrigin(), m_matrix % r.getDirection()); - } - - Transform operator*(const Transform & other) const - { - Transform t; - t.m_matrix = m_matrix * other.m_matrix; - return t; - } - - protected: - Matrix m_matrix; -}; - -#endif - diff --git a/src/util/Vector.cc b/src/util/Vector.cc deleted file mode 100644 index 93f09dd..0000000 --- a/src/util/Vector.cc +++ /dev/null @@ -1,29 +0,0 @@ - -#include /* rand() */ -#include - -#include - -#include "Vector.h" - -const Vector Vector::X(1, 0, 0); -const Vector Vector::Y(0, 1, 0); -const Vector Vector::Z(0, 0, 1); - -Vector Vector::randomVector() -{ - double x, y, z; - do - { - x = 2.0 * rand() / RAND_MAX - 1.0; - y = 2.0 * rand() / RAND_MAX - 1.0; - z = 2.0 * rand() / RAND_MAX - 1.0; - } while (x*x + y*y + z*z > 1.0); - return Vector(x, y, z).normalize(); -} - -std::ostream & operator<<(std::ostream & out, const Vector & v) -{ - out << "[" << v[0] << ", " << v[1] << ", " << v[2] << "]"; - return out; -} diff --git a/src/util/Vector.h b/src/util/Vector.h deleted file mode 100644 index 901fc75..0000000 --- a/src/util/Vector.h +++ /dev/null @@ -1,203 +0,0 @@ - -#ifndef VECTOR_H -#define VECTOR_H VECTOR_H - -#include /* sqrt() */ - -#include - -class Vector -{ - public: - Vector() - { - m_array[0] = 0.0; - m_array[1] = 0.0; - m_array[2] = 0.0; - } - - Vector(double x, double y, double z) - { - m_array[0] = x; - m_array[1] = y; - m_array[2] = z; - } - - Vector & normalize() - { - double length = mag(); - m_array[0] /= length; - m_array[1] /= length; - m_array[2] /= length; - return *this; - } - - double mag() const - { - return sqrt(m_array[0] * m_array[0] - + m_array[1] * m_array[1] - + m_array[2] * m_array[2]); - } - - double mag2() const - { - return m_array[0] * m_array[0] - + m_array[1] * m_array[1] - + m_array[2] * m_array[2]; - } - - double dist_to(const Vector & other) const - { - return (other - *this).mag(); - } - - Vector proj(const Vector & target) const - { - Vector target_normalized = target; - target_normalized.normalize(); - return target_normalized * ((*this) % target_normalized); - } - - Vector reflect(const Vector & target) const - { - return (*this) - target * (2 * dot(target)); - } - - /* - * from http://www.flipcode.com/archives/ - * Reflections_and_Refraction_in_Raytracing.shtml - * target: normal vector of surface - * n1: refraction index of object we're coming from - * n2: refraction index of object we're going into - */ - Vector refract(const Vector & target, double n1, double n2) const - { - const double n = n1 / n2; - const double cosI = -dot(target); - const double sinT2 = n * n * (1.0 - cosI * cosI); - if (sinT2 > 1.0) - return Vector(0.0, 0.0, 0.0); - return (*this) * n + target * (n * cosI - sqrt(1.0 - sinT2)); - } - - Vector getPerpendicular() const - { - Vector t = *this; - t.normalize(); - Vector p = t * Vector(0, 0, 1); - if (p.mag() <= 0.1) - { - p = t * Vector(1, 0, 0); - } - return p; - } - - Vector mult(const Vector & v2) const - { - return Vector( - m_array[0] * v2.m_array[0], - m_array[1] * v2.m_array[1], - m_array[2] * v2.m_array[2]); - } - - Vector div(const Vector & v2) const - { - return Vector( - m_array[0] / v2.m_array[0], - m_array[1] / v2.m_array[1], - m_array[2] / v2.m_array[2]); - } - - Vector operator-() const - { - return Vector( - -m_array[0], - -m_array[1], - -m_array[2]); - } - - /* Compute the dot-product of two vectors */ - double dot(const Vector & v2) const - { - return m_array[0] * v2.m_array[0] - + m_array[1] * v2.m_array[1] - + m_array[2] * v2.m_array[2]; - } - double operator%(const Vector & v2) const { return dot(v2); } - - /* Compute the cross-product of two vectors */ - Vector cross(const Vector & v2) const - { - return Vector( - m_array[1] * v2.m_array[2] - m_array[2] * v2.m_array[1], - m_array[2] * v2.m_array[0] - m_array[0] * v2.m_array[2], - m_array[0] * v2.m_array[1] - m_array[1] * v2.m_array[0]); - } - Vector operator*(const Vector & v2) const { return cross(v2); } - - Vector operator+(const Vector & v2) const - { - return Vector( - m_array[0] + v2.m_array[0], - m_array[1] + v2.m_array[1], - m_array[2] + v2.m_array[2]); - } - - Vector operator-(const Vector & v2) const - { - return Vector( - m_array[0] - v2.m_array[0], - m_array[1] - v2.m_array[1], - m_array[2] - v2.m_array[2]); - } - - Vector operator*(double scale) const - { - return Vector( - m_array[0] * scale, - m_array[1] * scale, - m_array[2] * scale); - } - - Vector operator/(double scale) const - { - return Vector( - m_array[0] / scale, - m_array[1] / scale, - m_array[2] / scale); - } - - Vector & operator+=(const Vector & v2) - { - m_array[0] += v2.m_array[0]; - m_array[1] += v2.m_array[1]; - m_array[2] += v2.m_array[2]; - return *this; - } - - Vector & operator-=(const Vector & v2) - { - m_array[0] -= v2.m_array[0]; - m_array[1] -= v2.m_array[1]; - m_array[2] -= v2.m_array[2]; - return *this; - } - - double & operator[](int idx) { return m_array[idx]; } - double operator[](int idx) const { return m_array[idx]; } - - static Vector randomVector(); - - static const Vector X; - static const Vector Y; - static const Vector Z; - - protected: - double m_array[3]; -}; - -std::ostream & operator<<(std::ostream & out, const Vector & v); -static inline Vector operator*(double d, const Vector & v) { return v * d; } -static inline Vector operator/(double d, const Vector & v) { return v / d; } - -#endif diff --git a/src/util/refptr.h b/src/util/refptr.h deleted file mode 100644 index 35bf369..0000000 --- a/src/util/refptr.h +++ /dev/null @@ -1,115 +0,0 @@ - -#ifndef REFPTR_H -#define REFPTR_H REFPTR_H - -#include /* NULL */ -#include /* std::atomic */ - -template -class refptr -{ - public: - refptr(); - refptr(T * ptr); - refptr(const refptr & orig); - refptr & operator=(const refptr & orig); - refptr & operator=(T * ptr); - ~refptr(); - T & operator*() const; - T * operator->() const; - bool isNull() const { return m_ptr == NULL; } - bool operator==(const refptr & right) const; - bool operator!=(const refptr & right) const; - - private: - void cloneFrom(const refptr & orig); - void destroy(); - - T * m_ptr; - /* reference count is atomic so that refptr copies may be made - * concurrently from multiple threads (e.g. the multithreaded - * renderer) without corrupting the count */ - std::atomic * m_refCount; -}; - -template refptr::refptr() -{ - m_ptr = NULL; - m_refCount = NULL; -} - -template refptr::refptr(T * ptr) -{ - m_ptr = ptr; - m_refCount = new std::atomic(1); -} - -template refptr::refptr(const refptr & orig) -{ - cloneFrom(orig); -} - -template refptr & refptr::operator=(const refptr & orig) -{ - destroy(); - cloneFrom(orig); - return *this; -} - -template refptr & refptr::operator=(T * ptr) -{ - destroy(); - m_ptr = ptr; - m_refCount = new std::atomic(1); - return *this; -} - -template void refptr::cloneFrom(const refptr & orig) -{ - this->m_ptr = orig.m_ptr; - this->m_refCount = orig.m_refCount; - if (m_refCount != NULL) - m_refCount->fetch_add(1, std::memory_order_relaxed); -} - -template refptr::~refptr() -{ - destroy(); -} - -template void refptr::destroy() -{ - if (m_refCount != NULL) - { - /* fetch_sub returns the value prior to the decrement; if it was 1 - * then this was the last reference and we own the cleanup */ - if (m_refCount->fetch_sub(1, std::memory_order_acq_rel) == 1) - { - delete m_ptr; - delete m_refCount; - } - } -} - -template T & refptr::operator*() const -{ - return *m_ptr; -} - -template T * refptr::operator->() const -{ - return m_ptr; -} - -template bool refptr::operator==(const refptr & right) const -{ - return m_ptr == right.m_ptr; -} - -template bool refptr::operator!=(const refptr & right) const -{ - return m_ptr != right.m_ptr; -} - -#endif - diff --git a/src/util/stb_image.cc b/src/util/stb_image.cc deleted file mode 100644 index 9ad8c9b..0000000 --- a/src/util/stb_image.cc +++ /dev/null @@ -1,5 +0,0 @@ - -/* Single translation unit that compiles the stb_image implementation. */ - -#define STB_IMAGE_IMPLEMENTATION -#include "stb_image.h" diff --git a/src/util/stb_image.h b/src/util/stb_image.h deleted file mode 100644 index 9eedabe..0000000 --- a/src/util/stb_image.h +++ /dev/null @@ -1,7988 +0,0 @@ -/* stb_image - v2.30 - public domain image loader - http://nothings.org/stb - no warranty implied; use at your own risk - - Do this: - #define STB_IMAGE_IMPLEMENTATION - before you include this file in *one* C or C++ file to create the implementation. - - // i.e. it should look like this: - #include ... - #include ... - #include ... - #define STB_IMAGE_IMPLEMENTATION - #include "stb_image.h" - - You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. - And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free - - - QUICK NOTES: - Primarily of interest to game developers and other people who can - avoid problematic images and only need the trivial interface - - JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) - PNG 1/2/4/8/16-bit-per-channel - - TGA (not sure what subset, if a subset) - BMP non-1bpp, non-RLE - PSD (composited view only, no extra channels, 8/16 bit-per-channel) - - GIF (*comp always reports as 4-channel) - HDR (radiance rgbE format) - PIC (Softimage PIC) - PNM (PPM and PGM binary only) - - Animated GIF still needs a proper API, but here's one way to do it: - http://gist.github.com/urraka/685d9a6340b26b830d49 - - - decode from memory or through FILE (define STBI_NO_STDIO to remove code) - - decode from arbitrary I/O callbacks - - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) - - Full documentation under "DOCUMENTATION" below. - - -LICENSE - - See end of file for license information. - -RECENT REVISION HISTORY: - - 2.30 (2024-05-31) avoid erroneous gcc warning - 2.29 (2023-05-xx) optimizations - 2.28 (2023-01-29) many error fixes, security errors, just tons of stuff - 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes - 2.26 (2020-07-13) many minor fixes - 2.25 (2020-02-02) fix warnings - 2.24 (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically - 2.23 (2019-08-11) fix clang static analysis warning - 2.22 (2019-03-04) gif fixes, fix warnings - 2.21 (2019-02-25) fix typo in comment - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs - 2.19 (2018-02-11) fix warning - 2.18 (2018-01-30) fix warnings - 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings - 2.16 (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes - 2.15 (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC - 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs - 2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes - 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes - 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64 - RGB-format JPEG; remove white matting in PSD; - allocate large structures on the stack; - correct channel count for PNG & BMP - 2.10 (2016-01-22) avoid warning introduced in 2.09 - 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED - - See end of file for full revision history. - - - ============================ Contributors ========================= - - Image formats Extensions, features - Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info) - Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info) - Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG) - Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks) - Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG) - Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip) - Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD) - github:urraka (animated gif) Junggon Kim (PNM comments) - Christopher Forseth (animated gif) Daniel Gibson (16-bit TGA) - socks-the-fox (16-bit PNG) - Jeremy Sawicki (handle all ImageNet JPGs) - Optimizations & bugfixes Mikhail Morozov (1-bit BMP) - Fabian "ryg" Giesen Anael Seghezzi (is-16-bit query) - Arseny Kapoulkine Simon Breuss (16-bit PNM) - John-Mark Allen - Carmelo J Fdez-Aguera - - Bug & warning fixes - Marc LeBlanc David Woo Guillaume George Martins Mozeiko - Christpher Lloyd Jerry Jansson Joseph Thomson Blazej Dariusz Roszkowski - Phil Jordan Dave Moore Roy Eltham - Hayaki Saito Nathan Reed Won Chun - Luke Graham Johan Duparc Nick Verigakis the Horde3D community - Thomas Ruf Ronny Chevalier github:rlyeh - Janez Zemva John Bartholomew Michal Cichon github:romigrou - Jonathan Blow Ken Hamada Tero Hanninen github:svdijk - Eugene Golushkov Laurent Gomila Cort Stratton github:snagar - Aruelien Pocheville Sergio Gonzalez Thibault Reuille github:Zelex - Cass Everitt Ryamond Barbiero github:grim210 - Paul Du Bois Engin Manap Aldo Culquicondor github:sammyhw - Philipp Wiesemann Dale Weiler Oriol Ferrer Mesia github:phprus - Josh Tobin Neil Bickford Matthew Gregan github:poppolopoppo - Julian Raschke Gregory Mullen Christian Floisand github:darealshinji - Baldur Karlsson Kevin Schmidt JR Smith github:Michaelangel007 - Brad Weinberger Matvey Cherevko github:mosra - Luca Sas Alexander Veselov Zack Middleton [reserved] - Ryan C. Gordon [reserved] [reserved] - DO NOT ADD YOUR NAME HERE - - Jacko Dirks - - To add your name to the credits, pick a random blank space in the middle and fill it. - 80% of merge conflicts on stb PRs are due to people adding their name at the end - of the credits. -*/ - -#ifndef STBI_INCLUDE_STB_IMAGE_H -#define STBI_INCLUDE_STB_IMAGE_H - -// DOCUMENTATION -// -// Limitations: -// - no 12-bit-per-channel JPEG -// - no JPEGs with arithmetic coding -// - GIF always returns *comp=4 -// -// Basic usage (see HDR discussion below for HDR usage): -// int x,y,n; -// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); -// // ... process data if not NULL ... -// // ... x = width, y = height, n = # 8-bit components per pixel ... -// // ... replace '0' with '1'..'4' to force that many components per pixel -// // ... but 'n' will always be the number that it would have been if you said 0 -// stbi_image_free(data); -// -// Standard parameters: -// int *x -- outputs image width in pixels -// int *y -- outputs image height in pixels -// int *channels_in_file -- outputs # of image components in image file -// int desired_channels -- if non-zero, # of image components requested in result -// -// The return value from an image loader is an 'unsigned char *' which points -// to the pixel data, or NULL on an allocation failure or if the image is -// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, -// with each pixel consisting of N interleaved 8-bit components; the first -// pixel pointed to is top-left-most in the image. There is no padding between -// image scanlines or between pixels, regardless of format. The number of -// components N is 'desired_channels' if desired_channels is non-zero, or -// *channels_in_file otherwise. If desired_channels is non-zero, -// *channels_in_file has the number of components that _would_ have been -// output otherwise. E.g. if you set desired_channels to 4, you will always -// get RGBA output, but you can check *channels_in_file to see if it's trivially -// opaque because e.g. there were only 3 channels in the source image. -// -// An output image with N components has the following components interleaved -// in this order in each pixel: -// -// N=#comp components -// 1 grey -// 2 grey, alpha -// 3 red, green, blue -// 4 red, green, blue, alpha -// -// If image loading fails for any reason, the return value will be NULL, -// and *x, *y, *channels_in_file will be unchanged. The function -// stbi_failure_reason() can be queried for an extremely brief, end-user -// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS -// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly -// more user-friendly ones. -// -// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. -// -// To query the width, height and component count of an image without having to -// decode the full file, you can use the stbi_info family of functions: -// -// int x,y,n,ok; -// ok = stbi_info(filename, &x, &y, &n); -// // returns ok=1 and sets x, y, n if image is a supported format, -// // 0 otherwise. -// -// Note that stb_image pervasively uses ints in its public API for sizes, -// including sizes of memory buffers. This is now part of the API and thus -// hard to change without causing breakage. As a result, the various image -// loaders all have certain limits on image size; these differ somewhat -// by format but generally boil down to either just under 2GB or just under -// 1GB. When the decoded image would be larger than this, stb_image decoding -// will fail. -// -// Additionally, stb_image will reject image files that have any of their -// dimensions set to a larger value than the configurable STBI_MAX_DIMENSIONS, -// which defaults to 2**24 = 16777216 pixels. Due to the above memory limit, -// the only way to have an image with such dimensions load correctly -// is for it to have a rather extreme aspect ratio. Either way, the -// assumption here is that such larger images are likely to be malformed -// or malicious. If you do need to load an image with individual dimensions -// larger than that, and it still fits in the overall size limit, you can -// #define STBI_MAX_DIMENSIONS on your own to be something larger. -// -// =========================================================================== -// -// UNICODE: -// -// If compiling for Windows and you wish to use Unicode filenames, compile -// with -// #define STBI_WINDOWS_UTF8 -// and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert -// Windows wchar_t filenames to utf8. -// -// =========================================================================== -// -// Philosophy -// -// stb libraries are designed with the following priorities: -// -// 1. easy to use -// 2. easy to maintain -// 3. good performance -// -// Sometimes I let "good performance" creep up in priority over "easy to maintain", -// and for best performance I may provide less-easy-to-use APIs that give higher -// performance, in addition to the easy-to-use ones. Nevertheless, it's important -// to keep in mind that from the standpoint of you, a client of this library, -// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all. -// -// Some secondary priorities arise directly from the first two, some of which -// provide more explicit reasons why performance can't be emphasized. -// -// - Portable ("ease of use") -// - Small source code footprint ("easy to maintain") -// - No dependencies ("ease of use") -// -// =========================================================================== -// -// I/O callbacks -// -// I/O callbacks allow you to read from arbitrary sources, like packaged -// files or some other source. Data read from callbacks are processed -// through a small internal buffer (currently 128 bytes) to try to reduce -// overhead. -// -// The three functions you must define are "read" (reads some bytes of data), -// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). -// -// =========================================================================== -// -// SIMD support -// -// The JPEG decoder will try to automatically use SIMD kernels on x86 when -// supported by the compiler. For ARM Neon support, you must explicitly -// request it. -// -// (The old do-it-yourself SIMD API is no longer supported in the current -// code.) -// -// On x86, SSE2 will automatically be used when available based on a run-time -// test; if not, the generic C versions are used as a fall-back. On ARM targets, -// the typical path is to have separate builds for NEON and non-NEON devices -// (at least this is true for iOS and Android). Therefore, the NEON support is -// toggled by a build flag: define STBI_NEON to get NEON loops. -// -// If for some reason you do not want to use any of SIMD code, or if -// you have issues compiling it, you can disable it entirely by -// defining STBI_NO_SIMD. -// -// =========================================================================== -// -// HDR image support (disable by defining STBI_NO_HDR) -// -// stb_image supports loading HDR images in general, and currently the Radiance -// .HDR file format specifically. You can still load any file through the existing -// interface; if you attempt to load an HDR file, it will be automatically remapped -// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; -// both of these constants can be reconfigured through this interface: -// -// stbi_hdr_to_ldr_gamma(2.2f); -// stbi_hdr_to_ldr_scale(1.0f); -// -// (note, do not use _inverse_ constants; stbi_image will invert them -// appropriately). -// -// Additionally, there is a new, parallel interface for loading files as -// (linear) floats to preserve the full dynamic range: -// -// float *data = stbi_loadf(filename, &x, &y, &n, 0); -// -// If you load LDR images through this interface, those images will -// be promoted to floating point values, run through the inverse of -// constants corresponding to the above: -// -// stbi_ldr_to_hdr_scale(1.0f); -// stbi_ldr_to_hdr_gamma(2.2f); -// -// Finally, given a filename (or an open file or memory block--see header -// file for details) containing image data, you can query for the "most -// appropriate" interface to use (that is, whether the image is HDR or -// not), using: -// -// stbi_is_hdr(char *filename); -// -// =========================================================================== -// -// iPhone PNG support: -// -// We optionally support converting iPhone-formatted PNGs (which store -// premultiplied BGRA) back to RGB, even though they're internally encoded -// differently. To enable this conversion, call -// stbi_convert_iphone_png_to_rgb(1). -// -// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per -// pixel to remove any premultiplied alpha *only* if the image file explicitly -// says there's premultiplied data (currently only happens in iPhone images, -// and only if iPhone convert-to-rgb processing is on). -// -// =========================================================================== -// -// ADDITIONAL CONFIGURATION -// -// - You can suppress implementation of any of the decoders to reduce -// your code footprint by #defining one or more of the following -// symbols before creating the implementation. -// -// STBI_NO_JPEG -// STBI_NO_PNG -// STBI_NO_BMP -// STBI_NO_PSD -// STBI_NO_TGA -// STBI_NO_GIF -// STBI_NO_HDR -// STBI_NO_PIC -// STBI_NO_PNM (.ppm and .pgm) -// -// - You can request *only* certain decoders and suppress all other ones -// (this will be more forward-compatible, as addition of new decoders -// doesn't require you to disable them explicitly): -// -// STBI_ONLY_JPEG -// STBI_ONLY_PNG -// STBI_ONLY_BMP -// STBI_ONLY_PSD -// STBI_ONLY_TGA -// STBI_ONLY_GIF -// STBI_ONLY_HDR -// STBI_ONLY_PIC -// STBI_ONLY_PNM (.ppm and .pgm) -// -// - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still -// want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB -// -// - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater -// than that size (in either width or height) without further processing. -// This is to let programs in the wild set an upper bound to prevent -// denial-of-service attacks on untrusted data, as one could generate a -// valid image of gigantic dimensions and force stb_image to allocate a -// huge block of memory and spend disproportionate time decoding it. By -// default this is set to (1 << 24), which is 16777216, but that's still -// very big. - -#ifndef STBI_NO_STDIO -#include -#endif // STBI_NO_STDIO - -#define STBI_VERSION 1 - -enum -{ - STBI_default = 0, // only used for desired_channels - - STBI_grey = 1, - STBI_grey_alpha = 2, - STBI_rgb = 3, - STBI_rgb_alpha = 4 -}; - -#include -typedef unsigned char stbi_uc; -typedef unsigned short stbi_us; - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef STBIDEF -#ifdef STB_IMAGE_STATIC -#define STBIDEF static -#else -#define STBIDEF extern -#endif -#endif - -////////////////////////////////////////////////////////////////////////////// -// -// PRIMARY API - works on images of any type -// - -// -// load image by filename, open file, or memory buffer -// - -typedef struct -{ - int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read - void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative - int (*eof) (void *user); // returns nonzero if we are at end of file/data -} stbi_io_callbacks; - -//////////////////////////////////// -// -// 8-bits-per-channel interface -// - -STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *channels_in_file, int desired_channels); - -#ifndef STBI_NO_STDIO -STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); -// for stbi_load_from_file, file pointer is left pointing immediately after image -#endif - -#ifndef STBI_NO_GIF -STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp); -#endif - -#ifdef STBI_WINDOWS_UTF8 -STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); -#endif - -//////////////////////////////////// -// -// 16-bits-per-channel interface -// - -STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); - -#ifndef STBI_NO_STDIO -STBIDEF stbi_us *stbi_load_16 (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); -#endif - -//////////////////////////////////// -// -// float-per-channel interface -// -#ifndef STBI_NO_LINEAR - STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); - - #ifndef STBI_NO_STDIO - STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); - #endif -#endif - -#ifndef STBI_NO_HDR - STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); - STBIDEF void stbi_hdr_to_ldr_scale(float scale); -#endif // STBI_NO_HDR - -#ifndef STBI_NO_LINEAR - STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); - STBIDEF void stbi_ldr_to_hdr_scale(float scale); -#endif // STBI_NO_LINEAR - -// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR -STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); -STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); -#ifndef STBI_NO_STDIO -STBIDEF int stbi_is_hdr (char const *filename); -STBIDEF int stbi_is_hdr_from_file(FILE *f); -#endif // STBI_NO_STDIO - - -// get a VERY brief reason for failure -// on most compilers (and ALL modern mainstream compilers) this is threadsafe -STBIDEF const char *stbi_failure_reason (void); - -// free the loaded image -- this is just free() -STBIDEF void stbi_image_free (void *retval_from_stbi_load); - -// get image dimensions & components without fully decoding -STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); -STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); -STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len); -STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user); - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); -STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); -STBIDEF int stbi_is_16_bit (char const *filename); -STBIDEF int stbi_is_16_bit_from_file(FILE *f); -#endif - - - -// for image formats that explicitly notate that they have premultiplied alpha, -// we just return the colors as stored in the file. set this flag to force -// unpremultiplication. results are undefined if the unpremultiply overflow. -STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); - -// indicate whether we should process iphone images back to canonical format, -// or just pass them through "as-is" -STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); - -// flip the image vertically, so the first pixel in the output array is the bottom left -STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); - -// as above, but only applies to images loaded on the thread that calls the function -// this function is only available if your compiler supports thread-local variables; -// calling it will fail to link if your compiler doesn't -STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply); -STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert); -STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip); - -// ZLIB client - used by PNG, available for other purposes - -STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); -STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); -STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); -STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - -STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); -STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - - -#ifdef __cplusplus -} -#endif - -// -// -//// end header file ///////////////////////////////////////////////////// -#endif // STBI_INCLUDE_STB_IMAGE_H - -#ifdef STB_IMAGE_IMPLEMENTATION - -#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ - || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ - || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ - || defined(STBI_ONLY_ZLIB) - #ifndef STBI_ONLY_JPEG - #define STBI_NO_JPEG - #endif - #ifndef STBI_ONLY_PNG - #define STBI_NO_PNG - #endif - #ifndef STBI_ONLY_BMP - #define STBI_NO_BMP - #endif - #ifndef STBI_ONLY_PSD - #define STBI_NO_PSD - #endif - #ifndef STBI_ONLY_TGA - #define STBI_NO_TGA - #endif - #ifndef STBI_ONLY_GIF - #define STBI_NO_GIF - #endif - #ifndef STBI_ONLY_HDR - #define STBI_NO_HDR - #endif - #ifndef STBI_ONLY_PIC - #define STBI_NO_PIC - #endif - #ifndef STBI_ONLY_PNM - #define STBI_NO_PNM - #endif -#endif - -#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) -#define STBI_NO_ZLIB -#endif - - -#include -#include // ptrdiff_t on osx -#include -#include -#include - -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) -#include // ldexp, pow -#endif - -#ifndef STBI_NO_STDIO -#include -#endif - -#ifndef STBI_ASSERT -#include -#define STBI_ASSERT(x) assert(x) -#endif - -#ifdef __cplusplus -#define STBI_EXTERN extern "C" -#else -#define STBI_EXTERN extern -#endif - - -#ifndef _MSC_VER - #ifdef __cplusplus - #define stbi_inline inline - #else - #define stbi_inline - #endif -#else - #define stbi_inline __forceinline -#endif - -#ifndef STBI_NO_THREAD_LOCALS - #if defined(__cplusplus) && __cplusplus >= 201103L - #define STBI_THREAD_LOCAL thread_local - #elif defined(__GNUC__) && __GNUC__ < 5 - #define STBI_THREAD_LOCAL __thread - #elif defined(_MSC_VER) - #define STBI_THREAD_LOCAL __declspec(thread) - #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__) - #define STBI_THREAD_LOCAL _Thread_local - #endif - - #ifndef STBI_THREAD_LOCAL - #if defined(__GNUC__) - #define STBI_THREAD_LOCAL __thread - #endif - #endif -#endif - -#if defined(_MSC_VER) || defined(__SYMBIAN32__) -typedef unsigned short stbi__uint16; -typedef signed short stbi__int16; -typedef unsigned int stbi__uint32; -typedef signed int stbi__int32; -#else -#include -typedef uint16_t stbi__uint16; -typedef int16_t stbi__int16; -typedef uint32_t stbi__uint32; -typedef int32_t stbi__int32; -#endif - -// should produce compiler error if size is wrong -typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; - -#ifdef _MSC_VER -#define STBI_NOTUSED(v) (void)(v) -#else -#define STBI_NOTUSED(v) (void)sizeof(v) -#endif - -#ifdef _MSC_VER -#define STBI_HAS_LROTL -#endif - -#ifdef STBI_HAS_LROTL - #define stbi_lrot(x,y) _lrotl(x,y) -#else - #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (-(y) & 31))) -#endif - -#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED)) -// ok -#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED) -// ok -#else -#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)." -#endif - -#ifndef STBI_MALLOC -#define STBI_MALLOC(sz) malloc(sz) -#define STBI_REALLOC(p,newsz) realloc(p,newsz) -#define STBI_FREE(p) free(p) -#endif - -#ifndef STBI_REALLOC_SIZED -#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz) -#endif - -// x86/x64 detection -#if defined(__x86_64__) || defined(_M_X64) -#define STBI__X64_TARGET -#elif defined(__i386) || defined(_M_IX86) -#define STBI__X86_TARGET -#endif - -#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) -// gcc doesn't support sse2 intrinsics unless you compile with -msse2, -// which in turn means it gets to use SSE2 everywhere. This is unfortunate, -// but previous attempts to provide the SSE2 functions with runtime -// detection caused numerous issues. The way architecture extensions are -// exposed in GCC/Clang is, sadly, not really suited for one-file libs. -// New behavior: if compiled with -msse2, we use SSE2 without any -// detection; if not, we don't use it at all. -#define STBI_NO_SIMD -#endif - -#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) -// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET -// -// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the -// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. -// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not -// simultaneously enabling "-mstackrealign". -// -// See https://github.com/nothings/stb/issues/81 for more information. -// -// So default to no SSE2 on 32-bit MinGW. If you've read this far and added -// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. -#define STBI_NO_SIMD -#endif - -#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) -#define STBI_SSE2 -#include - -#ifdef _MSC_VER - -#if _MSC_VER >= 1400 // not VC6 -#include // __cpuid -static int stbi__cpuid3(void) -{ - int info[4]; - __cpuid(info,1); - return info[3]; -} -#else -static int stbi__cpuid3(void) -{ - int res; - __asm { - mov eax,1 - cpuid - mov res,edx - } - return res; -} -#endif - -#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name - -#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) -static int stbi__sse2_available(void) -{ - int info3 = stbi__cpuid3(); - return ((info3 >> 26) & 1) != 0; -} -#endif - -#else // assume GCC-style if not VC++ -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) - -#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) -static int stbi__sse2_available(void) -{ - // If we're even attempting to compile this on GCC/Clang, that means - // -msse2 is on, which means the compiler is allowed to use SSE2 - // instructions at will, and so are we. - return 1; -} -#endif - -#endif -#endif - -// ARM NEON -#if defined(STBI_NO_SIMD) && defined(STBI_NEON) -#undef STBI_NEON -#endif - -#ifdef STBI_NEON -#include -#ifdef _MSC_VER -#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name -#else -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) -#endif -#endif - -#ifndef STBI_SIMD_ALIGN -#define STBI_SIMD_ALIGN(type, name) type name -#endif - -#ifndef STBI_MAX_DIMENSIONS -#define STBI_MAX_DIMENSIONS (1 << 24) -#endif - -/////////////////////////////////////////////// -// -// stbi__context struct and start_xxx functions - -// stbi__context structure is our basic context used by all images, so it -// contains all the IO context, plus some basic image information -typedef struct -{ - stbi__uint32 img_x, img_y; - int img_n, img_out_n; - - stbi_io_callbacks io; - void *io_user_data; - - int read_from_callbacks; - int buflen; - stbi_uc buffer_start[128]; - int callback_already_read; - - stbi_uc *img_buffer, *img_buffer_end; - stbi_uc *img_buffer_original, *img_buffer_original_end; -} stbi__context; - - -static void stbi__refill_buffer(stbi__context *s); - -// initialize a memory-decode context -static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) -{ - s->io.read = NULL; - s->read_from_callbacks = 0; - s->callback_already_read = 0; - s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; - s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; -} - -// initialize a callback-based context -static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) -{ - s->io = *c; - s->io_user_data = user; - s->buflen = sizeof(s->buffer_start); - s->read_from_callbacks = 1; - s->callback_already_read = 0; - s->img_buffer = s->img_buffer_original = s->buffer_start; - stbi__refill_buffer(s); - s->img_buffer_original_end = s->img_buffer_end; -} - -#ifndef STBI_NO_STDIO - -static int stbi__stdio_read(void *user, char *data, int size) -{ - return (int) fread(data,1,size,(FILE*) user); -} - -static void stbi__stdio_skip(void *user, int n) -{ - int ch; - fseek((FILE*) user, n, SEEK_CUR); - ch = fgetc((FILE*) user); /* have to read a byte to reset feof()'s flag */ - if (ch != EOF) { - ungetc(ch, (FILE *) user); /* push byte back onto stream if valid. */ - } -} - -static int stbi__stdio_eof(void *user) -{ - return feof((FILE*) user) || ferror((FILE *) user); -} - -static stbi_io_callbacks stbi__stdio_callbacks = -{ - stbi__stdio_read, - stbi__stdio_skip, - stbi__stdio_eof, -}; - -static void stbi__start_file(stbi__context *s, FILE *f) -{ - stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); -} - -//static void stop_file(stbi__context *s) { } - -#endif // !STBI_NO_STDIO - -static void stbi__rewind(stbi__context *s) -{ - // conceptually rewind SHOULD rewind to the beginning of the stream, - // but we just rewind to the beginning of the initial buffer, because - // we only use it after doing 'test', which only ever looks at at most 92 bytes - s->img_buffer = s->img_buffer_original; - s->img_buffer_end = s->img_buffer_original_end; -} - -enum -{ - STBI_ORDER_RGB, - STBI_ORDER_BGR -}; - -typedef struct -{ - int bits_per_channel; - int num_channels; - int channel_order; -} stbi__result_info; - -#ifndef STBI_NO_JPEG -static int stbi__jpeg_test(stbi__context *s); -static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNG -static int stbi__png_test(stbi__context *s); -static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__png_is16(stbi__context *s); -#endif - -#ifndef STBI_NO_BMP -static int stbi__bmp_test(stbi__context *s); -static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_TGA -static int stbi__tga_test(stbi__context *s); -static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s); -static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc); -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__psd_is16(stbi__context *s); -#endif - -#ifndef STBI_NO_HDR -static int stbi__hdr_test(stbi__context *s); -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_test(stbi__context *s); -static void *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_GIF -static int stbi__gif_test(stbi__context *s); -static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp); -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNM -static int stbi__pnm_test(stbi__context *s); -static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__pnm_is16(stbi__context *s); -#endif - -static -#ifdef STBI_THREAD_LOCAL -STBI_THREAD_LOCAL -#endif -const char *stbi__g_failure_reason; - -STBIDEF const char *stbi_failure_reason(void) -{ - return stbi__g_failure_reason; -} - -#ifndef STBI_NO_FAILURE_STRINGS -static int stbi__err(const char *str) -{ - stbi__g_failure_reason = str; - return 0; -} -#endif - -static void *stbi__malloc(size_t size) -{ - return STBI_MALLOC(size); -} - -// stb_image uses ints pervasively, including for offset calculations. -// therefore the largest decoded image size we can support with the -// current code, even on 64-bit targets, is INT_MAX. this is not a -// significant limitation for the intended use case. -// -// we do, however, need to make sure our size calculations don't -// overflow. hence a few helper functions for size calculations that -// multiply integers together, making sure that they're non-negative -// and no overflow occurs. - -// return 1 if the sum is valid, 0 on overflow. -// negative terms are considered invalid. -static int stbi__addsizes_valid(int a, int b) -{ - if (b < 0) return 0; - // now 0 <= b <= INT_MAX, hence also - // 0 <= INT_MAX - b <= INTMAX. - // And "a + b <= INT_MAX" (which might overflow) is the - // same as a <= INT_MAX - b (no overflow) - return a <= INT_MAX - b; -} - -// returns 1 if the product is valid, 0 on overflow. -// negative factors are considered invalid. -static int stbi__mul2sizes_valid(int a, int b) -{ - if (a < 0 || b < 0) return 0; - if (b == 0) return 1; // mul-by-0 is always safe - // portable way to check for no overflows in a*b - return a <= INT_MAX/b; -} - -#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) -// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow -static int stbi__mad2sizes_valid(int a, int b, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add); -} -#endif - -// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow -static int stbi__mad3sizes_valid(int a, int b, int c, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && - stbi__addsizes_valid(a*b*c, add); -} - -// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) -static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && - stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add); -} -#endif - -#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR) -// mallocs with size overflow checking -static void *stbi__malloc_mad2(int a, int b, int add) -{ - if (!stbi__mad2sizes_valid(a, b, add)) return NULL; - return stbi__malloc(a*b + add); -} -#endif - -static void *stbi__malloc_mad3(int a, int b, int c, int add) -{ - if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL; - return stbi__malloc(a*b*c + add); -} - -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) || !defined(STBI_NO_PNM) -static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) -{ - if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL; - return stbi__malloc(a*b*c*d + add); -} -#endif - -// returns 1 if the sum of two signed ints is valid (between -2^31 and 2^31-1 inclusive), 0 on overflow. -static int stbi__addints_valid(int a, int b) -{ - if ((a >= 0) != (b >= 0)) return 1; // a and b have different signs, so no overflow - if (a < 0 && b < 0) return a >= INT_MIN - b; // same as a + b >= INT_MIN; INT_MIN - b cannot overflow since b < 0. - return a <= INT_MAX - b; -} - -// returns 1 if the product of two ints fits in a signed short, 0 on overflow. -static int stbi__mul2shorts_valid(int a, int b) -{ - if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow - if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid - if (b < 0) return a <= SHRT_MIN / b; // same as a * b >= SHRT_MIN - return a >= SHRT_MIN / b; -} - -// stbi__err - error -// stbi__errpf - error returning pointer to float -// stbi__errpuc - error returning pointer to unsigned char - -#ifdef STBI_NO_FAILURE_STRINGS - #define stbi__err(x,y) 0 -#elif defined(STBI_FAILURE_USERMSG) - #define stbi__err(x,y) stbi__err(y) -#else - #define stbi__err(x,y) stbi__err(x) -#endif - -#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) -#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) - -STBIDEF void stbi_image_free(void *retval_from_stbi_load) -{ - STBI_FREE(retval_from_stbi_load); -} - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); -#endif - -#ifndef STBI_NO_HDR -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); -#endif - -static int stbi__vertically_flip_on_load_global = 0; - -STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) -{ - stbi__vertically_flip_on_load_global = flag_true_if_should_flip; -} - -#ifndef STBI_THREAD_LOCAL -#define stbi__vertically_flip_on_load stbi__vertically_flip_on_load_global -#else -static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set; - -STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip) -{ - stbi__vertically_flip_on_load_local = flag_true_if_should_flip; - stbi__vertically_flip_on_load_set = 1; -} - -#define stbi__vertically_flip_on_load (stbi__vertically_flip_on_load_set \ - ? stbi__vertically_flip_on_load_local \ - : stbi__vertically_flip_on_load_global) -#endif // STBI_THREAD_LOCAL - -static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) -{ - memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields - ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed - ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order - ri->num_channels = 0; - - // test the formats with a very explicit header first (at least a FOURCC - // or distinctive magic number first) - #ifndef STBI_NO_PNG - if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_BMP - if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_GIF - if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_PSD - if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc); - #else - STBI_NOTUSED(bpc); - #endif - #ifndef STBI_NO_PIC - if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri); - #endif - - // then the formats that can end up attempting to load with just 1 or 2 - // bytes matching expectations; these are prone to false positives, so - // try them later - #ifndef STBI_NO_JPEG - if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_PNM - if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp, ri); - #endif - - #ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) { - float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri); - return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); - } - #endif - - #ifndef STBI_NO_TGA - // test tga last because it's a crappy test! - if (stbi__tga_test(s)) - return stbi__tga_load(s,x,y,comp,req_comp, ri); - #endif - - return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); -} - -static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels) -{ - int i; - int img_len = w * h * channels; - stbi_uc *reduced; - - reduced = (stbi_uc *) stbi__malloc(img_len); - if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory"); - - for (i = 0; i < img_len; ++i) - reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling - - STBI_FREE(orig); - return reduced; -} - -static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels) -{ - int i; - int img_len = w * h * channels; - stbi__uint16 *enlarged; - - enlarged = (stbi__uint16 *) stbi__malloc(img_len*2); - if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); - - for (i = 0; i < img_len; ++i) - enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff - - STBI_FREE(orig); - return enlarged; -} - -static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel) -{ - int row; - size_t bytes_per_row = (size_t)w * bytes_per_pixel; - stbi_uc temp[2048]; - stbi_uc *bytes = (stbi_uc *)image; - - for (row = 0; row < (h>>1); row++) { - stbi_uc *row0 = bytes + row*bytes_per_row; - stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row; - // swap row0 with row1 - size_t bytes_left = bytes_per_row; - while (bytes_left) { - size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp); - memcpy(temp, row0, bytes_copy); - memcpy(row0, row1, bytes_copy); - memcpy(row1, temp, bytes_copy); - row0 += bytes_copy; - row1 += bytes_copy; - bytes_left -= bytes_copy; - } - } -} - -#ifndef STBI_NO_GIF -static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel) -{ - int slice; - int slice_size = w * h * bytes_per_pixel; - - stbi_uc *bytes = (stbi_uc *)image; - for (slice = 0; slice < z; ++slice) { - stbi__vertical_flip(bytes, w, h, bytes_per_pixel); - bytes += slice_size; - } -} -#endif - -static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__result_info ri; - void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8); - - if (result == NULL) - return NULL; - - // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. - STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); - - if (ri.bits_per_channel != 8) { - result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp); - ri.bits_per_channel = 8; - } - - // @TODO: move stbi__convert_format to here - - if (stbi__vertically_flip_on_load) { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc)); - } - - return (unsigned char *) result; -} - -static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__result_info ri; - void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16); - - if (result == NULL) - return NULL; - - // it is the responsibility of the loaders to make sure we get either 8 or 16 bit. - STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16); - - if (ri.bits_per_channel != 16) { - result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp); - ri.bits_per_channel = 16; - } - - // @TODO: move stbi__convert_format16 to here - // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision - - if (stbi__vertically_flip_on_load) { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16)); - } - - return (stbi__uint16 *) result; -} - -#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR) -static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) -{ - if (stbi__vertically_flip_on_load && result != NULL) { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(float)); - } -} -#endif - -#ifndef STBI_NO_STDIO - -#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) -STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); -STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); -#endif - -#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) -STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) -{ - return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); -} -#endif - -static FILE *stbi__fopen(char const *filename, char const *mode) -{ - FILE *f; -#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) - wchar_t wMode[64]; - wchar_t wFilename[1024]; - if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) - return 0; - - if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) - return 0; - -#if defined(_MSC_VER) && _MSC_VER >= 1400 - if (0 != _wfopen_s(&f, wFilename, wMode)) - f = 0; -#else - f = _wfopen(wFilename, wMode); -#endif - -#elif defined(_MSC_VER) && _MSC_VER >= 1400 - if (0 != fopen_s(&f, filename, mode)) - f=0; -#else - f = fopen(filename, mode); -#endif - return f; -} - - -STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - unsigned char *result; - if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); - result = stbi_load_from_file(f,x,y,comp,req_comp); - fclose(f); - return result; -} - -STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *result; - stbi__context s; - stbi__start_file(&s,f); - result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); - if (result) { - // need to 'unget' all the characters in the IO buffer - fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); - } - return result; -} - -STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - stbi__uint16 *result; - stbi__context s; - stbi__start_file(&s,f); - result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp); - if (result) { - // need to 'unget' all the characters in the IO buffer - fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); - } - return result; -} - -STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - stbi__uint16 *result; - if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file"); - result = stbi_load_from_file_16(f,x,y,comp,req_comp); - fclose(f); - return result; -} - - -#endif //!STBI_NO_STDIO - -STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); -} - -STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); - return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); -} - -STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); -} - -STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); -} - -#ifndef STBI_NO_GIF -STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) -{ - unsigned char *result; - stbi__context s; - stbi__start_mem(&s,buffer,len); - - result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); - if (stbi__vertically_flip_on_load) { - stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); - } - - return result; -} -#endif - -#ifndef STBI_NO_LINEAR -static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *data; - #ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) { - stbi__result_info ri; - float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri); - if (hdr_data) - stbi__float_postprocess(hdr_data,x,y,comp,req_comp); - return hdr_data; - } - #endif - data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp); - if (data) - return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); - return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); -} - -STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} - -STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} - -#ifndef STBI_NO_STDIO -STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - float *result; - FILE *f = stbi__fopen(filename, "rb"); - if (!f) return stbi__errpf("can't fopen", "Unable to open file"); - result = stbi_loadf_from_file(f,x,y,comp,req_comp); - fclose(f); - return result; -} - -STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_file(&s,f); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} -#endif // !STBI_NO_STDIO - -#endif // !STBI_NO_LINEAR - -// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is -// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always -// reports false! - -STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) -{ - #ifndef STBI_NO_HDR - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__hdr_test(&s); - #else - STBI_NOTUSED(buffer); - STBI_NOTUSED(len); - return 0; - #endif -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_is_hdr (char const *filename) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result=0; - if (f) { - result = stbi_is_hdr_from_file(f); - fclose(f); - } - return result; -} - -STBIDEF int stbi_is_hdr_from_file(FILE *f) -{ - #ifndef STBI_NO_HDR - long pos = ftell(f); - int res; - stbi__context s; - stbi__start_file(&s,f); - res = stbi__hdr_test(&s); - fseek(f, pos, SEEK_SET); - return res; - #else - STBI_NOTUSED(f); - return 0; - #endif -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) -{ - #ifndef STBI_NO_HDR - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__hdr_test(&s); - #else - STBI_NOTUSED(clbk); - STBI_NOTUSED(user); - return 0; - #endif -} - -#ifndef STBI_NO_LINEAR -static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; - -STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } -STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } -#endif - -static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; - -STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } -STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } - - -////////////////////////////////////////////////////////////////////////////// -// -// Common code used by all image loaders -// - -enum -{ - STBI__SCAN_load=0, - STBI__SCAN_type, - STBI__SCAN_header -}; - -static void stbi__refill_buffer(stbi__context *s) -{ - int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); - s->callback_already_read += (int) (s->img_buffer - s->img_buffer_original); - if (n == 0) { - // at end of file, treat same as if from memory, but need to handle case - // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file - s->read_from_callbacks = 0; - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start+1; - *s->img_buffer = 0; - } else { - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start + n; - } -} - -stbi_inline static stbi_uc stbi__get8(stbi__context *s) -{ - if (s->img_buffer < s->img_buffer_end) - return *s->img_buffer++; - if (s->read_from_callbacks) { - stbi__refill_buffer(s); - return *s->img_buffer++; - } - return 0; -} - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) -// nothing -#else -stbi_inline static int stbi__at_eof(stbi__context *s) -{ - if (s->io.read) { - if (!(s->io.eof)(s->io_user_data)) return 0; - // if feof() is true, check if buffer = end - // special case: we've only got the special 0 character at the end - if (s->read_from_callbacks == 0) return 1; - } - - return s->img_buffer >= s->img_buffer_end; -} -#endif - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) -// nothing -#else -static void stbi__skip(stbi__context *s, int n) -{ - if (n == 0) return; // already there! - if (n < 0) { - s->img_buffer = s->img_buffer_end; - return; - } - if (s->io.read) { - int blen = (int) (s->img_buffer_end - s->img_buffer); - if (blen < n) { - s->img_buffer = s->img_buffer_end; - (s->io.skip)(s->io_user_data, n - blen); - return; - } - } - s->img_buffer += n; -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM) -// nothing -#else -static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) -{ - if (s->io.read) { - int blen = (int) (s->img_buffer_end - s->img_buffer); - if (blen < n) { - int res, count; - - memcpy(buffer, s->img_buffer, blen); - - count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); - res = (count == (n-blen)); - s->img_buffer = s->img_buffer_end; - return res; - } - } - - if (s->img_buffer+n <= s->img_buffer_end) { - memcpy(buffer, s->img_buffer, n); - s->img_buffer += n; - return 1; - } else - return 0; -} -#endif - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) -// nothing -#else -static int stbi__get16be(stbi__context *s) -{ - int z = stbi__get8(s); - return (z << 8) + stbi__get8(s); -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC) -// nothing -#else -static stbi__uint32 stbi__get32be(stbi__context *s) -{ - stbi__uint32 z = stbi__get16be(s); - return (z << 16) + stbi__get16be(s); -} -#endif - -#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) -// nothing -#else -static int stbi__get16le(stbi__context *s) -{ - int z = stbi__get8(s); - return z + (stbi__get8(s) << 8); -} -#endif - -#ifndef STBI_NO_BMP -static stbi__uint32 stbi__get32le(stbi__context *s) -{ - stbi__uint32 z = stbi__get16le(s); - z += (stbi__uint32)stbi__get16le(s) << 16; - return z; -} -#endif - -#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings - -#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) -// nothing -#else -////////////////////////////////////////////////////////////////////////////// -// -// generic converter from built-in img_n to req_comp -// individual types do this automatically as much as possible (e.g. jpeg -// does all cases internally since it needs to colorspace convert anyway, -// and it never has alpha, so very few cases ). png can automatically -// interleave an alpha=255 channel, but falls back to this for other cases -// -// assume data buffer is malloced, so malloc a new one and free that one -// only failure mode is malloc failing - -static stbi_uc stbi__compute_y(int r, int g, int b) -{ - return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM) -// nothing -#else -static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) -{ - int i,j; - unsigned char *good; - - if (req_comp == img_n) return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - - good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0); - if (good == NULL) { - STBI_FREE(data); - return stbi__errpuc("outofmem", "Out of memory"); - } - - for (j=0; j < (int) y; ++j) { - unsigned char *src = data + j * x * img_n ; - unsigned char *dest = good + j * x * req_comp; - - #define STBI__COMBO(a,b) ((a)*8+(b)) - #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) - // convert source image with img_n components to one with req_comp components; - // avoid switch per pixel, so use switch per scanline and massive macros - switch (STBI__COMBO(img_n, req_comp)) { - STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255; } break; - STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255; } break; - STBI__CASE(2,1) { dest[0]=src[0]; } break; - STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; - STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255; } break; - STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; - STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255; } break; - STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; - STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break; - STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; - default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return stbi__errpuc("unsupported", "Unsupported format conversion"); - } - #undef STBI__CASE - } - - STBI_FREE(data); - return good; -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) -// nothing -#else -static stbi__uint16 stbi__compute_y_16(int r, int g, int b) -{ - return (stbi__uint16) (((r*77) + (g*150) + (29*b)) >> 8); -} -#endif - -#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) -// nothing -#else -static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y) -{ - int i,j; - stbi__uint16 *good; - - if (req_comp == img_n) return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - - good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2); - if (good == NULL) { - STBI_FREE(data); - return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); - } - - for (j=0; j < (int) y; ++j) { - stbi__uint16 *src = data + j * x * img_n ; - stbi__uint16 *dest = good + j * x * req_comp; - - #define STBI__COMBO(a,b) ((a)*8+(b)) - #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) - // convert source image with img_n components to one with req_comp components; - // avoid switch per pixel, so use switch per scanline and massive macros - switch (STBI__COMBO(img_n, req_comp)) { - STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff; } break; - STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff; } break; - STBI__CASE(2,1) { dest[0]=src[0]; } break; - STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; - STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff; } break; - STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; - STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break; - STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; - STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break; - STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; - default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return (stbi__uint16*) stbi__errpuc("unsupported", "Unsupported format conversion"); - } - #undef STBI__CASE - } - - STBI_FREE(data); - return good; -} -#endif - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) -{ - int i,k,n; - float *output; - if (!data) return NULL; - output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0); - if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } - // compute number of non-alpha components - if (comp & 1) n = comp; else n = comp-1; - for (i=0; i < x*y; ++i) { - for (k=0; k < n; ++k) { - output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); - } - } - if (n < comp) { - for (i=0; i < x*y; ++i) { - output[i*comp + n] = data[i*comp + n]/255.0f; - } - } - STBI_FREE(data); - return output; -} -#endif - -#ifndef STBI_NO_HDR -#define stbi__float2int(x) ((int) (x)) -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) -{ - int i,k,n; - stbi_uc *output; - if (!data) return NULL; - output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0); - if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } - // compute number of non-alpha components - if (comp & 1) n = comp; else n = comp-1; - for (i=0; i < x*y; ++i) { - for (k=0; k < n; ++k) { - float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; - if (z < 0) z = 0; - if (z > 255) z = 255; - output[i*comp + k] = (stbi_uc) stbi__float2int(z); - } - if (k < comp) { - float z = data[i*comp+k] * 255 + 0.5f; - if (z < 0) z = 0; - if (z > 255) z = 255; - output[i*comp + k] = (stbi_uc) stbi__float2int(z); - } - } - STBI_FREE(data); - return output; -} -#endif - -////////////////////////////////////////////////////////////////////////////// -// -// "baseline" JPEG/JFIF decoder -// -// simple implementation -// - doesn't support delayed output of y-dimension -// - simple interface (only one output format: 8-bit interleaved RGB) -// - doesn't try to recover corrupt jpegs -// - doesn't allow partial loading, loading multiple at once -// - still fast on x86 (copying globals into locals doesn't help x86) -// - allocates lots of intermediate memory (full size of all components) -// - non-interleaved case requires this anyway -// - allows good upsampling (see next) -// high-quality -// - upsampled channels are bilinearly interpolated, even across blocks -// - quality integer IDCT derived from IJG's 'slow' -// performance -// - fast huffman; reasonable integer IDCT -// - some SIMD kernels for common paths on targets with SSE2/NEON -// - uses a lot of intermediate memory, could cache poorly - -#ifndef STBI_NO_JPEG - -// huffman decoding acceleration -#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache - -typedef struct -{ - stbi_uc fast[1 << FAST_BITS]; - // weirdly, repacking this into AoS is a 10% speed loss, instead of a win - stbi__uint16 code[256]; - stbi_uc values[256]; - stbi_uc size[257]; - unsigned int maxcode[18]; - int delta[17]; // old 'firstsymbol' - old 'firstcode' -} stbi__huffman; - -typedef struct -{ - stbi__context *s; - stbi__huffman huff_dc[4]; - stbi__huffman huff_ac[4]; - stbi__uint16 dequant[4][64]; - stbi__int16 fast_ac[4][1 << FAST_BITS]; - -// sizes for components, interleaved MCUs - int img_h_max, img_v_max; - int img_mcu_x, img_mcu_y; - int img_mcu_w, img_mcu_h; - -// definition of jpeg image component - struct - { - int id; - int h,v; - int tq; - int hd,ha; - int dc_pred; - - int x,y,w2,h2; - stbi_uc *data; - void *raw_data, *raw_coeff; - stbi_uc *linebuf; - short *coeff; // progressive only - int coeff_w, coeff_h; // number of 8x8 coefficient blocks - } img_comp[4]; - - stbi__uint32 code_buffer; // jpeg entropy-coded buffer - int code_bits; // number of valid bits - unsigned char marker; // marker seen while filling entropy buffer - int nomore; // flag if we saw a marker so must stop - - int progressive; - int spec_start; - int spec_end; - int succ_high; - int succ_low; - int eob_run; - int jfif; - int app14_color_transform; // Adobe APP14 tag - int rgb; - - int scan_n, order[4]; - int restart_interval, todo; - -// kernels - void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); - void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); - stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); -} stbi__jpeg; - -static int stbi__build_huffman(stbi__huffman *h, int *count) -{ - int i,j,k=0; - unsigned int code; - // build size list for each symbol (from JPEG spec) - for (i=0; i < 16; ++i) { - for (j=0; j < count[i]; ++j) { - h->size[k++] = (stbi_uc) (i+1); - if(k >= 257) return stbi__err("bad size list","Corrupt JPEG"); - } - } - h->size[k] = 0; - - // compute actual symbols (from jpeg spec) - code = 0; - k = 0; - for(j=1; j <= 16; ++j) { - // compute delta to add to code to compute symbol id - h->delta[j] = k - code; - if (h->size[k] == j) { - while (h->size[k] == j) - h->code[k++] = (stbi__uint16) (code++); - if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG"); - } - // compute largest code + 1 for this size, preshifted as needed later - h->maxcode[j] = code << (16-j); - code <<= 1; - } - h->maxcode[j] = 0xffffffff; - - // build non-spec acceleration table; 255 is flag for not-accelerated - memset(h->fast, 255, 1 << FAST_BITS); - for (i=0; i < k; ++i) { - int s = h->size[i]; - if (s <= FAST_BITS) { - int c = h->code[i] << (FAST_BITS-s); - int m = 1 << (FAST_BITS-s); - for (j=0; j < m; ++j) { - h->fast[c+j] = (stbi_uc) i; - } - } - } - return 1; -} - -// build a table that decodes both magnitude and value of small ACs in -// one go. -static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) -{ - int i; - for (i=0; i < (1 << FAST_BITS); ++i) { - stbi_uc fast = h->fast[i]; - fast_ac[i] = 0; - if (fast < 255) { - int rs = h->values[fast]; - int run = (rs >> 4) & 15; - int magbits = rs & 15; - int len = h->size[fast]; - - if (magbits && len + magbits <= FAST_BITS) { - // magnitude code followed by receive_extend code - int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); - int m = 1 << (magbits - 1); - if (k < m) k += (~0U << magbits) + 1; - // if the result is small enough, we can fit it in fast_ac table - if (k >= -128 && k <= 127) - fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits)); - } - } - } -} - -static void stbi__grow_buffer_unsafe(stbi__jpeg *j) -{ - do { - unsigned int b = j->nomore ? 0 : stbi__get8(j->s); - if (b == 0xff) { - int c = stbi__get8(j->s); - while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes - if (c != 0) { - j->marker = (unsigned char) c; - j->nomore = 1; - return; - } - } - j->code_buffer |= b << (24 - j->code_bits); - j->code_bits += 8; - } while (j->code_bits <= 24); -} - -// (1 << n) - 1 -static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; - -// decode a jpeg huffman value from the bitstream -stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) -{ - unsigned int temp; - int c,k; - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - - // look at the top FAST_BITS and determine what symbol ID it is, - // if the code is <= FAST_BITS - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - k = h->fast[c]; - if (k < 255) { - int s = h->size[k]; - if (s > j->code_bits) - return -1; - j->code_buffer <<= s; - j->code_bits -= s; - return h->values[k]; - } - - // naive test is to shift the code_buffer down so k bits are - // valid, then test against maxcode. To speed this up, we've - // preshifted maxcode left so that it has (16-k) 0s at the - // end; in other words, regardless of the number of bits, it - // wants to be compared against something shifted to have 16; - // that way we don't need to shift inside the loop. - temp = j->code_buffer >> 16; - for (k=FAST_BITS+1 ; ; ++k) - if (temp < h->maxcode[k]) - break; - if (k == 17) { - // error! code not found - j->code_bits -= 16; - return -1; - } - - if (k > j->code_bits) - return -1; - - // convert the huffman code to the symbol id - c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; - if(c < 0 || c >= 256) // symbol id out of bounds! - return -1; - STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); - - // convert the id to a symbol - j->code_bits -= k; - j->code_buffer <<= k; - return h->values[c]; -} - -// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); - if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing - - sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative) - k = stbi_lrot(j->code_buffer, n); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k + (stbi__jbias[n] & (sgn - 1)); -} - -// get some unsigned bits -stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) -{ - unsigned int k; - if (j->code_bits < n) stbi__grow_buffer_unsafe(j); - if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing - k = stbi_lrot(j->code_buffer, n); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k; -} - -stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) -{ - unsigned int k; - if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); - if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing - k = j->code_buffer; - j->code_buffer <<= 1; - --j->code_bits; - return k & 0x80000000; -} - -// given a value that's at position X in the zigzag stream, -// where does it appear in the 8x8 matrix coded as row-major? -static const stbi_uc stbi__jpeg_dezigzag[64+15] = -{ - 0, 1, 8, 16, 9, 2, 3, 10, - 17, 24, 32, 25, 18, 11, 4, 5, - 12, 19, 26, 33, 40, 48, 41, 34, - 27, 20, 13, 6, 7, 14, 21, 28, - 35, 42, 49, 56, 57, 50, 43, 36, - 29, 22, 15, 23, 30, 37, 44, 51, - 58, 59, 52, 45, 38, 31, 39, 46, - 53, 60, 61, 54, 47, 55, 62, 63, - // let corrupt input sample past end - 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63 -}; - -// decode one 64-entry block-- -static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant) -{ - int diff,dc,k; - int t; - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - t = stbi__jpeg_huff_decode(j, hdc); - if (t < 0 || t > 15) return stbi__err("bad huffman code","Corrupt JPEG"); - - // 0 all the ac values now so we can do it 32-bits at a time - memset(data,0,64*sizeof(data[0])); - - diff = t ? stbi__extend_receive(j, t) : 0; - if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta","Corrupt JPEG"); - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - if (!stbi__mul2shorts_valid(dc, dequant[0])) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - data[0] = (short) (dc * dequant[0]); - - // decode AC components, see JPEG spec - k = 1; - do { - unsigned int zig; - int c,r,s; - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - r = fac[c]; - if (r) { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); - j->code_buffer <<= s; - j->code_bits -= s; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) ((r >> 8) * dequant[zig]); - } else { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (rs != 0xf0) break; // end block - k += 16; - } else { - k += r; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); - } - } - } while (k < 64); - return 1; -} - -static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) -{ - int diff,dc; - int t; - if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - - if (j->succ_high == 0) { - // first scan for DC coefficient, must be first - memset(data,0,64*sizeof(data[0])); // 0 all the ac values now - t = stbi__jpeg_huff_decode(j, hdc); - if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - diff = t ? stbi__extend_receive(j, t) : 0; - - if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta", "Corrupt JPEG"); - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - if (!stbi__mul2shorts_valid(dc, 1 << j->succ_low)) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - data[0] = (short) (dc * (1 << j->succ_low)); - } else { - // refinement scan for DC coefficient - if (stbi__jpeg_get_bit(j)) - data[0] += (short) (1 << j->succ_low); - } - return 1; -} - -// @OPTIMIZE: store non-zigzagged during the decode passes, -// and only de-zigzag when dequantizing -static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) -{ - int k; - if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->succ_high == 0) { - int shift = j->succ_low; - - if (j->eob_run) { - --j->eob_run; - return 1; - } - - k = j->spec_start; - do { - unsigned int zig; - int c,r,s; - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - r = fac[c]; - if (r) { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available"); - j->code_buffer <<= s; - j->code_bits -= s; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) ((r >> 8) * (1 << shift)); - } else { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (r < 15) { - j->eob_run = (1 << r); - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - --j->eob_run; - break; - } - k += 16; - } else { - k += r; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) (stbi__extend_receive(j,s) * (1 << shift)); - } - } - } while (k <= j->spec_end); - } else { - // refinement scan for these AC coefficients - - short bit = (short) (1 << j->succ_low); - - if (j->eob_run) { - --j->eob_run; - for (k = j->spec_start; k <= j->spec_end; ++k) { - short *p = &data[stbi__jpeg_dezigzag[k]]; - if (*p != 0) - if (stbi__jpeg_get_bit(j)) - if ((*p & bit)==0) { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } - } else { - k = j->spec_start; - do { - int r,s; - int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (r < 15) { - j->eob_run = (1 << r) - 1; - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - r = 64; // force end of block - } else { - // r=15 s=0 should write 16 0s, so we just do - // a run of 15 0s and then write s (which is 0), - // so we don't have to do anything special here - } - } else { - if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); - // sign bit - if (stbi__jpeg_get_bit(j)) - s = bit; - else - s = -bit; - } - - // advance by r - while (k <= j->spec_end) { - short *p = &data[stbi__jpeg_dezigzag[k++]]; - if (*p != 0) { - if (stbi__jpeg_get_bit(j)) - if ((*p & bit)==0) { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } else { - if (r == 0) { - *p = (short) s; - break; - } - --r; - } - } - } while (k <= j->spec_end); - } - } - return 1; -} - -// take a -128..127 value and stbi__clamp it and convert to 0..255 -stbi_inline static stbi_uc stbi__clamp(int x) -{ - // trick to use a single test to catch both cases - if ((unsigned int) x > 255) { - if (x < 0) return 0; - if (x > 255) return 255; - } - return (stbi_uc) x; -} - -#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) -#define stbi__fsh(x) ((x) * 4096) - -// derived from jidctint -- DCT_ISLOW -#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ - int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ - p2 = s2; \ - p3 = s6; \ - p1 = (p2+p3) * stbi__f2f(0.5411961f); \ - t2 = p1 + p3*stbi__f2f(-1.847759065f); \ - t3 = p1 + p2*stbi__f2f( 0.765366865f); \ - p2 = s0; \ - p3 = s4; \ - t0 = stbi__fsh(p2+p3); \ - t1 = stbi__fsh(p2-p3); \ - x0 = t0+t3; \ - x3 = t0-t3; \ - x1 = t1+t2; \ - x2 = t1-t2; \ - t0 = s7; \ - t1 = s5; \ - t2 = s3; \ - t3 = s1; \ - p3 = t0+t2; \ - p4 = t1+t3; \ - p1 = t0+t3; \ - p2 = t1+t2; \ - p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ - t0 = t0*stbi__f2f( 0.298631336f); \ - t1 = t1*stbi__f2f( 2.053119869f); \ - t2 = t2*stbi__f2f( 3.072711026f); \ - t3 = t3*stbi__f2f( 1.501321110f); \ - p1 = p5 + p1*stbi__f2f(-0.899976223f); \ - p2 = p5 + p2*stbi__f2f(-2.562915447f); \ - p3 = p3*stbi__f2f(-1.961570560f); \ - p4 = p4*stbi__f2f(-0.390180644f); \ - t3 += p1+p4; \ - t2 += p2+p3; \ - t1 += p2+p4; \ - t0 += p1+p3; - -static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) -{ - int i,val[64],*v=val; - stbi_uc *o; - short *d = data; - - // columns - for (i=0; i < 8; ++i,++d, ++v) { - // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing - if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 - && d[40]==0 && d[48]==0 && d[56]==0) { - // no shortcut 0 seconds - // (1|2|3|4|5|6|7)==0 0 seconds - // all separate -0.047 seconds - // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds - int dcterm = d[0]*4; - v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; - } else { - STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) - // constants scaled things up by 1<<12; let's bring them back - // down, but keep 2 extra bits of precision - x0 += 512; x1 += 512; x2 += 512; x3 += 512; - v[ 0] = (x0+t3) >> 10; - v[56] = (x0-t3) >> 10; - v[ 8] = (x1+t2) >> 10; - v[48] = (x1-t2) >> 10; - v[16] = (x2+t1) >> 10; - v[40] = (x2-t1) >> 10; - v[24] = (x3+t0) >> 10; - v[32] = (x3-t0) >> 10; - } - } - - for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { - // no fast case since the first 1D IDCT spread components out - STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) - // constants scaled things up by 1<<12, plus we had 1<<2 from first - // loop, plus horizontal and vertical each scale by sqrt(8) so together - // we've got an extra 1<<3, so 1<<17 total we need to remove. - // so we want to round that, which means adding 0.5 * 1<<17, - // aka 65536. Also, we'll end up with -128 to 127 that we want - // to encode as 0..255 by adding 128, so we'll add that before the shift - x0 += 65536 + (128<<17); - x1 += 65536 + (128<<17); - x2 += 65536 + (128<<17); - x3 += 65536 + (128<<17); - // tried computing the shifts into temps, or'ing the temps to see - // if any were out of range, but that was slower - o[0] = stbi__clamp((x0+t3) >> 17); - o[7] = stbi__clamp((x0-t3) >> 17); - o[1] = stbi__clamp((x1+t2) >> 17); - o[6] = stbi__clamp((x1-t2) >> 17); - o[2] = stbi__clamp((x2+t1) >> 17); - o[5] = stbi__clamp((x2-t1) >> 17); - o[3] = stbi__clamp((x3+t0) >> 17); - o[4] = stbi__clamp((x3-t0) >> 17); - } -} - -#ifdef STBI_SSE2 -// sse2 integer IDCT. not the fastest possible implementation but it -// produces bit-identical results to the generic C version so it's -// fully "transparent". -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - // This is constructed to match our regular (generic) integer IDCT exactly. - __m128i row0, row1, row2, row3, row4, row5, row6, row7; - __m128i tmp; - - // dot product constant: even elems=x, odd elems=y - #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) - - // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) - // out(1) = c1[even]*x + c1[odd]*y - #define dct_rot(out0,out1, x,y,c0,c1) \ - __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ - __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ - __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ - __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ - __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ - __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) - - // out = in << 12 (in 16-bit, out 32-bit) - #define dct_widen(out, in) \ - __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ - __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) - - // wide add - #define dct_wadd(out, a, b) \ - __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_add_epi32(a##_h, b##_h) - - // wide sub - #define dct_wsub(out, a, b) \ - __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) - - // butterfly a/b, add bias, then shift by "s" and pack - #define dct_bfly32o(out0, out1, a,b,bias,s) \ - { \ - __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ - __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ - dct_wadd(sum, abiased, b); \ - dct_wsub(dif, abiased, b); \ - out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ - out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ - } - - // 8-bit interleave step (for transposes) - #define dct_interleave8(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi8(a, b); \ - b = _mm_unpackhi_epi8(tmp, b) - - // 16-bit interleave step (for transposes) - #define dct_interleave16(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi16(a, b); \ - b = _mm_unpackhi_epi16(tmp, b) - - #define dct_pass(bias,shift) \ - { \ - /* even part */ \ - dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ - __m128i sum04 = _mm_add_epi16(row0, row4); \ - __m128i dif04 = _mm_sub_epi16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ - dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ - __m128i sum17 = _mm_add_epi16(row1, row7); \ - __m128i sum35 = _mm_add_epi16(row3, row5); \ - dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ - dct_wadd(x4, y0o, y4o); \ - dct_wadd(x5, y1o, y5o); \ - dct_wadd(x6, y2o, y5o); \ - dct_wadd(x7, y3o, y4o); \ - dct_bfly32o(row0,row7, x0,x7,bias,shift); \ - dct_bfly32o(row1,row6, x1,x6,bias,shift); \ - dct_bfly32o(row2,row5, x2,x5,bias,shift); \ - dct_bfly32o(row3,row4, x3,x4,bias,shift); \ - } - - __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); - __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); - __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); - __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); - __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); - __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); - __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); - __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); - - // rounding biases in column/row passes, see stbi__idct_block for explanation. - __m128i bias_0 = _mm_set1_epi32(512); - __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); - - // load - row0 = _mm_load_si128((const __m128i *) (data + 0*8)); - row1 = _mm_load_si128((const __m128i *) (data + 1*8)); - row2 = _mm_load_si128((const __m128i *) (data + 2*8)); - row3 = _mm_load_si128((const __m128i *) (data + 3*8)); - row4 = _mm_load_si128((const __m128i *) (data + 4*8)); - row5 = _mm_load_si128((const __m128i *) (data + 5*8)); - row6 = _mm_load_si128((const __m128i *) (data + 6*8)); - row7 = _mm_load_si128((const __m128i *) (data + 7*8)); - - // column pass - dct_pass(bias_0, 10); - - { - // 16bit 8x8 transpose pass 1 - dct_interleave16(row0, row4); - dct_interleave16(row1, row5); - dct_interleave16(row2, row6); - dct_interleave16(row3, row7); - - // transpose pass 2 - dct_interleave16(row0, row2); - dct_interleave16(row1, row3); - dct_interleave16(row4, row6); - dct_interleave16(row5, row7); - - // transpose pass 3 - dct_interleave16(row0, row1); - dct_interleave16(row2, row3); - dct_interleave16(row4, row5); - dct_interleave16(row6, row7); - } - - // row pass - dct_pass(bias_1, 17); - - { - // pack - __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 - __m128i p1 = _mm_packus_epi16(row2, row3); - __m128i p2 = _mm_packus_epi16(row4, row5); - __m128i p3 = _mm_packus_epi16(row6, row7); - - // 8bit 8x8 transpose pass 1 - dct_interleave8(p0, p2); // a0e0a1e1... - dct_interleave8(p1, p3); // c0g0c1g1... - - // transpose pass 2 - dct_interleave8(p0, p1); // a0c0e0g0... - dct_interleave8(p2, p3); // b0d0f0h0... - - // transpose pass 3 - dct_interleave8(p0, p2); // a0b0c0d0... - dct_interleave8(p1, p3); // a4b4c4d4... - - // store - _mm_storel_epi64((__m128i *) out, p0); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p2); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p1); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p3); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); - } - -#undef dct_const -#undef dct_rot -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_interleave8 -#undef dct_interleave16 -#undef dct_pass -} - -#endif // STBI_SSE2 - -#ifdef STBI_NEON - -// NEON integer IDCT. should produce bit-identical -// results to the generic C version. -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; - - int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); - int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); - int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); - int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); - int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); - int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); - int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); - int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); - int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); - int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); - int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); - int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); - -#define dct_long_mul(out, inq, coeff) \ - int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) - -#define dct_long_mac(out, acc, inq, coeff) \ - int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) - -#define dct_widen(out, inq) \ - int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ - int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) - -// wide add -#define dct_wadd(out, a, b) \ - int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vaddq_s32(a##_h, b##_h) - -// wide sub -#define dct_wsub(out, a, b) \ - int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vsubq_s32(a##_h, b##_h) - -// butterfly a/b, then shift using "shiftop" by "s" and pack -#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ - { \ - dct_wadd(sum, a, b); \ - dct_wsub(dif, a, b); \ - out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ - out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ - } - -#define dct_pass(shiftop, shift) \ - { \ - /* even part */ \ - int16x8_t sum26 = vaddq_s16(row2, row6); \ - dct_long_mul(p1e, sum26, rot0_0); \ - dct_long_mac(t2e, p1e, row6, rot0_1); \ - dct_long_mac(t3e, p1e, row2, rot0_2); \ - int16x8_t sum04 = vaddq_s16(row0, row4); \ - int16x8_t dif04 = vsubq_s16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - int16x8_t sum15 = vaddq_s16(row1, row5); \ - int16x8_t sum17 = vaddq_s16(row1, row7); \ - int16x8_t sum35 = vaddq_s16(row3, row5); \ - int16x8_t sum37 = vaddq_s16(row3, row7); \ - int16x8_t sumodd = vaddq_s16(sum17, sum35); \ - dct_long_mul(p5o, sumodd, rot1_0); \ - dct_long_mac(p1o, p5o, sum17, rot1_1); \ - dct_long_mac(p2o, p5o, sum35, rot1_2); \ - dct_long_mul(p3o, sum37, rot2_0); \ - dct_long_mul(p4o, sum15, rot2_1); \ - dct_wadd(sump13o, p1o, p3o); \ - dct_wadd(sump24o, p2o, p4o); \ - dct_wadd(sump23o, p2o, p3o); \ - dct_wadd(sump14o, p1o, p4o); \ - dct_long_mac(x4, sump13o, row7, rot3_0); \ - dct_long_mac(x5, sump24o, row5, rot3_1); \ - dct_long_mac(x6, sump23o, row3, rot3_2); \ - dct_long_mac(x7, sump14o, row1, rot3_3); \ - dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ - dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ - dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ - dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ - } - - // load - row0 = vld1q_s16(data + 0*8); - row1 = vld1q_s16(data + 1*8); - row2 = vld1q_s16(data + 2*8); - row3 = vld1q_s16(data + 3*8); - row4 = vld1q_s16(data + 4*8); - row5 = vld1q_s16(data + 5*8); - row6 = vld1q_s16(data + 6*8); - row7 = vld1q_s16(data + 7*8); - - // add DC bias - row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); - - // column pass - dct_pass(vrshrn_n_s32, 10); - - // 16bit 8x8 transpose - { -// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. -// whether compilers actually get this is another story, sadly. -#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } -#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } -#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } - - // pass 1 - dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 - dct_trn16(row2, row3); - dct_trn16(row4, row5); - dct_trn16(row6, row7); - - // pass 2 - dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 - dct_trn32(row1, row3); - dct_trn32(row4, row6); - dct_trn32(row5, row7); - - // pass 3 - dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 - dct_trn64(row1, row5); - dct_trn64(row2, row6); - dct_trn64(row3, row7); - -#undef dct_trn16 -#undef dct_trn32 -#undef dct_trn64 - } - - // row pass - // vrshrn_n_s32 only supports shifts up to 16, we need - // 17. so do a non-rounding shift of 16 first then follow - // up with a rounding shift by 1. - dct_pass(vshrn_n_s32, 16); - - { - // pack and round - uint8x8_t p0 = vqrshrun_n_s16(row0, 1); - uint8x8_t p1 = vqrshrun_n_s16(row1, 1); - uint8x8_t p2 = vqrshrun_n_s16(row2, 1); - uint8x8_t p3 = vqrshrun_n_s16(row3, 1); - uint8x8_t p4 = vqrshrun_n_s16(row4, 1); - uint8x8_t p5 = vqrshrun_n_s16(row5, 1); - uint8x8_t p6 = vqrshrun_n_s16(row6, 1); - uint8x8_t p7 = vqrshrun_n_s16(row7, 1); - - // again, these can translate into one instruction, but often don't. -#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } -#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } -#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } - - // sadly can't use interleaved stores here since we only write - // 8 bytes to each scan line! - - // 8x8 8-bit transpose pass 1 - dct_trn8_8(p0, p1); - dct_trn8_8(p2, p3); - dct_trn8_8(p4, p5); - dct_trn8_8(p6, p7); - - // pass 2 - dct_trn8_16(p0, p2); - dct_trn8_16(p1, p3); - dct_trn8_16(p4, p6); - dct_trn8_16(p5, p7); - - // pass 3 - dct_trn8_32(p0, p4); - dct_trn8_32(p1, p5); - dct_trn8_32(p2, p6); - dct_trn8_32(p3, p7); - - // store - vst1_u8(out, p0); out += out_stride; - vst1_u8(out, p1); out += out_stride; - vst1_u8(out, p2); out += out_stride; - vst1_u8(out, p3); out += out_stride; - vst1_u8(out, p4); out += out_stride; - vst1_u8(out, p5); out += out_stride; - vst1_u8(out, p6); out += out_stride; - vst1_u8(out, p7); - -#undef dct_trn8_8 -#undef dct_trn8_16 -#undef dct_trn8_32 - } - -#undef dct_long_mul -#undef dct_long_mac -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_pass -} - -#endif // STBI_NEON - -#define STBI__MARKER_none 0xff -// if there's a pending marker from the entropy stream, return that -// otherwise, fetch from the stream and get a marker. if there's no -// marker, return 0xff, which is never a valid marker value -static stbi_uc stbi__get_marker(stbi__jpeg *j) -{ - stbi_uc x; - if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } - x = stbi__get8(j->s); - if (x != 0xff) return STBI__MARKER_none; - while (x == 0xff) - x = stbi__get8(j->s); // consume repeated 0xff fill bytes - return x; -} - -// in each scan, we'll have scan_n components, and the order -// of the components is specified by order[] -#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) - -// after a restart interval, stbi__jpeg_reset the entropy decoder and -// the dc prediction -static void stbi__jpeg_reset(stbi__jpeg *j) -{ - j->code_bits = 0; - j->code_buffer = 0; - j->nomore = 0; - j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0; - j->marker = STBI__MARKER_none; - j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; - j->eob_run = 0; - // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, - // since we don't even allow 1<<30 pixels -} - -static int stbi__parse_entropy_coded_data(stbi__jpeg *z) -{ - stbi__jpeg_reset(z); - if (!z->progressive) { - if (z->scan_n == 1) { - int i,j; - STBI_SIMD_ALIGN(short, data[64]); - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - // if it's NOT a restart, then just bail, so we get corrupt data - // rather than no data - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } else { // interleaved - int i,j,k,x,y; - STBI_SIMD_ALIGN(short, data[64]); - for (j=0; j < z->img_mcu_y; ++j) { - for (i=0; i < z->img_mcu_x; ++i) { - // scan an interleaved mcu... process scan_n components in order - for (k=0; k < z->scan_n; ++k) { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y=0; y < z->img_comp[n].v; ++y) { - for (x=0; x < z->img_comp[n].h; ++x) { - int x2 = (i*z->img_comp[n].h + x)*8; - int y2 = (j*z->img_comp[n].v + y)*8; - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } else { - if (z->scan_n == 1) { - int i,j; - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - if (z->spec_start == 0) { - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } else { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) - return 0; - } - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } else { // interleaved - int i,j,k,x,y; - for (j=0; j < z->img_mcu_y; ++j) { - for (i=0; i < z->img_mcu_x; ++i) { - // scan an interleaved mcu... process scan_n components in order - for (k=0; k < z->scan_n; ++k) { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y=0; y < z->img_comp[n].v; ++y) { - for (x=0; x < z->img_comp[n].h; ++x) { - int x2 = (i*z->img_comp[n].h + x); - int y2 = (j*z->img_comp[n].v + y); - short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } -} - -static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant) -{ - int i; - for (i=0; i < 64; ++i) - data[i] *= dequant[i]; -} - -static void stbi__jpeg_finish(stbi__jpeg *z) -{ - if (z->progressive) { - // dequantize and idct the data - int i,j,n; - for (n=0; n < z->s->img_n; ++n) { - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); - } - } - } - } -} - -static int stbi__process_marker(stbi__jpeg *z, int m) -{ - int L; - switch (m) { - case STBI__MARKER_none: // no marker found - return stbi__err("expected marker","Corrupt JPEG"); - - case 0xDD: // DRI - specify restart interval - if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); - z->restart_interval = stbi__get16be(z->s); - return 1; - - case 0xDB: // DQT - define quantization table - L = stbi__get16be(z->s)-2; - while (L > 0) { - int q = stbi__get8(z->s); - int p = q >> 4, sixteen = (p != 0); - int t = q & 15,i; - if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG"); - if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); - - for (i=0; i < 64; ++i) - z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s)); - L -= (sixteen ? 129 : 65); - } - return L==0; - - case 0xC4: // DHT - define huffman table - L = stbi__get16be(z->s)-2; - while (L > 0) { - stbi_uc *v; - int sizes[16],i,n=0; - int q = stbi__get8(z->s); - int tc = q >> 4; - int th = q & 15; - if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); - for (i=0; i < 16; ++i) { - sizes[i] = stbi__get8(z->s); - n += sizes[i]; - } - if(n > 256) return stbi__err("bad DHT header","Corrupt JPEG"); // Loop over i < n would write past end of values! - L -= 17; - if (tc == 0) { - if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; - v = z->huff_dc[th].values; - } else { - if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; - v = z->huff_ac[th].values; - } - for (i=0; i < n; ++i) - v[i] = stbi__get8(z->s); - if (tc != 0) - stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); - L -= n; - } - return L==0; - } - - // check for comment block or APP blocks - if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { - L = stbi__get16be(z->s); - if (L < 2) { - if (m == 0xFE) - return stbi__err("bad COM len","Corrupt JPEG"); - else - return stbi__err("bad APP len","Corrupt JPEG"); - } - L -= 2; - - if (m == 0xE0 && L >= 5) { // JFIF APP0 segment - static const unsigned char tag[5] = {'J','F','I','F','\0'}; - int ok = 1; - int i; - for (i=0; i < 5; ++i) - if (stbi__get8(z->s) != tag[i]) - ok = 0; - L -= 5; - if (ok) - z->jfif = 1; - } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment - static const unsigned char tag[6] = {'A','d','o','b','e','\0'}; - int ok = 1; - int i; - for (i=0; i < 6; ++i) - if (stbi__get8(z->s) != tag[i]) - ok = 0; - L -= 6; - if (ok) { - stbi__get8(z->s); // version - stbi__get16be(z->s); // flags0 - stbi__get16be(z->s); // flags1 - z->app14_color_transform = stbi__get8(z->s); // color transform - L -= 6; - } - } - - stbi__skip(z->s, L); - return 1; - } - - return stbi__err("unknown marker","Corrupt JPEG"); -} - -// after we see SOS -static int stbi__process_scan_header(stbi__jpeg *z) -{ - int i; - int Ls = stbi__get16be(z->s); - z->scan_n = stbi__get8(z->s); - if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); - if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); - for (i=0; i < z->scan_n; ++i) { - int id = stbi__get8(z->s), which; - int q = stbi__get8(z->s); - for (which = 0; which < z->s->img_n; ++which) - if (z->img_comp[which].id == id) - break; - if (which == z->s->img_n) return 0; // no match - z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); - z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); - z->order[i] = which; - } - - { - int aa; - z->spec_start = stbi__get8(z->s); - z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 - aa = stbi__get8(z->s); - z->succ_high = (aa >> 4); - z->succ_low = (aa & 15); - if (z->progressive) { - if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) - return stbi__err("bad SOS", "Corrupt JPEG"); - } else { - if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); - if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); - z->spec_end = 63; - } - } - - return 1; -} - -static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why) -{ - int i; - for (i=0; i < ncomp; ++i) { - if (z->img_comp[i].raw_data) { - STBI_FREE(z->img_comp[i].raw_data); - z->img_comp[i].raw_data = NULL; - z->img_comp[i].data = NULL; - } - if (z->img_comp[i].raw_coeff) { - STBI_FREE(z->img_comp[i].raw_coeff); - z->img_comp[i].raw_coeff = 0; - z->img_comp[i].coeff = 0; - } - if (z->img_comp[i].linebuf) { - STBI_FREE(z->img_comp[i].linebuf); - z->img_comp[i].linebuf = NULL; - } - } - return why; -} - -static int stbi__process_frame_header(stbi__jpeg *z, int scan) -{ - stbi__context *s = z->s; - int Lf,p,i,q, h_max=1,v_max=1,c; - Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG - p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline - s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG - s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires - if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); - c = stbi__get8(s); - if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG"); - s->img_n = c; - for (i=0; i < c; ++i) { - z->img_comp[i].data = NULL; - z->img_comp[i].linebuf = NULL; - } - - if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); - - z->rgb = 0; - for (i=0; i < s->img_n; ++i) { - static const unsigned char rgb[3] = { 'R', 'G', 'B' }; - z->img_comp[i].id = stbi__get8(s); - if (s->img_n == 3 && z->img_comp[i].id == rgb[i]) - ++z->rgb; - q = stbi__get8(s); - z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); - z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); - z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); - } - - if (scan != STBI__SCAN_load) return 1; - - if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode"); - - for (i=0; i < s->img_n; ++i) { - if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; - if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; - } - - // check that plane subsampling factors are integer ratios; our resamplers can't deal with fractional ratios - // and I've never seen a non-corrupted JPEG file actually use them - for (i=0; i < s->img_n; ++i) { - if (h_max % z->img_comp[i].h != 0) return stbi__err("bad H","Corrupt JPEG"); - if (v_max % z->img_comp[i].v != 0) return stbi__err("bad V","Corrupt JPEG"); - } - - // compute interleaved mcu info - z->img_h_max = h_max; - z->img_v_max = v_max; - z->img_mcu_w = h_max * 8; - z->img_mcu_h = v_max * 8; - // these sizes can't be more than 17 bits - z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; - z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; - - for (i=0; i < s->img_n; ++i) { - // number of effective pixels (e.g. for non-interleaved MCU) - z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; - z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; - // to simplify generation, we'll allocate enough memory to decode - // the bogus oversized data from using interleaved MCUs and their - // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't - // discard the extra data until colorspace conversion - // - // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier) - // so these muls can't overflow with 32-bit ints (which we require) - z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; - z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; - z->img_comp[i].coeff = 0; - z->img_comp[i].raw_coeff = 0; - z->img_comp[i].linebuf = NULL; - z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15); - if (z->img_comp[i].raw_data == NULL) - return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); - // align blocks for idct using mmx/sse - z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); - if (z->progressive) { - // w2, h2 are multiples of 8 (see above) - z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8; - z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8; - z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15); - if (z->img_comp[i].raw_coeff == NULL) - return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); - z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); - } - } - - return 1; -} - -// use comparisons since in some cases we handle more than one case (e.g. SOF) -#define stbi__DNL(x) ((x) == 0xdc) -#define stbi__SOI(x) ((x) == 0xd8) -#define stbi__EOI(x) ((x) == 0xd9) -#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) -#define stbi__SOS(x) ((x) == 0xda) - -#define stbi__SOF_progressive(x) ((x) == 0xc2) - -static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) -{ - int m; - z->jfif = 0; - z->app14_color_transform = -1; // valid values are 0,1,2 - z->marker = STBI__MARKER_none; // initialize cached marker to empty - m = stbi__get_marker(z); - if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); - if (scan == STBI__SCAN_type) return 1; - m = stbi__get_marker(z); - while (!stbi__SOF(m)) { - if (!stbi__process_marker(z,m)) return 0; - m = stbi__get_marker(z); - while (m == STBI__MARKER_none) { - // some files have extra padding after their blocks, so ok, we'll scan - if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); - m = stbi__get_marker(z); - } - } - z->progressive = stbi__SOF_progressive(m); - if (!stbi__process_frame_header(z, scan)) return 0; - return 1; -} - -static stbi_uc stbi__skip_jpeg_junk_at_end(stbi__jpeg *j) -{ - // some JPEGs have junk at end, skip over it but if we find what looks - // like a valid marker, resume there - while (!stbi__at_eof(j->s)) { - stbi_uc x = stbi__get8(j->s); - while (x == 0xff) { // might be a marker - if (stbi__at_eof(j->s)) return STBI__MARKER_none; - x = stbi__get8(j->s); - if (x != 0x00 && x != 0xff) { - // not a stuffed zero or lead-in to another marker, looks - // like an actual marker, return it - return x; - } - // stuffed zero has x=0 now which ends the loop, meaning we go - // back to regular scan loop. - // repeated 0xff keeps trying to read the next byte of the marker. - } - } - return STBI__MARKER_none; -} - -// decode image to YCbCr format -static int stbi__decode_jpeg_image(stbi__jpeg *j) -{ - int m; - for (m = 0; m < 4; m++) { - j->img_comp[m].raw_data = NULL; - j->img_comp[m].raw_coeff = NULL; - } - j->restart_interval = 0; - if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; - m = stbi__get_marker(j); - while (!stbi__EOI(m)) { - if (stbi__SOS(m)) { - if (!stbi__process_scan_header(j)) return 0; - if (!stbi__parse_entropy_coded_data(j)) return 0; - if (j->marker == STBI__MARKER_none ) { - j->marker = stbi__skip_jpeg_junk_at_end(j); - // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 - } - m = stbi__get_marker(j); - if (STBI__RESTART(m)) - m = stbi__get_marker(j); - } else if (stbi__DNL(m)) { - int Ld = stbi__get16be(j->s); - stbi__uint32 NL = stbi__get16be(j->s); - if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG"); - if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG"); - m = stbi__get_marker(j); - } else { - if (!stbi__process_marker(j, m)) return 1; - m = stbi__get_marker(j); - } - } - if (j->progressive) - stbi__jpeg_finish(j); - return 1; -} - -// static jfif-centered resampling (across block boundaries) - -typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, - int w, int hs); - -#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) - -static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - STBI_NOTUSED(out); - STBI_NOTUSED(in_far); - STBI_NOTUSED(w); - STBI_NOTUSED(hs); - return in_near; -} - -static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples vertically for every one in input - int i; - STBI_NOTUSED(hs); - for (i=0; i < w; ++i) - out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); - return out; -} - -static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples horizontally for every one in input - int i; - stbi_uc *input = in_near; - - if (w == 1) { - // if only one sample, can't do any interpolation - out[0] = out[1] = input[0]; - return out; - } - - out[0] = input[0]; - out[1] = stbi__div4(input[0]*3 + input[1] + 2); - for (i=1; i < w-1; ++i) { - int n = 3*input[i]+2; - out[i*2+0] = stbi__div4(n+input[i-1]); - out[i*2+1] = stbi__div4(n+input[i+1]); - } - out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); - out[i*2+1] = input[w-1]; - - STBI_NOTUSED(in_far); - STBI_NOTUSED(hs); - - return out; -} - -#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) - -static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i,t0,t1; - if (w == 1) { - out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3*in_near[0] + in_far[0]; - out[0] = stbi__div4(t1+2); - for (i=1; i < w; ++i) { - t0 = t1; - t1 = 3*in_near[i]+in_far[i]; - out[i*2-1] = stbi__div16(3*t0 + t1 + 8); - out[i*2 ] = stbi__div16(3*t1 + t0 + 8); - } - out[w*2-1] = stbi__div4(t1+2); - - STBI_NOTUSED(hs); - - return out; -} - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i=0,t0,t1; - - if (w == 1) { - out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3*in_near[0] + in_far[0]; - // process groups of 8 pixels for as long as we can. - // note we can't handle the last pixel in a row in this loop - // because we need to handle the filter boundary conditions. - for (; i < ((w-1) & ~7); i += 8) { -#if defined(STBI_SSE2) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - __m128i zero = _mm_setzero_si128(); - __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); - __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); - __m128i farw = _mm_unpacklo_epi8(farb, zero); - __m128i nearw = _mm_unpacklo_epi8(nearb, zero); - __m128i diff = _mm_sub_epi16(farw, nearw); - __m128i nears = _mm_slli_epi16(nearw, 2); - __m128i curr = _mm_add_epi16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - __m128i prv0 = _mm_slli_si128(curr, 2); - __m128i nxt0 = _mm_srli_si128(curr, 2); - __m128i prev = _mm_insert_epi16(prv0, t1, 0); - __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - __m128i bias = _mm_set1_epi16(8); - __m128i curs = _mm_slli_epi16(curr, 2); - __m128i prvd = _mm_sub_epi16(prev, curr); - __m128i nxtd = _mm_sub_epi16(next, curr); - __m128i curb = _mm_add_epi16(curs, bias); - __m128i even = _mm_add_epi16(prvd, curb); - __m128i odd = _mm_add_epi16(nxtd, curb); - - // interleave even and odd pixels, then undo scaling. - __m128i int0 = _mm_unpacklo_epi16(even, odd); - __m128i int1 = _mm_unpackhi_epi16(even, odd); - __m128i de0 = _mm_srli_epi16(int0, 4); - __m128i de1 = _mm_srli_epi16(int1, 4); - - // pack and write output - __m128i outv = _mm_packus_epi16(de0, de1); - _mm_storeu_si128((__m128i *) (out + i*2), outv); -#elif defined(STBI_NEON) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - uint8x8_t farb = vld1_u8(in_far + i); - uint8x8_t nearb = vld1_u8(in_near + i); - int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); - int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); - int16x8_t curr = vaddq_s16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - int16x8_t prv0 = vextq_s16(curr, curr, 7); - int16x8_t nxt0 = vextq_s16(curr, curr, 1); - int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); - int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - int16x8_t curs = vshlq_n_s16(curr, 2); - int16x8_t prvd = vsubq_s16(prev, curr); - int16x8_t nxtd = vsubq_s16(next, curr); - int16x8_t even = vaddq_s16(curs, prvd); - int16x8_t odd = vaddq_s16(curs, nxtd); - - // undo scaling and round, then store with even/odd phases interleaved - uint8x8x2_t o; - o.val[0] = vqrshrun_n_s16(even, 4); - o.val[1] = vqrshrun_n_s16(odd, 4); - vst2_u8(out + i*2, o); -#endif - - // "previous" value for next iter - t1 = 3*in_near[i+7] + in_far[i+7]; - } - - t0 = t1; - t1 = 3*in_near[i] + in_far[i]; - out[i*2] = stbi__div16(3*t1 + t0 + 8); - - for (++i; i < w; ++i) { - t0 = t1; - t1 = 3*in_near[i]+in_far[i]; - out[i*2-1] = stbi__div16(3*t0 + t1 + 8); - out[i*2 ] = stbi__div16(3*t1 + t0 + 8); - } - out[w*2-1] = stbi__div4(t1+2); - - STBI_NOTUSED(hs); - - return out; -} -#endif - -static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // resample with nearest-neighbor - int i,j; - STBI_NOTUSED(in_far); - for (i=0; i < w; ++i) - for (j=0; j < hs; ++j) - out[i*hs+j] = in_near[i]; - return out; -} - -// this is a reduced-precision calculation of YCbCr-to-RGB introduced -// to make sure the code produces the same results in both SIMD and scalar -#define stbi__float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) -static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) -{ - int i; - for (i=0; i < count; ++i) { - int y_fixed = (y[i] << 20) + (1<<19); // rounding - int r,g,b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr* stbi__float2fixed(1.40200f); - g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb* stbi__float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } - if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } - if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) -{ - int i = 0; - -#ifdef STBI_SSE2 - // step == 3 is pretty ugly on the final interleave, and i'm not convinced - // it's useful in practice (you wouldn't use it for textures, for example). - // so just accelerate step == 4 case. - if (step == 4) { - // this is a fairly straightforward implementation and not super-optimized. - __m128i signflip = _mm_set1_epi8(-0x80); - __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); - __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); - __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); - __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); - __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); - __m128i xw = _mm_set1_epi16(255); // alpha channel - - for (; i+7 < count; i += 8) { - // load - __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); - __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); - __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); - __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 - __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 - - // unpack to short (and left-shift cr, cb by 8) - __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); - __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); - __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); - - // color transform - __m128i yws = _mm_srli_epi16(yw, 4); - __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); - __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); - __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); - __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); - __m128i rws = _mm_add_epi16(cr0, yws); - __m128i gwt = _mm_add_epi16(cb0, yws); - __m128i bws = _mm_add_epi16(yws, cb1); - __m128i gws = _mm_add_epi16(gwt, cr1); - - // descale - __m128i rw = _mm_srai_epi16(rws, 4); - __m128i bw = _mm_srai_epi16(bws, 4); - __m128i gw = _mm_srai_epi16(gws, 4); - - // back to byte, set up for transpose - __m128i brb = _mm_packus_epi16(rw, bw); - __m128i gxb = _mm_packus_epi16(gw, xw); - - // transpose to interleave channels - __m128i t0 = _mm_unpacklo_epi8(brb, gxb); - __m128i t1 = _mm_unpackhi_epi8(brb, gxb); - __m128i o0 = _mm_unpacklo_epi16(t0, t1); - __m128i o1 = _mm_unpackhi_epi16(t0, t1); - - // store - _mm_storeu_si128((__m128i *) (out + 0), o0); - _mm_storeu_si128((__m128i *) (out + 16), o1); - out += 32; - } - } -#endif - -#ifdef STBI_NEON - // in this version, step=3 support would be easy to add. but is there demand? - if (step == 4) { - // this is a fairly straightforward implementation and not super-optimized. - uint8x8_t signflip = vdup_n_u8(0x80); - int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); - int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); - int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); - int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); - - for (; i+7 < count; i += 8) { - // load - uint8x8_t y_bytes = vld1_u8(y + i); - uint8x8_t cr_bytes = vld1_u8(pcr + i); - uint8x8_t cb_bytes = vld1_u8(pcb + i); - int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); - int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); - - // expand to s16 - int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); - int16x8_t crw = vshll_n_s8(cr_biased, 7); - int16x8_t cbw = vshll_n_s8(cb_biased, 7); - - // color transform - int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); - int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); - int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); - int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); - int16x8_t rws = vaddq_s16(yws, cr0); - int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); - int16x8_t bws = vaddq_s16(yws, cb1); - - // undo scaling, round, convert to byte - uint8x8x4_t o; - o.val[0] = vqrshrun_n_s16(rws, 4); - o.val[1] = vqrshrun_n_s16(gws, 4); - o.val[2] = vqrshrun_n_s16(bws, 4); - o.val[3] = vdup_n_u8(255); - - // store, interleaving r/g/b/a - vst4_u8(out, o); - out += 8*4; - } - } -#endif - - for (; i < count; ++i) { - int y_fixed = (y[i] << 20) + (1<<19); // rounding - int r,g,b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr* stbi__float2fixed(1.40200f); - g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb* stbi__float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } - if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } - if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} -#endif - -// set up the kernels -static void stbi__setup_jpeg(stbi__jpeg *j) -{ - j->idct_block_kernel = stbi__idct_block; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; - -#ifdef STBI_SSE2 - if (stbi__sse2_available()) { - j->idct_block_kernel = stbi__idct_simd; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; - } -#endif - -#ifdef STBI_NEON - j->idct_block_kernel = stbi__idct_simd; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; -#endif -} - -// clean up the temporary component buffers -static void stbi__cleanup_jpeg(stbi__jpeg *j) -{ - stbi__free_jpeg_components(j, j->s->img_n, 0); -} - -typedef struct -{ - resample_row_func resample; - stbi_uc *line0,*line1; - int hs,vs; // expansion factor in each axis - int w_lores; // horizontal pixels pre-expansion - int ystep; // how far through vertical expansion we are - int ypos; // which pre-expansion row we're on -} stbi__resample; - -// fast 0..255 * 0..255 => 0..255 rounded multiplication -static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y) -{ - unsigned int t = x*y + 128; - return (stbi_uc) ((t + (t >>8)) >> 8); -} - -static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) -{ - int n, decode_n, is_rgb; - z->s->img_n = 0; // make stbi__cleanup_jpeg safe - - // validate req_comp - if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); - - // load a jpeg image from whichever source, but leave in YCbCr format - if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } - - // determine actual number of components to generate - n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1; - - is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif)); - - if (z->s->img_n == 3 && n < 3 && !is_rgb) - decode_n = 1; - else - decode_n = z->s->img_n; - - // nothing to do if no components requested; check this now to avoid - // accessing uninitialized coutput[0] later - if (decode_n <= 0) { stbi__cleanup_jpeg(z); return NULL; } - - // resample and color-convert - { - int k; - unsigned int i,j; - stbi_uc *output; - stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL }; - - stbi__resample res_comp[4]; - - for (k=0; k < decode_n; ++k) { - stbi__resample *r = &res_comp[k]; - - // allocate line buffer big enough for upsampling off the edges - // with upsample factor of 4 - z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); - if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } - - r->hs = z->img_h_max / z->img_comp[k].h; - r->vs = z->img_v_max / z->img_comp[k].v; - r->ystep = r->vs >> 1; - r->w_lores = (z->s->img_x + r->hs-1) / r->hs; - r->ypos = 0; - r->line0 = r->line1 = z->img_comp[k].data; - - if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; - else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; - else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; - else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; - else r->resample = stbi__resample_row_generic; - } - - // can't error after this so, this is safe - output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1); - if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } - - // now go ahead and resample - for (j=0; j < z->s->img_y; ++j) { - stbi_uc *out = output + n * z->s->img_x * j; - for (k=0; k < decode_n; ++k) { - stbi__resample *r = &res_comp[k]; - int y_bot = r->ystep >= (r->vs >> 1); - coutput[k] = r->resample(z->img_comp[k].linebuf, - y_bot ? r->line1 : r->line0, - y_bot ? r->line0 : r->line1, - r->w_lores, r->hs); - if (++r->ystep >= r->vs) { - r->ystep = 0; - r->line0 = r->line1; - if (++r->ypos < z->img_comp[k].y) - r->line1 += z->img_comp[k].w2; - } - } - if (n >= 3) { - stbi_uc *y = coutput[0]; - if (z->s->img_n == 3) { - if (is_rgb) { - for (i=0; i < z->s->img_x; ++i) { - out[0] = y[i]; - out[1] = coutput[1][i]; - out[2] = coutput[2][i]; - out[3] = 255; - out += n; - } - } else { - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - } - } else if (z->s->img_n == 4) { - if (z->app14_color_transform == 0) { // CMYK - for (i=0; i < z->s->img_x; ++i) { - stbi_uc m = coutput[3][i]; - out[0] = stbi__blinn_8x8(coutput[0][i], m); - out[1] = stbi__blinn_8x8(coutput[1][i], m); - out[2] = stbi__blinn_8x8(coutput[2][i], m); - out[3] = 255; - out += n; - } - } else if (z->app14_color_transform == 2) { // YCCK - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - for (i=0; i < z->s->img_x; ++i) { - stbi_uc m = coutput[3][i]; - out[0] = stbi__blinn_8x8(255 - out[0], m); - out[1] = stbi__blinn_8x8(255 - out[1], m); - out[2] = stbi__blinn_8x8(255 - out[2], m); - out += n; - } - } else { // YCbCr + alpha? Ignore the fourth channel for now - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - } - } else - for (i=0; i < z->s->img_x; ++i) { - out[0] = out[1] = out[2] = y[i]; - out[3] = 255; // not used if n==3 - out += n; - } - } else { - if (is_rgb) { - if (n == 1) - for (i=0; i < z->s->img_x; ++i) - *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); - else { - for (i=0; i < z->s->img_x; ++i, out += 2) { - out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); - out[1] = 255; - } - } - } else if (z->s->img_n == 4 && z->app14_color_transform == 0) { - for (i=0; i < z->s->img_x; ++i) { - stbi_uc m = coutput[3][i]; - stbi_uc r = stbi__blinn_8x8(coutput[0][i], m); - stbi_uc g = stbi__blinn_8x8(coutput[1][i], m); - stbi_uc b = stbi__blinn_8x8(coutput[2][i], m); - out[0] = stbi__compute_y(r, g, b); - out[1] = 255; - out += n; - } - } else if (z->s->img_n == 4 && z->app14_color_transform == 2) { - for (i=0; i < z->s->img_x; ++i) { - out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]); - out[1] = 255; - out += n; - } - } else { - stbi_uc *y = coutput[0]; - if (n == 1) - for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; - else - for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; } - } - } - } - stbi__cleanup_jpeg(z); - *out_x = z->s->img_x; - *out_y = z->s->img_y; - if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output - return output; - } -} - -static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - unsigned char* result; - stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); - if (!j) return stbi__errpuc("outofmem", "Out of memory"); - memset(j, 0, sizeof(stbi__jpeg)); - STBI_NOTUSED(ri); - j->s = s; - stbi__setup_jpeg(j); - result = load_jpeg_image(j, x,y,comp,req_comp); - STBI_FREE(j); - return result; -} - -static int stbi__jpeg_test(stbi__context *s) -{ - int r; - stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg)); - if (!j) return stbi__err("outofmem", "Out of memory"); - memset(j, 0, sizeof(stbi__jpeg)); - j->s = s; - stbi__setup_jpeg(j); - r = stbi__decode_jpeg_header(j, STBI__SCAN_type); - stbi__rewind(s); - STBI_FREE(j); - return r; -} - -static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) -{ - if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { - stbi__rewind( j->s ); - return 0; - } - if (x) *x = j->s->img_x; - if (y) *y = j->s->img_y; - if (comp) *comp = j->s->img_n >= 3 ? 3 : 1; - return 1; -} - -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) -{ - int result; - stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); - if (!j) return stbi__err("outofmem", "Out of memory"); - memset(j, 0, sizeof(stbi__jpeg)); - j->s = s; - result = stbi__jpeg_info_raw(j, x, y, comp); - STBI_FREE(j); - return result; -} -#endif - -// public domain zlib decode v0.2 Sean Barrett 2006-11-18 -// simple implementation -// - all input must be provided in an upfront buffer -// - all output is written to a single output buffer (can malloc/realloc) -// performance -// - fast huffman - -#ifndef STBI_NO_ZLIB - -// fast-way is faster to check than jpeg huffman, but slow way is slower -#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables -#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) -#define STBI__ZNSYMS 288 // number of symbols in literal/length alphabet - -// zlib-style huffman encoding -// (jpegs packs from left, zlib from right, so can't share code) -typedef struct -{ - stbi__uint16 fast[1 << STBI__ZFAST_BITS]; - stbi__uint16 firstcode[16]; - int maxcode[17]; - stbi__uint16 firstsymbol[16]; - stbi_uc size[STBI__ZNSYMS]; - stbi__uint16 value[STBI__ZNSYMS]; -} stbi__zhuffman; - -stbi_inline static int stbi__bitreverse16(int n) -{ - n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); - n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); - n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); - n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); - return n; -} - -stbi_inline static int stbi__bit_reverse(int v, int bits) -{ - STBI_ASSERT(bits <= 16); - // to bit reverse n bits, reverse 16 and shift - // e.g. 11 bits, bit reverse and shift away 5 - return stbi__bitreverse16(v) >> (16-bits); -} - -static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num) -{ - int i,k=0; - int code, next_code[16], sizes[17]; - - // DEFLATE spec for generating codes - memset(sizes, 0, sizeof(sizes)); - memset(z->fast, 0, sizeof(z->fast)); - for (i=0; i < num; ++i) - ++sizes[sizelist[i]]; - sizes[0] = 0; - for (i=1; i < 16; ++i) - if (sizes[i] > (1 << i)) - return stbi__err("bad sizes", "Corrupt PNG"); - code = 0; - for (i=1; i < 16; ++i) { - next_code[i] = code; - z->firstcode[i] = (stbi__uint16) code; - z->firstsymbol[i] = (stbi__uint16) k; - code = (code + sizes[i]); - if (sizes[i]) - if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); - z->maxcode[i] = code << (16-i); // preshift for inner loop - code <<= 1; - k += sizes[i]; - } - z->maxcode[16] = 0x10000; // sentinel - for (i=0; i < num; ++i) { - int s = sizelist[i]; - if (s) { - int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; - stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); - z->size [c] = (stbi_uc ) s; - z->value[c] = (stbi__uint16) i; - if (s <= STBI__ZFAST_BITS) { - int j = stbi__bit_reverse(next_code[s],s); - while (j < (1 << STBI__ZFAST_BITS)) { - z->fast[j] = fastv; - j += (1 << s); - } - } - ++next_code[s]; - } - } - return 1; -} - -// zlib-from-memory implementation for PNG reading -// because PNG allows splitting the zlib stream arbitrarily, -// and it's annoying structurally to have PNG call ZLIB call PNG, -// we require PNG read all the IDATs and combine them into a single -// memory buffer - -typedef struct -{ - stbi_uc *zbuffer, *zbuffer_end; - int num_bits; - int hit_zeof_once; - stbi__uint32 code_buffer; - - char *zout; - char *zout_start; - char *zout_end; - int z_expandable; - - stbi__zhuffman z_length, z_distance; -} stbi__zbuf; - -stbi_inline static int stbi__zeof(stbi__zbuf *z) -{ - return (z->zbuffer >= z->zbuffer_end); -} - -stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) -{ - return stbi__zeof(z) ? 0 : *z->zbuffer++; -} - -static void stbi__fill_bits(stbi__zbuf *z) -{ - do { - if (z->code_buffer >= (1U << z->num_bits)) { - z->zbuffer = z->zbuffer_end; /* treat this as EOF so we fail. */ - return; - } - z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; - z->num_bits += 8; - } while (z->num_bits <= 24); -} - -stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) -{ - unsigned int k; - if (z->num_bits < n) stbi__fill_bits(z); - k = z->code_buffer & ((1 << n) - 1); - z->code_buffer >>= n; - z->num_bits -= n; - return k; -} - -static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b,s,k; - // not resolved by fast table, so compute it the slow way - // use jpeg approach, which requires MSbits at top - k = stbi__bit_reverse(a->code_buffer, 16); - for (s=STBI__ZFAST_BITS+1; ; ++s) - if (k < z->maxcode[s]) - break; - if (s >= 16) return -1; // invalid code! - // code size is s, so: - b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; - if (b >= STBI__ZNSYMS) return -1; // some data was corrupt somewhere! - if (z->size[b] != s) return -1; // was originally an assert, but report failure instead. - a->code_buffer >>= s; - a->num_bits -= s; - return z->value[b]; -} - -stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b,s; - if (a->num_bits < 16) { - if (stbi__zeof(a)) { - if (!a->hit_zeof_once) { - // This is the first time we hit eof, insert 16 extra padding btis - // to allow us to keep going; if we actually consume any of them - // though, that is invalid data. This is caught later. - a->hit_zeof_once = 1; - a->num_bits += 16; // add 16 implicit zero bits - } else { - // We already inserted our extra 16 padding bits and are again - // out, this stream is actually prematurely terminated. - return -1; - } - } else { - stbi__fill_bits(a); - } - } - b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; - if (b) { - s = b >> 9; - a->code_buffer >>= s; - a->num_bits -= s; - return b & 511; - } - return stbi__zhuffman_decode_slowpath(a, z); -} - -static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes -{ - char *q; - unsigned int cur, limit, old_limit; - z->zout = zout; - if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); - cur = (unsigned int) (z->zout - z->zout_start); - limit = old_limit = (unsigned) (z->zout_end - z->zout_start); - if (UINT_MAX - cur < (unsigned) n) return stbi__err("outofmem", "Out of memory"); - while (cur + n > limit) { - if(limit > UINT_MAX / 2) return stbi__err("outofmem", "Out of memory"); - limit *= 2; - } - q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit); - STBI_NOTUSED(old_limit); - if (q == NULL) return stbi__err("outofmem", "Out of memory"); - z->zout_start = q; - z->zout = q + cur; - z->zout_end = q + limit; - return 1; -} - -static const int stbi__zlength_base[31] = { - 3,4,5,6,7,8,9,10,11,13, - 15,17,19,23,27,31,35,43,51,59, - 67,83,99,115,131,163,195,227,258,0,0 }; - -static const int stbi__zlength_extra[31]= -{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; - -static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, -257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; - -static const int stbi__zdist_extra[32] = -{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; - -static int stbi__parse_huffman_block(stbi__zbuf *a) -{ - char *zout = a->zout; - for(;;) { - int z = stbi__zhuffman_decode(a, &a->z_length); - if (z < 256) { - if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes - if (zout >= a->zout_end) { - if (!stbi__zexpand(a, zout, 1)) return 0; - zout = a->zout; - } - *zout++ = (char) z; - } else { - stbi_uc *p; - int len,dist; - if (z == 256) { - a->zout = zout; - if (a->hit_zeof_once && a->num_bits < 16) { - // The first time we hit zeof, we inserted 16 extra zero bits into our bit - // buffer so the decoder can just do its speculative decoding. But if we - // actually consumed any of those bits (which is the case when num_bits < 16), - // the stream actually read past the end so it is malformed. - return stbi__err("unexpected end","Corrupt PNG"); - } - return 1; - } - if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data - z -= 257; - len = stbi__zlength_base[z]; - if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); - z = stbi__zhuffman_decode(a, &a->z_distance); - if (z < 0 || z >= 30) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, distance codes 30 and 31 must not appear in compressed data - dist = stbi__zdist_base[z]; - if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); - if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); - if (len > a->zout_end - zout) { - if (!stbi__zexpand(a, zout, len)) return 0; - zout = a->zout; - } - p = (stbi_uc *) (zout - dist); - if (dist == 1) { // run of one byte; common in images. - stbi_uc v = *p; - if (len) { do *zout++ = v; while (--len); } - } else { - if (len) { do *zout++ = *p++; while (--len); } - } - } - } -} - -static int stbi__compute_huffman_codes(stbi__zbuf *a) -{ - static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; - stbi__zhuffman z_codelength; - stbi_uc lencodes[286+32+137];//padding for maximum single op - stbi_uc codelength_sizes[19]; - int i,n; - - int hlit = stbi__zreceive(a,5) + 257; - int hdist = stbi__zreceive(a,5) + 1; - int hclen = stbi__zreceive(a,4) + 4; - int ntot = hlit + hdist; - - memset(codelength_sizes, 0, sizeof(codelength_sizes)); - for (i=0; i < hclen; ++i) { - int s = stbi__zreceive(a,3); - codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; - } - if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; - - n = 0; - while (n < ntot) { - int c = stbi__zhuffman_decode(a, &z_codelength); - if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); - if (c < 16) - lencodes[n++] = (stbi_uc) c; - else { - stbi_uc fill = 0; - if (c == 16) { - c = stbi__zreceive(a,2)+3; - if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG"); - fill = lencodes[n-1]; - } else if (c == 17) { - c = stbi__zreceive(a,3)+3; - } else if (c == 18) { - c = stbi__zreceive(a,7)+11; - } else { - return stbi__err("bad codelengths", "Corrupt PNG"); - } - if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG"); - memset(lencodes+n, fill, c); - n += c; - } - } - if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG"); - if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; - if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; - return 1; -} - -static int stbi__parse_uncompressed_block(stbi__zbuf *a) -{ - stbi_uc header[4]; - int len,nlen,k; - if (a->num_bits & 7) - stbi__zreceive(a, a->num_bits & 7); // discard - // drain the bit-packed data into header - k = 0; - while (a->num_bits > 0) { - header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check - a->code_buffer >>= 8; - a->num_bits -= 8; - } - if (a->num_bits < 0) return stbi__err("zlib corrupt","Corrupt PNG"); - // now fill header the normal way - while (k < 4) - header[k++] = stbi__zget8(a); - len = header[1] * 256 + header[0]; - nlen = header[3] * 256 + header[2]; - if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); - if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); - if (a->zout + len > a->zout_end) - if (!stbi__zexpand(a, a->zout, len)) return 0; - memcpy(a->zout, a->zbuffer, len); - a->zbuffer += len; - a->zout += len; - return 1; -} - -static int stbi__parse_zlib_header(stbi__zbuf *a) -{ - int cmf = stbi__zget8(a); - int cm = cmf & 15; - /* int cinfo = cmf >> 4; */ - int flg = stbi__zget8(a); - if (stbi__zeof(a)) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec - if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec - if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png - if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png - // window = 1 << (8 + cinfo)... but who cares, we fully buffer output - return 1; -} - -static const stbi_uc stbi__zdefault_length[STBI__ZNSYMS] = -{ - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8 -}; -static const stbi_uc stbi__zdefault_distance[32] = -{ - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -}; -/* -Init algorithm: -{ - int i; // use <= to match clearly with spec - for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; - for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; - for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; - for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; - - for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; -} -*/ - -static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) -{ - int final, type; - if (parse_header) - if (!stbi__parse_zlib_header(a)) return 0; - a->num_bits = 0; - a->code_buffer = 0; - a->hit_zeof_once = 0; - do { - final = stbi__zreceive(a,1); - type = stbi__zreceive(a,2); - if (type == 0) { - if (!stbi__parse_uncompressed_block(a)) return 0; - } else if (type == 3) { - return 0; - } else { - if (type == 1) { - // use fixed code lengths - if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , STBI__ZNSYMS)) return 0; - if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; - } else { - if (!stbi__compute_huffman_codes(a)) return 0; - } - if (!stbi__parse_huffman_block(a)) return 0; - } - } while (!final); - return 1; -} - -static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) -{ - a->zout_start = obuf; - a->zout = obuf; - a->zout_end = obuf + olen; - a->z_expandable = exp; - - return stbi__parse_zlib(a, parse_header); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(initial_size); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) -{ - return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(initial_size); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *) ibuffer; - a.zbuffer_end = (stbi_uc *) ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) - return (int) (a.zout - a.zout_start); - else - return -1; -} - -STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(16384); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer+len; - if (stbi__do_zlib(&a, p, 16384, 1, 0)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *) ibuffer; - a.zbuffer_end = (stbi_uc *) ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) - return (int) (a.zout - a.zout_start); - else - return -1; -} -#endif - -// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 -// simple implementation -// - only 8-bit samples -// - no CRC checking -// - allocates lots of intermediate memory -// - avoids problem of streaming data between subsystems -// - avoids explicit window management -// performance -// - uses stb_zlib, a PD zlib implementation with fast huffman decoding - -#ifndef STBI_NO_PNG -typedef struct -{ - stbi__uint32 length; - stbi__uint32 type; -} stbi__pngchunk; - -static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) -{ - stbi__pngchunk c; - c.length = stbi__get32be(s); - c.type = stbi__get32be(s); - return c; -} - -static int stbi__check_png_header(stbi__context *s) -{ - static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; - int i; - for (i=0; i < 8; ++i) - if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); - return 1; -} - -typedef struct -{ - stbi__context *s; - stbi_uc *idata, *expanded, *out; - int depth; -} stbi__png; - - -enum { - STBI__F_none=0, - STBI__F_sub=1, - STBI__F_up=2, - STBI__F_avg=3, - STBI__F_paeth=4, - // synthetic filter used for first scanline to avoid needing a dummy row of 0s - STBI__F_avg_first -}; - -static stbi_uc first_row_filter[5] = -{ - STBI__F_none, - STBI__F_sub, - STBI__F_none, - STBI__F_avg_first, - STBI__F_sub // Paeth with b=c=0 turns out to be equivalent to sub -}; - -static int stbi__paeth(int a, int b, int c) -{ - // This formulation looks very different from the reference in the PNG spec, but is - // actually equivalent and has favorable data dependencies and admits straightforward - // generation of branch-free code, which helps performance significantly. - int thresh = c*3 - (a + b); - int lo = a < b ? a : b; - int hi = a < b ? b : a; - int t0 = (hi <= thresh) ? lo : c; - int t1 = (thresh <= lo) ? hi : t0; - return t1; -} - -static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; - -// adds an extra all-255 alpha channel -// dest == src is legal -// img_n must be 1 or 3 -static void stbi__create_png_alpha_expand8(stbi_uc *dest, stbi_uc *src, stbi__uint32 x, int img_n) -{ - int i; - // must process data backwards since we allow dest==src - if (img_n == 1) { - for (i=x-1; i >= 0; --i) { - dest[i*2+1] = 255; - dest[i*2+0] = src[i]; - } - } else { - STBI_ASSERT(img_n == 3); - for (i=x-1; i >= 0; --i) { - dest[i*4+3] = 255; - dest[i*4+2] = src[i*3+2]; - dest[i*4+1] = src[i*3+1]; - dest[i*4+0] = src[i*3+0]; - } - } -} - -// create the png data from post-deflated data -static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) -{ - int bytes = (depth == 16 ? 2 : 1); - stbi__context *s = a->s; - stbi__uint32 i,j,stride = x*out_n*bytes; - stbi__uint32 img_len, img_width_bytes; - stbi_uc *filter_buf; - int all_ok = 1; - int k; - int img_n = s->img_n; // copy it into a local for later - - int output_bytes = out_n*bytes; - int filter_bytes = img_n*bytes; - int width = x; - - STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); - a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into - if (!a->out) return stbi__err("outofmem", "Out of memory"); - - // note: error exits here don't need to clean up a->out individually, - // stbi__do_png always does on error. - if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG"); - img_width_bytes = (((img_n * x * depth) + 7) >> 3); - if (!stbi__mad2sizes_valid(img_width_bytes, y, img_width_bytes)) return stbi__err("too large", "Corrupt PNG"); - img_len = (img_width_bytes + 1) * y; - - // we used to check for exact match between raw_len and img_len on non-interlaced PNGs, - // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros), - // so just check for raw_len < img_len always. - if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); - - // Allocate two scan lines worth of filter workspace buffer. - filter_buf = (stbi_uc *) stbi__malloc_mad2(img_width_bytes, 2, 0); - if (!filter_buf) return stbi__err("outofmem", "Out of memory"); - - // Filtering for low-bit-depth images - if (depth < 8) { - filter_bytes = 1; - width = img_width_bytes; - } - - for (j=0; j < y; ++j) { - // cur/prior filter buffers alternate - stbi_uc *cur = filter_buf + (j & 1)*img_width_bytes; - stbi_uc *prior = filter_buf + (~j & 1)*img_width_bytes; - stbi_uc *dest = a->out + stride*j; - int nk = width * filter_bytes; - int filter = *raw++; - - // check filter type - if (filter > 4) { - all_ok = stbi__err("invalid filter","Corrupt PNG"); - break; - } - - // if first row, use special filter that doesn't sample previous row - if (j == 0) filter = first_row_filter[filter]; - - // perform actual filtering - switch (filter) { - case STBI__F_none: - memcpy(cur, raw, nk); - break; - case STBI__F_sub: - memcpy(cur, raw, filter_bytes); - for (k = filter_bytes; k < nk; ++k) - cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); - break; - case STBI__F_up: - for (k = 0; k < nk; ++k) - cur[k] = STBI__BYTECAST(raw[k] + prior[k]); - break; - case STBI__F_avg: - for (k = 0; k < filter_bytes; ++k) - cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); - for (k = filter_bytes; k < nk; ++k) - cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); - break; - case STBI__F_paeth: - for (k = 0; k < filter_bytes; ++k) - cur[k] = STBI__BYTECAST(raw[k] + prior[k]); // prior[k] == stbi__paeth(0,prior[k],0) - for (k = filter_bytes; k < nk; ++k) - cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes], prior[k], prior[k-filter_bytes])); - break; - case STBI__F_avg_first: - memcpy(cur, raw, filter_bytes); - for (k = filter_bytes; k < nk; ++k) - cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); - break; - } - - raw += nk; - - // expand decoded bits in cur to dest, also adding an extra alpha channel if desired - if (depth < 8) { - stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range - stbi_uc *in = cur; - stbi_uc *out = dest; - stbi_uc inb = 0; - stbi__uint32 nsmp = x*img_n; - - // expand bits to bytes first - if (depth == 4) { - for (i=0; i < nsmp; ++i) { - if ((i & 1) == 0) inb = *in++; - *out++ = scale * (inb >> 4); - inb <<= 4; - } - } else if (depth == 2) { - for (i=0; i < nsmp; ++i) { - if ((i & 3) == 0) inb = *in++; - *out++ = scale * (inb >> 6); - inb <<= 2; - } - } else { - STBI_ASSERT(depth == 1); - for (i=0; i < nsmp; ++i) { - if ((i & 7) == 0) inb = *in++; - *out++ = scale * (inb >> 7); - inb <<= 1; - } - } - - // insert alpha=255 values if desired - if (img_n != out_n) - stbi__create_png_alpha_expand8(dest, dest, x, img_n); - } else if (depth == 8) { - if (img_n == out_n) - memcpy(dest, cur, x*img_n); - else - stbi__create_png_alpha_expand8(dest, cur, x, img_n); - } else if (depth == 16) { - // convert the image data from big-endian to platform-native - stbi__uint16 *dest16 = (stbi__uint16*)dest; - stbi__uint32 nsmp = x*img_n; - - if (img_n == out_n) { - for (i = 0; i < nsmp; ++i, ++dest16, cur += 2) - *dest16 = (cur[0] << 8) | cur[1]; - } else { - STBI_ASSERT(img_n+1 == out_n); - if (img_n == 1) { - for (i = 0; i < x; ++i, dest16 += 2, cur += 2) { - dest16[0] = (cur[0] << 8) | cur[1]; - dest16[1] = 0xffff; - } - } else { - STBI_ASSERT(img_n == 3); - for (i = 0; i < x; ++i, dest16 += 4, cur += 6) { - dest16[0] = (cur[0] << 8) | cur[1]; - dest16[1] = (cur[2] << 8) | cur[3]; - dest16[2] = (cur[4] << 8) | cur[5]; - dest16[3] = 0xffff; - } - } - } - } - } - - STBI_FREE(filter_buf); - if (!all_ok) return 0; - - return 1; -} - -static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) -{ - int bytes = (depth == 16 ? 2 : 1); - int out_bytes = out_n * bytes; - stbi_uc *final; - int p; - if (!interlaced) - return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); - - // de-interlacing - final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0); - if (!final) return stbi__err("outofmem", "Out of memory"); - for (p=0; p < 7; ++p) { - int xorig[] = { 0,4,0,2,0,1,0 }; - int yorig[] = { 0,0,4,0,2,0,1 }; - int xspc[] = { 8,8,4,4,2,2,1 }; - int yspc[] = { 8,8,8,4,4,2,2 }; - int i,j,x,y; - // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 - x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; - y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; - if (x && y) { - stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; - if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { - STBI_FREE(final); - return 0; - } - for (j=0; j < y; ++j) { - for (i=0; i < x; ++i) { - int out_y = j*yspc[p]+yorig[p]; - int out_x = i*xspc[p]+xorig[p]; - memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes, - a->out + (j*x+i)*out_bytes, out_bytes); - } - } - STBI_FREE(a->out); - image_data += img_len; - image_data_len -= img_len; - } - } - a->out = final; - - return 1; -} - -static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - // compute color-based transparency, assuming we've - // already got 255 as the alpha value in the output - STBI_ASSERT(out_n == 2 || out_n == 4); - - if (out_n == 2) { - for (i=0; i < pixel_count; ++i) { - p[1] = (p[0] == tc[0] ? 0 : 255); - p += 2; - } - } else { - for (i=0; i < pixel_count; ++i) { - if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) - p[3] = 0; - p += 4; - } - } - return 1; -} - -static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi__uint16 *p = (stbi__uint16*) z->out; - - // compute color-based transparency, assuming we've - // already got 65535 as the alpha value in the output - STBI_ASSERT(out_n == 2 || out_n == 4); - - if (out_n == 2) { - for (i = 0; i < pixel_count; ++i) { - p[1] = (p[0] == tc[0] ? 0 : 65535); - p += 2; - } - } else { - for (i = 0; i < pixel_count; ++i) { - if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) - p[3] = 0; - p += 4; - } - } - return 1; -} - -static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) -{ - stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; - stbi_uc *p, *temp_out, *orig = a->out; - - p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0); - if (p == NULL) return stbi__err("outofmem", "Out of memory"); - - // between here and free(out) below, exitting would leak - temp_out = p; - - if (pal_img_n == 3) { - for (i=0; i < pixel_count; ++i) { - int n = orig[i]*4; - p[0] = palette[n ]; - p[1] = palette[n+1]; - p[2] = palette[n+2]; - p += 3; - } - } else { - for (i=0; i < pixel_count; ++i) { - int n = orig[i]*4; - p[0] = palette[n ]; - p[1] = palette[n+1]; - p[2] = palette[n+2]; - p[3] = palette[n+3]; - p += 4; - } - } - STBI_FREE(a->out); - a->out = temp_out; - - STBI_NOTUSED(len); - - return 1; -} - -static int stbi__unpremultiply_on_load_global = 0; -static int stbi__de_iphone_flag_global = 0; - -STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) -{ - stbi__unpremultiply_on_load_global = flag_true_if_should_unpremultiply; -} - -STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) -{ - stbi__de_iphone_flag_global = flag_true_if_should_convert; -} - -#ifndef STBI_THREAD_LOCAL -#define stbi__unpremultiply_on_load stbi__unpremultiply_on_load_global -#define stbi__de_iphone_flag stbi__de_iphone_flag_global -#else -static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set; -static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set; - -STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply) -{ - stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply; - stbi__unpremultiply_on_load_set = 1; -} - -STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert) -{ - stbi__de_iphone_flag_local = flag_true_if_should_convert; - stbi__de_iphone_flag_set = 1; -} - -#define stbi__unpremultiply_on_load (stbi__unpremultiply_on_load_set \ - ? stbi__unpremultiply_on_load_local \ - : stbi__unpremultiply_on_load_global) -#define stbi__de_iphone_flag (stbi__de_iphone_flag_set \ - ? stbi__de_iphone_flag_local \ - : stbi__de_iphone_flag_global) -#endif // STBI_THREAD_LOCAL - -static void stbi__de_iphone(stbi__png *z) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - if (s->img_out_n == 3) { // convert bgr to rgb - for (i=0; i < pixel_count; ++i) { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 3; - } - } else { - STBI_ASSERT(s->img_out_n == 4); - if (stbi__unpremultiply_on_load) { - // convert bgr to rgb and unpremultiply - for (i=0; i < pixel_count; ++i) { - stbi_uc a = p[3]; - stbi_uc t = p[0]; - if (a) { - stbi_uc half = a / 2; - p[0] = (p[2] * 255 + half) / a; - p[1] = (p[1] * 255 + half) / a; - p[2] = ( t * 255 + half) / a; - } else { - p[0] = p[2]; - p[2] = t; - } - p += 4; - } - } else { - // convert bgr to rgb - for (i=0; i < pixel_count; ++i) { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 4; - } - } - } -} - -#define STBI__PNG_TYPE(a,b,c,d) (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d)) - -static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) -{ - stbi_uc palette[1024], pal_img_n=0; - stbi_uc has_trans=0, tc[3]={0}; - stbi__uint16 tc16[3]; - stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; - int first=1,k,interlace=0, color=0, is_iphone=0; - stbi__context *s = z->s; - - z->expanded = NULL; - z->idata = NULL; - z->out = NULL; - - if (!stbi__check_png_header(s)) return 0; - - if (scan == STBI__SCAN_type) return 1; - - for (;;) { - stbi__pngchunk c = stbi__get_chunk_header(s); - switch (c.type) { - case STBI__PNG_TYPE('C','g','B','I'): - is_iphone = 1; - stbi__skip(s, c.length); - break; - case STBI__PNG_TYPE('I','H','D','R'): { - int comp,filter; - if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); - first = 0; - if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); - s->img_x = stbi__get32be(s); - s->img_y = stbi__get32be(s); - if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); - z->depth = stbi__get8(s); if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only"); - color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); - if (color == 3 && z->depth == 16) return stbi__err("bad ctype","Corrupt PNG"); - if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); - comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); - filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); - interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); - if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); - if (!pal_img_n) { - s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); - if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); - } else { - // if paletted, then pal_n is our final components, and - // img_n is # components to decompress/filter. - s->img_n = 1; - if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); - } - // even with SCAN_header, have to scan to see if we have a tRNS - break; - } - - case STBI__PNG_TYPE('P','L','T','E'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); - pal_len = c.length / 3; - if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); - for (i=0; i < pal_len; ++i) { - palette[i*4+0] = stbi__get8(s); - palette[i*4+1] = stbi__get8(s); - palette[i*4+2] = stbi__get8(s); - palette[i*4+3] = 255; - } - break; - } - - case STBI__PNG_TYPE('t','R','N','S'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); - if (pal_img_n) { - if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } - if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); - if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); - pal_img_n = 4; - for (i=0; i < c.length; ++i) - palette[i*4+3] = stbi__get8(s); - } else { - if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); - if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); - has_trans = 1; - // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now. - if (scan == STBI__SCAN_header) { ++s->img_n; return 1; } - if (z->depth == 16) { - for (k = 0; k < s->img_n && k < 3; ++k) // extra loop test to suppress false GCC warning - tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is - } else { - for (k = 0; k < s->img_n && k < 3; ++k) - tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger - } - } - break; - } - - case STBI__PNG_TYPE('I','D','A','T'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); - if (scan == STBI__SCAN_header) { - // header scan definitely stops at first IDAT - if (pal_img_n) - s->img_n = pal_img_n; - return 1; - } - if (c.length > (1u << 30)) return stbi__err("IDAT size limit", "IDAT section larger than 2^30 bytes"); - if ((int)(ioff + c.length) < (int)ioff) return 0; - if (ioff + c.length > idata_limit) { - stbi__uint32 idata_limit_old = idata_limit; - stbi_uc *p; - if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; - while (ioff + c.length > idata_limit) - idata_limit *= 2; - STBI_NOTUSED(idata_limit_old); - p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); - z->idata = p; - } - if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); - ioff += c.length; - break; - } - - case STBI__PNG_TYPE('I','E','N','D'): { - stbi__uint32 raw_len, bpl; - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (scan != STBI__SCAN_load) return 1; - if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); - // initial guess for decoded data size to avoid unnecessary reallocs - bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component - raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; - z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); - if (z->expanded == NULL) return 0; // zlib should set error - STBI_FREE(z->idata); z->idata = NULL; - if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) - s->img_out_n = s->img_n+1; - else - s->img_out_n = s->img_n; - if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0; - if (has_trans) { - if (z->depth == 16) { - if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0; - } else { - if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; - } - } - if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) - stbi__de_iphone(z); - if (pal_img_n) { - // pal_img_n == 3 or 4 - s->img_n = pal_img_n; // record the actual colors we had - s->img_out_n = pal_img_n; - if (req_comp >= 3) s->img_out_n = req_comp; - if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) - return 0; - } else if (has_trans) { - // non-paletted image with tRNS -> source image has (constant) alpha - ++s->img_n; - } - STBI_FREE(z->expanded); z->expanded = NULL; - // end of PNG chunk, read and skip CRC - stbi__get32be(s); - return 1; - } - - default: - // if critical, fail - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if ((c.type & (1 << 29)) == 0) { - #ifndef STBI_NO_FAILURE_STRINGS - // not threadsafe - static char invalid_chunk[] = "XXXX PNG chunk not known"; - invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); - invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); - invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); - invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); - #endif - return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); - } - stbi__skip(s, c.length); - break; - } - // end of PNG chunk, read and skip CRC - stbi__get32be(s); - } -} - -static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri) -{ - void *result=NULL; - if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); - if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { - if (p->depth <= 8) - ri->bits_per_channel = 8; - else if (p->depth == 16) - ri->bits_per_channel = 16; - else - return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth"); - result = p->out; - p->out = NULL; - if (req_comp && req_comp != p->s->img_out_n) { - if (ri->bits_per_channel == 8) - result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); - else - result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); - p->s->img_out_n = req_comp; - if (result == NULL) return result; - } - *x = p->s->img_x; - *y = p->s->img_y; - if (n) *n = p->s->img_n; - } - STBI_FREE(p->out); p->out = NULL; - STBI_FREE(p->expanded); p->expanded = NULL; - STBI_FREE(p->idata); p->idata = NULL; - - return result; -} - -static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi__png p; - p.s = s; - return stbi__do_png(&p, x,y,comp,req_comp, ri); -} - -static int stbi__png_test(stbi__context *s) -{ - int r; - r = stbi__check_png_header(s); - stbi__rewind(s); - return r; -} - -static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) -{ - if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { - stbi__rewind( p->s ); - return 0; - } - if (x) *x = p->s->img_x; - if (y) *y = p->s->img_y; - if (comp) *comp = p->s->img_n; - return 1; -} - -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__png p; - p.s = s; - return stbi__png_info_raw(&p, x, y, comp); -} - -static int stbi__png_is16(stbi__context *s) -{ - stbi__png p; - p.s = s; - if (!stbi__png_info_raw(&p, NULL, NULL, NULL)) - return 0; - if (p.depth != 16) { - stbi__rewind(p.s); - return 0; - } - return 1; -} -#endif - -// Microsoft/Windows BMP image - -#ifndef STBI_NO_BMP -static int stbi__bmp_test_raw(stbi__context *s) -{ - int r; - int sz; - if (stbi__get8(s) != 'B') return 0; - if (stbi__get8(s) != 'M') return 0; - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - stbi__get32le(s); // discard data offset - sz = stbi__get32le(s); - r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); - return r; -} - -static int stbi__bmp_test(stbi__context *s) -{ - int r = stbi__bmp_test_raw(s); - stbi__rewind(s); - return r; -} - - -// returns 0..31 for the highest set bit -static int stbi__high_bit(unsigned int z) -{ - int n=0; - if (z == 0) return -1; - if (z >= 0x10000) { n += 16; z >>= 16; } - if (z >= 0x00100) { n += 8; z >>= 8; } - if (z >= 0x00010) { n += 4; z >>= 4; } - if (z >= 0x00004) { n += 2; z >>= 2; } - if (z >= 0x00002) { n += 1;/* >>= 1;*/ } - return n; -} - -static int stbi__bitcount(unsigned int a) -{ - a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 - a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 - a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits - a = (a + (a >> 8)); // max 16 per 8 bits - a = (a + (a >> 16)); // max 32 per 8 bits - return a & 0xff; -} - -// extract an arbitrarily-aligned N-bit value (N=bits) -// from v, and then make it 8-bits long and fractionally -// extend it to full full range. -static int stbi__shiftsigned(unsigned int v, int shift, int bits) -{ - static unsigned int mul_table[9] = { - 0, - 0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/, - 0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/, - }; - static unsigned int shift_table[9] = { - 0, 0,0,1,0,2,4,6,0, - }; - if (shift < 0) - v <<= -shift; - else - v >>= shift; - STBI_ASSERT(v < 256); - v >>= (8-bits); - STBI_ASSERT(bits >= 0 && bits <= 8); - return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits]; -} - -typedef struct -{ - int bpp, offset, hsz; - unsigned int mr,mg,mb,ma, all_a; - int extra_read; -} stbi__bmp_data; - -static int stbi__bmp_set_mask_defaults(stbi__bmp_data *info, int compress) -{ - // BI_BITFIELDS specifies masks explicitly, don't override - if (compress == 3) - return 1; - - if (compress == 0) { - if (info->bpp == 16) { - info->mr = 31u << 10; - info->mg = 31u << 5; - info->mb = 31u << 0; - } else if (info->bpp == 32) { - info->mr = 0xffu << 16; - info->mg = 0xffu << 8; - info->mb = 0xffu << 0; - info->ma = 0xffu << 24; - info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 - } else { - // otherwise, use defaults, which is all-0 - info->mr = info->mg = info->mb = info->ma = 0; - } - return 1; - } - return 0; // error -} - -static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) -{ - int hsz; - if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - info->offset = stbi__get32le(s); - info->hsz = hsz = stbi__get32le(s); - info->mr = info->mg = info->mb = info->ma = 0; - info->extra_read = 14; - - if (info->offset < 0) return stbi__errpuc("bad BMP", "bad BMP"); - - if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); - if (hsz == 12) { - s->img_x = stbi__get16le(s); - s->img_y = stbi__get16le(s); - } else { - s->img_x = stbi__get32le(s); - s->img_y = stbi__get32le(s); - } - if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); - info->bpp = stbi__get16le(s); - if (hsz != 12) { - int compress = stbi__get32le(s); - if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); - if (compress >= 4) return stbi__errpuc("BMP JPEG/PNG", "BMP type not supported: unsupported compression"); // this includes PNG/JPEG modes - if (compress == 3 && info->bpp != 16 && info->bpp != 32) return stbi__errpuc("bad BMP", "bad BMP"); // bitfields requires 16 or 32 bits/pixel - stbi__get32le(s); // discard sizeof - stbi__get32le(s); // discard hres - stbi__get32le(s); // discard vres - stbi__get32le(s); // discard colorsused - stbi__get32le(s); // discard max important - if (hsz == 40 || hsz == 56) { - if (hsz == 56) { - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - } - if (info->bpp == 16 || info->bpp == 32) { - if (compress == 0) { - stbi__bmp_set_mask_defaults(info, compress); - } else if (compress == 3) { - info->mr = stbi__get32le(s); - info->mg = stbi__get32le(s); - info->mb = stbi__get32le(s); - info->extra_read += 12; - // not documented, but generated by photoshop and handled by mspaint - if (info->mr == info->mg && info->mg == info->mb) { - // ?!?!? - return stbi__errpuc("bad BMP", "bad BMP"); - } - } else - return stbi__errpuc("bad BMP", "bad BMP"); - } - } else { - // V4/V5 header - int i; - if (hsz != 108 && hsz != 124) - return stbi__errpuc("bad BMP", "bad BMP"); - info->mr = stbi__get32le(s); - info->mg = stbi__get32le(s); - info->mb = stbi__get32le(s); - info->ma = stbi__get32le(s); - if (compress != 3) // override mr/mg/mb unless in BI_BITFIELDS mode, as per docs - stbi__bmp_set_mask_defaults(info, compress); - stbi__get32le(s); // discard color space - for (i=0; i < 12; ++i) - stbi__get32le(s); // discard color space parameters - if (hsz == 124) { - stbi__get32le(s); // discard rendering intent - stbi__get32le(s); // discard offset of profile data - stbi__get32le(s); // discard size of profile data - stbi__get32le(s); // discard reserved - } - } - } - return (void *) 1; -} - - -static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *out; - unsigned int mr=0,mg=0,mb=0,ma=0, all_a; - stbi_uc pal[256][4]; - int psize=0,i,j,width; - int flip_vertically, pad, target; - stbi__bmp_data info; - STBI_NOTUSED(ri); - - info.all_a = 255; - if (stbi__bmp_parse_header(s, &info) == NULL) - return NULL; // error code already set - - flip_vertically = ((int) s->img_y) > 0; - s->img_y = abs((int) s->img_y); - - if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - - mr = info.mr; - mg = info.mg; - mb = info.mb; - ma = info.ma; - all_a = info.all_a; - - if (info.hsz == 12) { - if (info.bpp < 24) - psize = (info.offset - info.extra_read - 24) / 3; - } else { - if (info.bpp < 16) - psize = (info.offset - info.extra_read - info.hsz) >> 2; - } - if (psize == 0) { - // accept some number of extra bytes after the header, but if the offset points either to before - // the header ends or implies a large amount of extra data, reject the file as malformed - int bytes_read_so_far = s->callback_already_read + (int)(s->img_buffer - s->img_buffer_original); - int header_limit = 1024; // max we actually read is below 256 bytes currently. - int extra_data_limit = 256*4; // what ordinarily goes here is a palette; 256 entries*4 bytes is its max size. - if (bytes_read_so_far <= 0 || bytes_read_so_far > header_limit) { - return stbi__errpuc("bad header", "Corrupt BMP"); - } - // we established that bytes_read_so_far is positive and sensible. - // the first half of this test rejects offsets that are either too small positives, or - // negative, and guarantees that info.offset >= bytes_read_so_far > 0. this in turn - // ensures the number computed in the second half of the test can't overflow. - if (info.offset < bytes_read_so_far || info.offset - bytes_read_so_far > extra_data_limit) { - return stbi__errpuc("bad offset", "Corrupt BMP"); - } else { - stbi__skip(s, info.offset - bytes_read_so_far); - } - } - - if (info.bpp == 24 && ma == 0xff000000) - s->img_n = 3; - else - s->img_n = ma ? 4 : 3; - if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 - target = req_comp; - else - target = s->img_n; // if they want monochrome, we'll post-convert - - // sanity-check size - if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0)) - return stbi__errpuc("too large", "Corrupt BMP"); - - out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0); - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - if (info.bpp < 16) { - int z=0; - if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } - for (i=0; i < psize; ++i) { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - if (info.hsz != 12) stbi__get8(s); - pal[i][3] = 255; - } - stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); - if (info.bpp == 1) width = (s->img_x + 7) >> 3; - else if (info.bpp == 4) width = (s->img_x + 1) >> 1; - else if (info.bpp == 8) width = s->img_x; - else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } - pad = (-width)&3; - if (info.bpp == 1) { - for (j=0; j < (int) s->img_y; ++j) { - int bit_offset = 7, v = stbi__get8(s); - for (i=0; i < (int) s->img_x; ++i) { - int color = (v>>bit_offset)&0x1; - out[z++] = pal[color][0]; - out[z++] = pal[color][1]; - out[z++] = pal[color][2]; - if (target == 4) out[z++] = 255; - if (i+1 == (int) s->img_x) break; - if((--bit_offset) < 0) { - bit_offset = 7; - v = stbi__get8(s); - } - } - stbi__skip(s, pad); - } - } else { - for (j=0; j < (int) s->img_y; ++j) { - for (i=0; i < (int) s->img_x; i += 2) { - int v=stbi__get8(s),v2=0; - if (info.bpp == 4) { - v2 = v & 15; - v >>= 4; - } - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) out[z++] = 255; - if (i+1 == (int) s->img_x) break; - v = (info.bpp == 8) ? stbi__get8(s) : v2; - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) out[z++] = 255; - } - stbi__skip(s, pad); - } - } - } else { - int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; - int z = 0; - int easy=0; - stbi__skip(s, info.offset - info.extra_read - info.hsz); - if (info.bpp == 24) width = 3 * s->img_x; - else if (info.bpp == 16) width = 2*s->img_x; - else /* bpp = 32 and pad = 0 */ width=0; - pad = (-width) & 3; - if (info.bpp == 24) { - easy = 1; - } else if (info.bpp == 32) { - if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) - easy = 2; - } - if (!easy) { - if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } - // right shift amt to put high bit in position #7 - rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); - gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); - bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); - ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); - if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } - } - for (j=0; j < (int) s->img_y; ++j) { - if (easy) { - for (i=0; i < (int) s->img_x; ++i) { - unsigned char a; - out[z+2] = stbi__get8(s); - out[z+1] = stbi__get8(s); - out[z+0] = stbi__get8(s); - z += 3; - a = (easy == 2 ? stbi__get8(s) : 255); - all_a |= a; - if (target == 4) out[z++] = a; - } - } else { - int bpp = info.bpp; - for (i=0; i < (int) s->img_x; ++i) { - stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); - unsigned int a; - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); - a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); - all_a |= a; - if (target == 4) out[z++] = STBI__BYTECAST(a); - } - } - stbi__skip(s, pad); - } - } - - // if alpha channel is all 0s, replace with all 255s - if (target == 4 && all_a == 0) - for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) - out[i] = 255; - - if (flip_vertically) { - stbi_uc t; - for (j=0; j < (int) s->img_y>>1; ++j) { - stbi_uc *p1 = out + j *s->img_x*target; - stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; - for (i=0; i < (int) s->img_x*target; ++i) { - t = p1[i]; p1[i] = p2[i]; p2[i] = t; - } - } - } - - if (req_comp && req_comp != target) { - out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - - *x = s->img_x; - *y = s->img_y; - if (comp) *comp = s->img_n; - return out; -} -#endif - -// Targa Truevision - TGA -// by Jonathan Dummer -#ifndef STBI_NO_TGA -// returns STBI_rgb or whatever, 0 on error -static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16) -{ - // only RGB or RGBA (incl. 16bit) or grey allowed - if (is_rgb16) *is_rgb16 = 0; - switch(bits_per_pixel) { - case 8: return STBI_grey; - case 16: if(is_grey) return STBI_grey_alpha; - // fallthrough - case 15: if(is_rgb16) *is_rgb16 = 1; - return STBI_rgb; - case 24: // fallthrough - case 32: return bits_per_pixel/8; - default: return 0; - } -} - -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) -{ - int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp; - int sz, tga_colormap_type; - stbi__get8(s); // discard Offset - tga_colormap_type = stbi__get8(s); // colormap type - if( tga_colormap_type > 1 ) { - stbi__rewind(s); - return 0; // only RGB or indexed allowed - } - tga_image_type = stbi__get8(s); // image type - if ( tga_colormap_type == 1 ) { // colormapped (paletted) image - if (tga_image_type != 1 && tga_image_type != 9) { - stbi__rewind(s); - return 0; - } - stbi__skip(s,4); // skip index of first colormap entry and number of entries - sz = stbi__get8(s); // check bits per palette color entry - if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) { - stbi__rewind(s); - return 0; - } - stbi__skip(s,4); // skip image x and y origin - tga_colormap_bpp = sz; - } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE - if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) { - stbi__rewind(s); - return 0; // only RGB or grey allowed, +/- RLE - } - stbi__skip(s,9); // skip colormap specification and image x/y origin - tga_colormap_bpp = 0; - } - tga_w = stbi__get16le(s); - if( tga_w < 1 ) { - stbi__rewind(s); - return 0; // test width - } - tga_h = stbi__get16le(s); - if( tga_h < 1 ) { - stbi__rewind(s); - return 0; // test height - } - tga_bits_per_pixel = stbi__get8(s); // bits per pixel - stbi__get8(s); // ignore alpha bits - if (tga_colormap_bpp != 0) { - if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) { - // when using a colormap, tga_bits_per_pixel is the size of the indexes - // I don't think anything but 8 or 16bit indexes makes sense - stbi__rewind(s); - return 0; - } - tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL); - } else { - tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL); - } - if(!tga_comp) { - stbi__rewind(s); - return 0; - } - if (x) *x = tga_w; - if (y) *y = tga_h; - if (comp) *comp = tga_comp; - return 1; // seems to have passed everything -} - -static int stbi__tga_test(stbi__context *s) -{ - int res = 0; - int sz, tga_color_type; - stbi__get8(s); // discard Offset - tga_color_type = stbi__get8(s); // color type - if ( tga_color_type > 1 ) goto errorEnd; // only RGB or indexed allowed - sz = stbi__get8(s); // image type - if ( tga_color_type == 1 ) { // colormapped (paletted) image - if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9 - stbi__skip(s,4); // skip index of first colormap entry and number of entries - sz = stbi__get8(s); // check bits per palette color entry - if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; - stbi__skip(s,4); // skip image x and y origin - } else { // "normal" image w/o colormap - if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE - stbi__skip(s,9); // skip colormap specification and image x/y origin - } - if ( stbi__get16le(s) < 1 ) goto errorEnd; // test width - if ( stbi__get16le(s) < 1 ) goto errorEnd; // test height - sz = stbi__get8(s); // bits per pixel - if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index - if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; - - res = 1; // if we got this far, everything's good and we can return 1 instead of 0 - -errorEnd: - stbi__rewind(s); - return res; -} - -// read 16bit value and convert to 24bit RGB -static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out) -{ - stbi__uint16 px = (stbi__uint16)stbi__get16le(s); - stbi__uint16 fiveBitMask = 31; - // we have 3 channels with 5bits each - int r = (px >> 10) & fiveBitMask; - int g = (px >> 5) & fiveBitMask; - int b = px & fiveBitMask; - // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later - out[0] = (stbi_uc)((r * 255)/31); - out[1] = (stbi_uc)((g * 255)/31); - out[2] = (stbi_uc)((b * 255)/31); - - // some people claim that the most significant bit might be used for alpha - // (possibly if an alpha-bit is set in the "image descriptor byte") - // but that only made 16bit test images completely translucent.. - // so let's treat all 15 and 16bit TGAs as RGB with no alpha. -} - -static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - // read in the TGA header stuff - int tga_offset = stbi__get8(s); - int tga_indexed = stbi__get8(s); - int tga_image_type = stbi__get8(s); - int tga_is_RLE = 0; - int tga_palette_start = stbi__get16le(s); - int tga_palette_len = stbi__get16le(s); - int tga_palette_bits = stbi__get8(s); - int tga_x_origin = stbi__get16le(s); - int tga_y_origin = stbi__get16le(s); - int tga_width = stbi__get16le(s); - int tga_height = stbi__get16le(s); - int tga_bits_per_pixel = stbi__get8(s); - int tga_comp, tga_rgb16=0; - int tga_inverted = stbi__get8(s); - // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?) - // image data - unsigned char *tga_data; - unsigned char *tga_palette = NULL; - int i, j; - unsigned char raw_data[4] = {0}; - int RLE_count = 0; - int RLE_repeating = 0; - int read_next_pixel = 1; - STBI_NOTUSED(ri); - STBI_NOTUSED(tga_x_origin); // @TODO - STBI_NOTUSED(tga_y_origin); // @TODO - - if (tga_height > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - if (tga_width > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - - // do a tiny bit of precessing - if ( tga_image_type >= 8 ) - { - tga_image_type -= 8; - tga_is_RLE = 1; - } - tga_inverted = 1 - ((tga_inverted >> 5) & 1); - - // If I'm paletted, then I'll use the number of bits from the palette - if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16); - else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16); - - if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency - return stbi__errpuc("bad format", "Can't find out TGA pixelformat"); - - // tga info - *x = tga_width; - *y = tga_height; - if (comp) *comp = tga_comp; - - if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0)) - return stbi__errpuc("too large", "Corrupt TGA"); - - tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0); - if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); - - // skip to the data's starting position (offset usually = 0) - stbi__skip(s, tga_offset ); - - if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) { - for (i=0; i < tga_height; ++i) { - int row = tga_inverted ? tga_height -i - 1 : i; - stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; - stbi__getn(s, tga_row, tga_width * tga_comp); - } - } else { - // do I need to load a palette? - if ( tga_indexed) - { - if (tga_palette_len == 0) { /* you have to have at least one entry! */ - STBI_FREE(tga_data); - return stbi__errpuc("bad palette", "Corrupt TGA"); - } - - // any data to skip? (offset usually = 0) - stbi__skip(s, tga_palette_start ); - // load the palette - tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0); - if (!tga_palette) { - STBI_FREE(tga_data); - return stbi__errpuc("outofmem", "Out of memory"); - } - if (tga_rgb16) { - stbi_uc *pal_entry = tga_palette; - STBI_ASSERT(tga_comp == STBI_rgb); - for (i=0; i < tga_palette_len; ++i) { - stbi__tga_read_rgb16(s, pal_entry); - pal_entry += tga_comp; - } - } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) { - STBI_FREE(tga_data); - STBI_FREE(tga_palette); - return stbi__errpuc("bad palette", "Corrupt TGA"); - } - } - // load the data - for (i=0; i < tga_width * tga_height; ++i) - { - // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? - if ( tga_is_RLE ) - { - if ( RLE_count == 0 ) - { - // yep, get the next byte as a RLE command - int RLE_cmd = stbi__get8(s); - RLE_count = 1 + (RLE_cmd & 127); - RLE_repeating = RLE_cmd >> 7; - read_next_pixel = 1; - } else if ( !RLE_repeating ) - { - read_next_pixel = 1; - } - } else - { - read_next_pixel = 1; - } - // OK, if I need to read a pixel, do it now - if ( read_next_pixel ) - { - // load however much data we did have - if ( tga_indexed ) - { - // read in index, then perform the lookup - int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s); - if ( pal_idx >= tga_palette_len ) { - // invalid index - pal_idx = 0; - } - pal_idx *= tga_comp; - for (j = 0; j < tga_comp; ++j) { - raw_data[j] = tga_palette[pal_idx+j]; - } - } else if(tga_rgb16) { - STBI_ASSERT(tga_comp == STBI_rgb); - stbi__tga_read_rgb16(s, raw_data); - } else { - // read in the data raw - for (j = 0; j < tga_comp; ++j) { - raw_data[j] = stbi__get8(s); - } - } - // clear the reading flag for the next pixel - read_next_pixel = 0; - } // end of reading a pixel - - // copy data - for (j = 0; j < tga_comp; ++j) - tga_data[i*tga_comp+j] = raw_data[j]; - - // in case we're in RLE mode, keep counting down - --RLE_count; - } - // do I need to invert the image? - if ( tga_inverted ) - { - for (j = 0; j*2 < tga_height; ++j) - { - int index1 = j * tga_width * tga_comp; - int index2 = (tga_height - 1 - j) * tga_width * tga_comp; - for (i = tga_width * tga_comp; i > 0; --i) - { - unsigned char temp = tga_data[index1]; - tga_data[index1] = tga_data[index2]; - tga_data[index2] = temp; - ++index1; - ++index2; - } - } - } - // clear my palette, if I had one - if ( tga_palette != NULL ) - { - STBI_FREE( tga_palette ); - } - } - - // swap RGB - if the source data was RGB16, it already is in the right order - if (tga_comp >= 3 && !tga_rgb16) - { - unsigned char* tga_pixel = tga_data; - for (i=0; i < tga_width * tga_height; ++i) - { - unsigned char temp = tga_pixel[0]; - tga_pixel[0] = tga_pixel[2]; - tga_pixel[2] = temp; - tga_pixel += tga_comp; - } - } - - // convert to target component count - if (req_comp && req_comp != tga_comp) - tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); - - // the things I do to get rid of an error message, and yet keep - // Microsoft's C compilers happy... [8^( - tga_palette_start = tga_palette_len = tga_palette_bits = - tga_x_origin = tga_y_origin = 0; - STBI_NOTUSED(tga_palette_start); - // OK, done - return tga_data; -} -#endif - -// ************************************************************************************************* -// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s) -{ - int r = (stbi__get32be(s) == 0x38425053); - stbi__rewind(s); - return r; -} - -static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount) -{ - int count, nleft, len; - - count = 0; - while ((nleft = pixelCount - count) > 0) { - len = stbi__get8(s); - if (len == 128) { - // No-op. - } else if (len < 128) { - // Copy next len+1 bytes literally. - len++; - if (len > nleft) return 0; // corrupt data - count += len; - while (len) { - *p = stbi__get8(s); - p += 4; - len--; - } - } else if (len > 128) { - stbi_uc val; - // Next -len+1 bytes in the dest are replicated from next source byte. - // (Interpret len as a negative 8-bit int.) - len = 257 - len; - if (len > nleft) return 0; // corrupt data - val = stbi__get8(s); - count += len; - while (len) { - *p = val; - p += 4; - len--; - } - } - } - - return 1; -} - -static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) -{ - int pixelCount; - int channelCount, compression; - int channel, i; - int bitdepth; - int w,h; - stbi_uc *out; - STBI_NOTUSED(ri); - - // Check identifier - if (stbi__get32be(s) != 0x38425053) // "8BPS" - return stbi__errpuc("not PSD", "Corrupt PSD image"); - - // Check file type version. - if (stbi__get16be(s) != 1) - return stbi__errpuc("wrong version", "Unsupported version of PSD image"); - - // Skip 6 reserved bytes. - stbi__skip(s, 6 ); - - // Read the number of channels (R, G, B, A, etc). - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) - return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); - - // Read the rows and columns of the image. - h = stbi__get32be(s); - w = stbi__get32be(s); - - if (h > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - if (w > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - - // Make sure the depth is 8 bits. - bitdepth = stbi__get16be(s); - if (bitdepth != 8 && bitdepth != 16) - return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); - - // Make sure the color mode is RGB. - // Valid options are: - // 0: Bitmap - // 1: Grayscale - // 2: Indexed color - // 3: RGB color - // 4: CMYK color - // 7: Multichannel - // 8: Duotone - // 9: Lab color - if (stbi__get16be(s) != 3) - return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); - - // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) - stbi__skip(s,stbi__get32be(s) ); - - // Skip the image resources. (resolution, pen tool paths, etc) - stbi__skip(s, stbi__get32be(s) ); - - // Skip the reserved data. - stbi__skip(s, stbi__get32be(s) ); - - // Find out if the data is compressed. - // Known values: - // 0: no compression - // 1: RLE compressed - compression = stbi__get16be(s); - if (compression > 1) - return stbi__errpuc("bad compression", "PSD has an unknown compression format"); - - // Check size - if (!stbi__mad3sizes_valid(4, w, h, 0)) - return stbi__errpuc("too large", "Corrupt PSD"); - - // Create the destination image. - - if (!compression && bitdepth == 16 && bpc == 16) { - out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0); - ri->bits_per_channel = 16; - } else - out = (stbi_uc *) stbi__malloc(4 * w*h); - - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - pixelCount = w*h; - - // Initialize the data to zero. - //memset( out, 0, pixelCount * 4 ); - - // Finally, the image data. - if (compression) { - // RLE as used by .PSD and .TIFF - // Loop until you get the number of unpacked bytes you are expecting: - // Read the next source byte into n. - // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. - // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. - // Else if n is 128, noop. - // Endloop - - // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, - // which we're going to just skip. - stbi__skip(s, h * channelCount * 2 ); - - // Read the RLE data by channel. - for (channel = 0; channel < 4; channel++) { - stbi_uc *p; - - p = out+channel; - if (channel >= channelCount) { - // Fill this channel with default data. - for (i = 0; i < pixelCount; i++, p += 4) - *p = (channel == 3 ? 255 : 0); - } else { - // Read the RLE data. - if (!stbi__psd_decode_rle(s, p, pixelCount)) { - STBI_FREE(out); - return stbi__errpuc("corrupt", "bad RLE data"); - } - } - } - - } else { - // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) - // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image. - - // Read the data by channel. - for (channel = 0; channel < 4; channel++) { - if (channel >= channelCount) { - // Fill this channel with default data. - if (bitdepth == 16 && bpc == 16) { - stbi__uint16 *q = ((stbi__uint16 *) out) + channel; - stbi__uint16 val = channel == 3 ? 65535 : 0; - for (i = 0; i < pixelCount; i++, q += 4) - *q = val; - } else { - stbi_uc *p = out+channel; - stbi_uc val = channel == 3 ? 255 : 0; - for (i = 0; i < pixelCount; i++, p += 4) - *p = val; - } - } else { - if (ri->bits_per_channel == 16) { // output bpc - stbi__uint16 *q = ((stbi__uint16 *) out) + channel; - for (i = 0; i < pixelCount; i++, q += 4) - *q = (stbi__uint16) stbi__get16be(s); - } else { - stbi_uc *p = out+channel; - if (bitdepth == 16) { // input bpc - for (i = 0; i < pixelCount; i++, p += 4) - *p = (stbi_uc) (stbi__get16be(s) >> 8); - } else { - for (i = 0; i < pixelCount; i++, p += 4) - *p = stbi__get8(s); - } - } - } - } - } - - // remove weird white matte from PSD - if (channelCount >= 4) { - if (ri->bits_per_channel == 16) { - for (i=0; i < w*h; ++i) { - stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i; - if (pixel[3] != 0 && pixel[3] != 65535) { - float a = pixel[3] / 65535.0f; - float ra = 1.0f / a; - float inv_a = 65535.0f * (1 - ra); - pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a); - pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a); - pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a); - } - } - } else { - for (i=0; i < w*h; ++i) { - unsigned char *pixel = out + 4*i; - if (pixel[3] != 0 && pixel[3] != 255) { - float a = pixel[3] / 255.0f; - float ra = 1.0f / a; - float inv_a = 255.0f * (1 - ra); - pixel[0] = (unsigned char) (pixel[0]*ra + inv_a); - pixel[1] = (unsigned char) (pixel[1]*ra + inv_a); - pixel[2] = (unsigned char) (pixel[2]*ra + inv_a); - } - } - } - } - - // convert to desired output format - if (req_comp && req_comp != 4) { - if (ri->bits_per_channel == 16) - out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h); - else - out = stbi__convert_format(out, 4, req_comp, w, h); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - - if (comp) *comp = 4; - *y = h; - *x = w; - - return out; -} -#endif - -// ************************************************************************************************* -// Softimage PIC loader -// by Tom Seddon -// -// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format -// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ - -#ifndef STBI_NO_PIC -static int stbi__pic_is4(stbi__context *s,const char *str) -{ - int i; - for (i=0; i<4; ++i) - if (stbi__get8(s) != (stbi_uc)str[i]) - return 0; - - return 1; -} - -static int stbi__pic_test_core(stbi__context *s) -{ - int i; - - if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) - return 0; - - for(i=0;i<84;++i) - stbi__get8(s); - - if (!stbi__pic_is4(s,"PICT")) - return 0; - - return 1; -} - -typedef struct -{ - stbi_uc size,type,channel; -} stbi__pic_packet; - -static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) -{ - int mask=0x80, i; - - for (i=0; i<4; ++i, mask>>=1) { - if (channel & mask) { - if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); - dest[i]=stbi__get8(s); - } - } - - return dest; -} - -static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) -{ - int mask=0x80,i; - - for (i=0;i<4; ++i, mask>>=1) - if (channel&mask) - dest[i]=src[i]; -} - -static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) -{ - int act_comp=0,num_packets=0,y,chained; - stbi__pic_packet packets[10]; - - // this will (should...) cater for even some bizarre stuff like having data - // for the same channel in multiple packets. - do { - stbi__pic_packet *packet; - - if (num_packets==sizeof(packets)/sizeof(packets[0])) - return stbi__errpuc("bad format","too many packets"); - - packet = &packets[num_packets++]; - - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - - act_comp |= packet->channel; - - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); - if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? - - for(y=0; ytype) { - default: - return stbi__errpuc("bad format","packet has bad compression type"); - - case 0: {//uncompressed - int x; - - for(x=0;xchannel,dest)) - return 0; - break; - } - - case 1://Pure RLE - { - int left=width, i; - - while (left>0) { - stbi_uc count,value[4]; - - count=stbi__get8(s); - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); - - if (count > left) - count = (stbi_uc) left; - - if (!stbi__readval(s,packet->channel,value)) return 0; - - for(i=0; ichannel,dest,value); - left -= count; - } - } - break; - - case 2: {//Mixed RLE - int left=width; - while (left>0) { - int count = stbi__get8(s), i; - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); - - if (count >= 128) { // Repeated - stbi_uc value[4]; - - if (count==128) - count = stbi__get16be(s); - else - count -= 127; - if (count > left) - return stbi__errpuc("bad file","scanline overrun"); - - if (!stbi__readval(s,packet->channel,value)) - return 0; - - for(i=0;ichannel,dest,value); - } else { // Raw - ++count; - if (count>left) return stbi__errpuc("bad file","scanline overrun"); - - for(i=0;ichannel,dest)) - return 0; - } - left-=count; - } - break; - } - } - } - } - - return result; -} - -static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri) -{ - stbi_uc *result; - int i, x,y, internal_comp; - STBI_NOTUSED(ri); - - if (!comp) comp = &internal_comp; - - for (i=0; i<92; ++i) - stbi__get8(s); - - x = stbi__get16be(s); - y = stbi__get16be(s); - - if (y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - if (x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); - if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode"); - - stbi__get32be(s); //skip `ratio' - stbi__get16be(s); //skip `fields' - stbi__get16be(s); //skip `pad' - - // intermediate buffer is RGBA - result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0); - if (!result) return stbi__errpuc("outofmem", "Out of memory"); - memset(result, 0xff, x*y*4); - - if (!stbi__pic_load_core(s,x,y,comp, result)) { - STBI_FREE(result); - result=0; - } - *px = x; - *py = y; - if (req_comp == 0) req_comp = *comp; - result=stbi__convert_format(result,4,req_comp,x,y); - - return result; -} - -static int stbi__pic_test(stbi__context *s) -{ - int r = stbi__pic_test_core(s); - stbi__rewind(s); - return r; -} -#endif - -// ************************************************************************************************* -// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb - -#ifndef STBI_NO_GIF -typedef struct -{ - stbi__int16 prefix; - stbi_uc first; - stbi_uc suffix; -} stbi__gif_lzw; - -typedef struct -{ - int w,h; - stbi_uc *out; // output buffer (always 4 components) - stbi_uc *background; // The current "background" as far as a gif is concerned - stbi_uc *history; - int flags, bgindex, ratio, transparent, eflags; - stbi_uc pal[256][4]; - stbi_uc lpal[256][4]; - stbi__gif_lzw codes[8192]; - stbi_uc *color_table; - int parse, step; - int lflags; - int start_x, start_y; - int max_x, max_y; - int cur_x, cur_y; - int line_size; - int delay; -} stbi__gif; - -static int stbi__gif_test_raw(stbi__context *s) -{ - int sz; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; - sz = stbi__get8(s); - if (sz != '9' && sz != '7') return 0; - if (stbi__get8(s) != 'a') return 0; - return 1; -} - -static int stbi__gif_test(stbi__context *s) -{ - int r = stbi__gif_test_raw(s); - stbi__rewind(s); - return r; -} - -static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) -{ - int i; - for (i=0; i < num_entries; ++i) { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - pal[i][3] = transp == i ? 0 : 255; - } -} - -static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) -{ - stbi_uc version; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') - return stbi__err("not GIF", "Corrupt GIF"); - - version = stbi__get8(s); - if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); - if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); - - stbi__g_failure_reason = ""; - g->w = stbi__get16le(s); - g->h = stbi__get16le(s); - g->flags = stbi__get8(s); - g->bgindex = stbi__get8(s); - g->ratio = stbi__get8(s); - g->transparent = -1; - - if (g->w > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); - if (g->h > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)"); - - if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments - - if (is_info) return 1; - - if (g->flags & 0x80) - stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); - - return 1; -} - -static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif)); - if (!g) return stbi__err("outofmem", "Out of memory"); - if (!stbi__gif_header(s, g, comp, 1)) { - STBI_FREE(g); - stbi__rewind( s ); - return 0; - } - if (x) *x = g->w; - if (y) *y = g->h; - STBI_FREE(g); - return 1; -} - -static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) -{ - stbi_uc *p, *c; - int idx; - - // recurse to decode the prefixes, since the linked-list is backwards, - // and working backwards through an interleaved image would be nasty - if (g->codes[code].prefix >= 0) - stbi__out_gif_code(g, g->codes[code].prefix); - - if (g->cur_y >= g->max_y) return; - - idx = g->cur_x + g->cur_y; - p = &g->out[idx]; - g->history[idx / 4] = 1; - - c = &g->color_table[g->codes[code].suffix * 4]; - if (c[3] > 128) { // don't render transparent pixels; - p[0] = c[2]; - p[1] = c[1]; - p[2] = c[0]; - p[3] = c[3]; - } - g->cur_x += 4; - - if (g->cur_x >= g->max_x) { - g->cur_x = g->start_x; - g->cur_y += g->step; - - while (g->cur_y >= g->max_y && g->parse > 0) { - g->step = (1 << g->parse) * g->line_size; - g->cur_y = g->start_y + (g->step >> 1); - --g->parse; - } - } -} - -static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) -{ - stbi_uc lzw_cs; - stbi__int32 len, init_code; - stbi__uint32 first; - stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; - stbi__gif_lzw *p; - - lzw_cs = stbi__get8(s); - if (lzw_cs > 12) return NULL; - clear = 1 << lzw_cs; - first = 1; - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - bits = 0; - valid_bits = 0; - for (init_code = 0; init_code < clear; init_code++) { - g->codes[init_code].prefix = -1; - g->codes[init_code].first = (stbi_uc) init_code; - g->codes[init_code].suffix = (stbi_uc) init_code; - } - - // support no starting clear code - avail = clear+2; - oldcode = -1; - - len = 0; - for(;;) { - if (valid_bits < codesize) { - if (len == 0) { - len = stbi__get8(s); // start new block - if (len == 0) - return g->out; - } - --len; - bits |= (stbi__int32) stbi__get8(s) << valid_bits; - valid_bits += 8; - } else { - stbi__int32 code = bits & codemask; - bits >>= codesize; - valid_bits -= codesize; - // @OPTIMIZE: is there some way we can accelerate the non-clear path? - if (code == clear) { // clear code - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - avail = clear + 2; - oldcode = -1; - first = 0; - } else if (code == clear + 1) { // end of stream code - stbi__skip(s, len); - while ((len = stbi__get8(s)) > 0) - stbi__skip(s,len); - return g->out; - } else if (code <= avail) { - if (first) { - return stbi__errpuc("no clear code", "Corrupt GIF"); - } - - if (oldcode >= 0) { - p = &g->codes[avail++]; - if (avail > 8192) { - return stbi__errpuc("too many codes", "Corrupt GIF"); - } - - p->prefix = (stbi__int16) oldcode; - p->first = g->codes[oldcode].first; - p->suffix = (code == avail) ? p->first : g->codes[code].first; - } else if (code == avail) - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - - stbi__out_gif_code(g, (stbi__uint16) code); - - if ((avail & codemask) == 0 && avail <= 0x0FFF) { - codesize++; - codemask = (1 << codesize) - 1; - } - - oldcode = code; - } else { - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - } - } - } -} - -// this function is designed to support animated gifs, although stb_image doesn't support it -// two back is the image from two frames ago, used for a very specific disposal format -static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) -{ - int dispose; - int first_frame; - int pi; - int pcount; - STBI_NOTUSED(req_comp); - - // on first frame, any non-written pixels get the background colour (non-transparent) - first_frame = 0; - if (g->out == 0) { - if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header - if (!stbi__mad3sizes_valid(4, g->w, g->h, 0)) - return stbi__errpuc("too large", "GIF image is too large"); - pcount = g->w * g->h; - g->out = (stbi_uc *) stbi__malloc(4 * pcount); - g->background = (stbi_uc *) stbi__malloc(4 * pcount); - g->history = (stbi_uc *) stbi__malloc(pcount); - if (!g->out || !g->background || !g->history) - return stbi__errpuc("outofmem", "Out of memory"); - - // image is treated as "transparent" at the start - ie, nothing overwrites the current background; - // background colour is only used for pixels that are not rendered first frame, after that "background" - // color refers to the color that was there the previous frame. - memset(g->out, 0x00, 4 * pcount); - memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent) - memset(g->history, 0x00, pcount); // pixels that were affected previous frame - first_frame = 1; - } else { - // second frame - how do we dispose of the previous one? - dispose = (g->eflags & 0x1C) >> 2; - pcount = g->w * g->h; - - if ((dispose == 3) && (two_back == 0)) { - dispose = 2; // if I don't have an image to revert back to, default to the old background - } - - if (dispose == 3) { // use previous graphic - for (pi = 0; pi < pcount; ++pi) { - if (g->history[pi]) { - memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); - } - } - } else if (dispose == 2) { - // restore what was changed last frame to background before that frame; - for (pi = 0; pi < pcount; ++pi) { - if (g->history[pi]) { - memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); - } - } - } else { - // This is a non-disposal case eithe way, so just - // leave the pixels as is, and they will become the new background - // 1: do not dispose - // 0: not specified. - } - - // background is what out is after the undoing of the previou frame; - memcpy( g->background, g->out, 4 * g->w * g->h ); - } - - // clear my history; - memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame - - for (;;) { - int tag = stbi__get8(s); - switch (tag) { - case 0x2C: /* Image Descriptor */ - { - stbi__int32 x, y, w, h; - stbi_uc *o; - - x = stbi__get16le(s); - y = stbi__get16le(s); - w = stbi__get16le(s); - h = stbi__get16le(s); - if (((x + w) > (g->w)) || ((y + h) > (g->h))) - return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); - - g->line_size = g->w * 4; - g->start_x = x * 4; - g->start_y = y * g->line_size; - g->max_x = g->start_x + w * 4; - g->max_y = g->start_y + h * g->line_size; - g->cur_x = g->start_x; - g->cur_y = g->start_y; - - // if the width of the specified rectangle is 0, that means - // we may not see *any* pixels or the image is malformed; - // to make sure this is caught, move the current y down to - // max_y (which is what out_gif_code checks). - if (w == 0) - g->cur_y = g->max_y; - - g->lflags = stbi__get8(s); - - if (g->lflags & 0x40) { - g->step = 8 * g->line_size; // first interlaced spacing - g->parse = 3; - } else { - g->step = g->line_size; - g->parse = 0; - } - - if (g->lflags & 0x80) { - stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); - g->color_table = (stbi_uc *) g->lpal; - } else if (g->flags & 0x80) { - g->color_table = (stbi_uc *) g->pal; - } else - return stbi__errpuc("missing color table", "Corrupt GIF"); - - o = stbi__process_gif_raster(s, g); - if (!o) return NULL; - - // if this was the first frame, - pcount = g->w * g->h; - if (first_frame && (g->bgindex > 0)) { - // if first frame, any pixel not drawn to gets the background color - for (pi = 0; pi < pcount; ++pi) { - if (g->history[pi] == 0) { - g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; - memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); - } - } - } - - return o; - } - - case 0x21: // Comment Extension. - { - int len; - int ext = stbi__get8(s); - if (ext == 0xF9) { // Graphic Control Extension. - len = stbi__get8(s); - if (len == 4) { - g->eflags = stbi__get8(s); - g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths. - - // unset old transparent - if (g->transparent >= 0) { - g->pal[g->transparent][3] = 255; - } - if (g->eflags & 0x01) { - g->transparent = stbi__get8(s); - if (g->transparent >= 0) { - g->pal[g->transparent][3] = 0; - } - } else { - // don't need transparent - stbi__skip(s, 1); - g->transparent = -1; - } - } else { - stbi__skip(s, len); - break; - } - } - while ((len = stbi__get8(s)) != 0) { - stbi__skip(s, len); - } - break; - } - - case 0x3B: // gif stream termination code - return (stbi_uc *) s; // using '1' causes warning on some compilers - - default: - return stbi__errpuc("unknown code", "Corrupt GIF"); - } - } -} - -static void *stbi__load_gif_main_outofmem(stbi__gif *g, stbi_uc *out, int **delays) -{ - STBI_FREE(g->out); - STBI_FREE(g->history); - STBI_FREE(g->background); - - if (out) STBI_FREE(out); - if (delays && *delays) STBI_FREE(*delays); - return stbi__errpuc("outofmem", "Out of memory"); -} - -static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) -{ - if (stbi__gif_test(s)) { - int layers = 0; - stbi_uc *u = 0; - stbi_uc *out = 0; - stbi_uc *two_back = 0; - stbi__gif g; - int stride; - int out_size = 0; - int delays_size = 0; - - STBI_NOTUSED(out_size); - STBI_NOTUSED(delays_size); - - memset(&g, 0, sizeof(g)); - if (delays) { - *delays = 0; - } - - do { - u = stbi__gif_load_next(s, &g, comp, req_comp, two_back); - if (u == (stbi_uc *) s) u = 0; // end of animated gif marker - - if (u) { - *x = g.w; - *y = g.h; - ++layers; - stride = g.w * g.h * 4; - - if (out) { - void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride ); - if (!tmp) - return stbi__load_gif_main_outofmem(&g, out, delays); - else { - out = (stbi_uc*) tmp; - out_size = layers * stride; - } - - if (delays) { - int *new_delays = (int*) STBI_REALLOC_SIZED( *delays, delays_size, sizeof(int) * layers ); - if (!new_delays) - return stbi__load_gif_main_outofmem(&g, out, delays); - *delays = new_delays; - delays_size = layers * sizeof(int); - } - } else { - out = (stbi_uc*)stbi__malloc( layers * stride ); - if (!out) - return stbi__load_gif_main_outofmem(&g, out, delays); - out_size = layers * stride; - if (delays) { - *delays = (int*) stbi__malloc( layers * sizeof(int) ); - if (!*delays) - return stbi__load_gif_main_outofmem(&g, out, delays); - delays_size = layers * sizeof(int); - } - } - memcpy( out + ((layers - 1) * stride), u, stride ); - if (layers >= 2) { - two_back = out - 2 * stride; - } - - if (delays) { - (*delays)[layers - 1U] = g.delay; - } - } - } while (u != 0); - - // free temp buffer; - STBI_FREE(g.out); - STBI_FREE(g.history); - STBI_FREE(g.background); - - // do the final conversion after loading everything; - if (req_comp && req_comp != 4) - out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); - - *z = layers; - return out; - } else { - return stbi__errpuc("not GIF", "Image was not as a gif type."); - } -} - -static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *u = 0; - stbi__gif g; - memset(&g, 0, sizeof(g)); - STBI_NOTUSED(ri); - - u = stbi__gif_load_next(s, &g, comp, req_comp, 0); - if (u == (stbi_uc *) s) u = 0; // end of animated gif marker - if (u) { - *x = g.w; - *y = g.h; - - // moved conversion to after successful load so that the same - // can be done for multiple frames. - if (req_comp && req_comp != 4) - u = stbi__convert_format(u, 4, req_comp, g.w, g.h); - } else if (g.out) { - // if there was an error and we allocated an image buffer, free it! - STBI_FREE(g.out); - } - - // free buffers needed for multiple frame loading; - STBI_FREE(g.history); - STBI_FREE(g.background); - - return u; -} - -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) -{ - return stbi__gif_info_raw(s,x,y,comp); -} -#endif - -// ************************************************************************************************* -// Radiance RGBE HDR loader -// originally by Nicolas Schulz -#ifndef STBI_NO_HDR -static int stbi__hdr_test_core(stbi__context *s, const char *signature) -{ - int i; - for (i=0; signature[i]; ++i) - if (stbi__get8(s) != signature[i]) - return 0; - stbi__rewind(s); - return 1; -} - -static int stbi__hdr_test(stbi__context* s) -{ - int r = stbi__hdr_test_core(s, "#?RADIANCE\n"); - stbi__rewind(s); - if(!r) { - r = stbi__hdr_test_core(s, "#?RGBE\n"); - stbi__rewind(s); - } - return r; -} - -#define STBI__HDR_BUFLEN 1024 -static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) -{ - int len=0; - char c = '\0'; - - c = (char) stbi__get8(z); - - while (!stbi__at_eof(z) && c != '\n') { - buffer[len++] = c; - if (len == STBI__HDR_BUFLEN-1) { - // flush to end of line - while (!stbi__at_eof(z) && stbi__get8(z) != '\n') - ; - break; - } - c = (char) stbi__get8(z); - } - - buffer[len] = 0; - return buffer; -} - -static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) -{ - if ( input[3] != 0 ) { - float f1; - // Exponent - f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); - if (req_comp <= 2) - output[0] = (input[0] + input[1] + input[2]) * f1 / 3; - else { - output[0] = input[0] * f1; - output[1] = input[1] * f1; - output[2] = input[2] * f1; - } - if (req_comp == 2) output[1] = 1; - if (req_comp == 4) output[3] = 1; - } else { - switch (req_comp) { - case 4: output[3] = 1; /* fallthrough */ - case 3: output[0] = output[1] = output[2] = 0; - break; - case 2: output[1] = 1; /* fallthrough */ - case 1: output[0] = 0; - break; - } - } -} - -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - int width, height; - stbi_uc *scanline; - float *hdr_data; - int len; - unsigned char count, value; - int i, j, k, c1,c2, z; - const char *headerToken; - STBI_NOTUSED(ri); - - // Check identifier - headerToken = stbi__hdr_gettoken(s,buffer); - if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0) - return stbi__errpf("not HDR", "Corrupt HDR image"); - - // Parse header - for(;;) { - token = stbi__hdr_gettoken(s,buffer); - if (token[0] == 0) break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; - } - - if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); - - // Parse width and height - // can't use sscanf() if we're not using stdio! - token = stbi__hdr_gettoken(s,buffer); - if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - height = (int) strtol(token, &token, 10); - while (*token == ' ') ++token; - if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - width = (int) strtol(token, NULL, 10); - - if (height > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); - if (width > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)"); - - *x = width; - *y = height; - - if (comp) *comp = 3; - if (req_comp == 0) req_comp = 3; - - if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0)) - return stbi__errpf("too large", "HDR image is too large"); - - // Read data - hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0); - if (!hdr_data) - return stbi__errpf("outofmem", "Out of memory"); - - // Load image data - // image data is stored as some number of sca - if ( width < 8 || width >= 32768) { - // Read flat data - for (j=0; j < height; ++j) { - for (i=0; i < width; ++i) { - stbi_uc rgbe[4]; - main_decode_loop: - stbi__getn(s, rgbe, 4); - stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); - } - } - } else { - // Read RLE-encoded data - scanline = NULL; - - for (j = 0; j < height; ++j) { - c1 = stbi__get8(s); - c2 = stbi__get8(s); - len = stbi__get8(s); - if (c1 != 2 || c2 != 2 || (len & 0x80)) { - // not run-length encoded, so we have to actually use THIS data as a decoded - // pixel (note this can't be a valid pixel--one of RGB must be >= 128) - stbi_uc rgbe[4]; - rgbe[0] = (stbi_uc) c1; - rgbe[1] = (stbi_uc) c2; - rgbe[2] = (stbi_uc) len; - rgbe[3] = (stbi_uc) stbi__get8(s); - stbi__hdr_convert(hdr_data, rgbe, req_comp); - i = 1; - j = 0; - STBI_FREE(scanline); - goto main_decode_loop; // yes, this makes no sense - } - len <<= 8; - len |= stbi__get8(s); - if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } - if (scanline == NULL) { - scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0); - if (!scanline) { - STBI_FREE(hdr_data); - return stbi__errpf("outofmem", "Out of memory"); - } - } - - for (k = 0; k < 4; ++k) { - int nleft; - i = 0; - while ((nleft = width - i) > 0) { - count = stbi__get8(s); - if (count > 128) { - // Run - value = stbi__get8(s); - count -= 128; - if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = value; - } else { - // Dump - if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = stbi__get8(s); - } - } - } - for (i=0; i < width; ++i) - stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); - } - if (scanline) - STBI_FREE(scanline); - } - - return hdr_data; -} - -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - int dummy; - - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - - if (stbi__hdr_test(s) == 0) { - stbi__rewind( s ); - return 0; - } - - for(;;) { - token = stbi__hdr_gettoken(s,buffer); - if (token[0] == 0) break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; - } - - if (!valid) { - stbi__rewind( s ); - return 0; - } - token = stbi__hdr_gettoken(s,buffer); - if (strncmp(token, "-Y ", 3)) { - stbi__rewind( s ); - return 0; - } - token += 3; - *y = (int) strtol(token, &token, 10); - while (*token == ' ') ++token; - if (strncmp(token, "+X ", 3)) { - stbi__rewind( s ); - return 0; - } - token += 3; - *x = (int) strtol(token, NULL, 10); - *comp = 3; - return 1; -} -#endif // STBI_NO_HDR - -#ifndef STBI_NO_BMP -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) -{ - void *p; - stbi__bmp_data info; - - info.all_a = 255; - p = stbi__bmp_parse_header(s, &info); - if (p == NULL) { - stbi__rewind( s ); - return 0; - } - if (x) *x = s->img_x; - if (y) *y = s->img_y; - if (comp) { - if (info.bpp == 24 && info.ma == 0xff000000) - *comp = 3; - else - *comp = info.ma ? 4 : 3; - } - return 1; -} -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) -{ - int channelCount, dummy, depth; - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - if (stbi__get32be(s) != 0x38425053) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 1) { - stbi__rewind( s ); - return 0; - } - stbi__skip(s, 6); - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) { - stbi__rewind( s ); - return 0; - } - *y = stbi__get32be(s); - *x = stbi__get32be(s); - depth = stbi__get16be(s); - if (depth != 8 && depth != 16) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 3) { - stbi__rewind( s ); - return 0; - } - *comp = 4; - return 1; -} - -static int stbi__psd_is16(stbi__context *s) -{ - int channelCount, depth; - if (stbi__get32be(s) != 0x38425053) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 1) { - stbi__rewind( s ); - return 0; - } - stbi__skip(s, 6); - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) { - stbi__rewind( s ); - return 0; - } - STBI_NOTUSED(stbi__get32be(s)); - STBI_NOTUSED(stbi__get32be(s)); - depth = stbi__get16be(s); - if (depth != 16) { - stbi__rewind( s ); - return 0; - } - return 1; -} -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) -{ - int act_comp=0,num_packets=0,chained,dummy; - stbi__pic_packet packets[10]; - - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - - if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { - stbi__rewind(s); - return 0; - } - - stbi__skip(s, 88); - - *x = stbi__get16be(s); - *y = stbi__get16be(s); - if (stbi__at_eof(s)) { - stbi__rewind( s); - return 0; - } - if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { - stbi__rewind( s ); - return 0; - } - - stbi__skip(s, 8); - - do { - stbi__pic_packet *packet; - - if (num_packets==sizeof(packets)/sizeof(packets[0])) - return 0; - - packet = &packets[num_packets++]; - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - act_comp |= packet->channel; - - if (stbi__at_eof(s)) { - stbi__rewind( s ); - return 0; - } - if (packet->size != 8) { - stbi__rewind( s ); - return 0; - } - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); - - return 1; -} -#endif - -// ************************************************************************************************* -// Portable Gray Map and Portable Pixel Map loader -// by Ken Miller -// -// PGM: http://netpbm.sourceforge.net/doc/pgm.html -// PPM: http://netpbm.sourceforge.net/doc/ppm.html -// -// Known limitations: -// Does not support comments in the header section -// Does not support ASCII image data (formats P2 and P3) - -#ifndef STBI_NO_PNM - -static int stbi__pnm_test(stbi__context *s) -{ - char p, t; - p = (char) stbi__get8(s); - t = (char) stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) { - stbi__rewind( s ); - return 0; - } - return 1; -} - -static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *out; - STBI_NOTUSED(ri); - - ri->bits_per_channel = stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n); - if (ri->bits_per_channel == 0) - return 0; - - if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)"); - - *x = s->img_x; - *y = s->img_y; - if (comp) *comp = s->img_n; - - if (!stbi__mad4sizes_valid(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0)) - return stbi__errpuc("too large", "PNM too large"); - - out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0); - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - if (!stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8))) { - STBI_FREE(out); - return stbi__errpuc("bad PNM", "PNM file truncated"); - } - - if (req_comp && req_comp != s->img_n) { - if (ri->bits_per_channel == 16) { - out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, s->img_n, req_comp, s->img_x, s->img_y); - } else { - out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); - } - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - return out; -} - -static int stbi__pnm_isspace(char c) -{ - return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; -} - -static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) -{ - for (;;) { - while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) - *c = (char) stbi__get8(s); - - if (stbi__at_eof(s) || *c != '#') - break; - - while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' ) - *c = (char) stbi__get8(s); - } -} - -static int stbi__pnm_isdigit(char c) -{ - return c >= '0' && c <= '9'; -} - -static int stbi__pnm_getinteger(stbi__context *s, char *c) -{ - int value = 0; - - while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { - value = value*10 + (*c - '0'); - *c = (char) stbi__get8(s); - if((value > 214748364) || (value == 214748364 && *c > '7')) - return stbi__err("integer parse overflow", "Parsing an integer in the PPM header overflowed a 32-bit int"); - } - - return value; -} - -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) -{ - int maxv, dummy; - char c, p, t; - - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - - stbi__rewind(s); - - // Get identifier - p = (char) stbi__get8(s); - t = (char) stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) { - stbi__rewind(s); - return 0; - } - - *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm - - c = (char) stbi__get8(s); - stbi__pnm_skip_whitespace(s, &c); - - *x = stbi__pnm_getinteger(s, &c); // read width - if(*x == 0) - return stbi__err("invalid width", "PPM image header had zero or overflowing width"); - stbi__pnm_skip_whitespace(s, &c); - - *y = stbi__pnm_getinteger(s, &c); // read height - if (*y == 0) - return stbi__err("invalid width", "PPM image header had zero or overflowing width"); - stbi__pnm_skip_whitespace(s, &c); - - maxv = stbi__pnm_getinteger(s, &c); // read max value - if (maxv > 65535) - return stbi__err("max value > 65535", "PPM image supports only 8-bit and 16-bit images"); - else if (maxv > 255) - return 16; - else - return 8; -} - -static int stbi__pnm_is16(stbi__context *s) -{ - if (stbi__pnm_info(s, NULL, NULL, NULL) == 16) - return 1; - return 0; -} -#endif - -static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) -{ - #ifndef STBI_NO_JPEG - if (stbi__jpeg_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PNG - if (stbi__png_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_GIF - if (stbi__gif_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_BMP - if (stbi__bmp_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PSD - if (stbi__psd_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PIC - if (stbi__pic_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PNM - if (stbi__pnm_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_HDR - if (stbi__hdr_info(s, x, y, comp)) return 1; - #endif - - // test tga last because it's a crappy test! - #ifndef STBI_NO_TGA - if (stbi__tga_info(s, x, y, comp)) - return 1; - #endif - return stbi__err("unknown image type", "Image not of any known type, or corrupt"); -} - -static int stbi__is_16_main(stbi__context *s) -{ - #ifndef STBI_NO_PNG - if (stbi__png_is16(s)) return 1; - #endif - - #ifndef STBI_NO_PSD - if (stbi__psd_is16(s)) return 1; - #endif - - #ifndef STBI_NO_PNM - if (stbi__pnm_is16(s)) return 1; - #endif - return 0; -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result; - if (!f) return stbi__err("can't fopen", "Unable to open file"); - result = stbi_info_from_file(f, x, y, comp); - fclose(f); - return result; -} - -STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) -{ - int r; - stbi__context s; - long pos = ftell(f); - stbi__start_file(&s, f); - r = stbi__info_main(&s,x,y,comp); - fseek(f,pos,SEEK_SET); - return r; -} - -STBIDEF int stbi_is_16_bit(char const *filename) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result; - if (!f) return stbi__err("can't fopen", "Unable to open file"); - result = stbi_is_16_bit_from_file(f); - fclose(f); - return result; -} - -STBIDEF int stbi_is_16_bit_from_file(FILE *f) -{ - int r; - stbi__context s; - long pos = ftell(f); - stbi__start_file(&s, f); - r = stbi__is_16_main(&s); - fseek(f,pos,SEEK_SET); - return r; -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__info_main(&s,x,y,comp); -} - -STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); - return stbi__info_main(&s,x,y,comp); -} - -STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__is_16_main(&s); -} - -STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); - return stbi__is_16_main(&s); -} - -#endif // STB_IMAGE_IMPLEMENTATION - -/* - revision history: - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs - 2.19 (2018-02-11) fix warning - 2.18 (2018-01-30) fix warnings - 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug - 1-bit BMP - *_is_16_bit api - avoid warnings - 2.16 (2017-07-23) all functions have 16-bit variants; - STBI_NO_STDIO works again; - compilation fixes; - fix rounding in unpremultiply; - optimize vertical flip; - disable raw_len validation; - documentation fixes - 2.15 (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode; - warning fixes; disable run-time SSE detection on gcc; - uniform handling of optional "return" values; - thread-safe initialization of zlib tables - 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs - 2.13 (2016-11-29) add 16-bit API, only supported for PNG right now - 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes - 2.11 (2016-04-02) allocate large structures on the stack - remove white matting for transparent PSD - fix reported channel count for PNG & BMP - re-enable SSE2 in non-gcc 64-bit - support RGB-formatted JPEG - read 16-bit PNGs (only as 8-bit) - 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED - 2.09 (2016-01-16) allow comments in PNM files - 16-bit-per-pixel TGA (not bit-per-component) - info() for TGA could break due to .hdr handling - info() for BMP to shares code instead of sloppy parse - can use STBI_REALLOC_SIZED if allocator doesn't support realloc - code cleanup - 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA - 2.07 (2015-09-13) fix compiler warnings - partial animated GIF support - limited 16-bpc PSD support - #ifdef unused functions - bug with < 92 byte PIC,PNM,HDR,TGA - 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value - 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning - 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit - 2.03 (2015-04-12) extra corruption checking (mmozeiko) - stbi_set_flip_vertically_on_load (nguillemot) - fix NEON support; fix mingw support - 2.02 (2015-01-19) fix incorrect assert, fix warning - 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 - 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG - 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) - progressive JPEG (stb) - PGM/PPM support (Ken Miller) - STBI_MALLOC,STBI_REALLOC,STBI_FREE - GIF bugfix -- seemingly never worked - STBI_NO_*, STBI_ONLY_* - 1.48 (2014-12-14) fix incorrectly-named assert() - 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) - optimize PNG (ryg) - fix bug in interlaced PNG with user-specified channel count (stb) - 1.46 (2014-08-26) - fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG - 1.45 (2014-08-16) - fix MSVC-ARM internal compiler error by wrapping malloc - 1.44 (2014-08-07) - various warning fixes from Ronny Chevalier - 1.43 (2014-07-15) - fix MSVC-only compiler problem in code changed in 1.42 - 1.42 (2014-07-09) - don't define _CRT_SECURE_NO_WARNINGS (affects user code) - fixes to stbi__cleanup_jpeg path - added STBI_ASSERT to avoid requiring assert.h - 1.41 (2014-06-25) - fix search&replace from 1.36 that messed up comments/error messages - 1.40 (2014-06-22) - fix gcc struct-initialization warning - 1.39 (2014-06-15) - fix to TGA optimization when req_comp != number of components in TGA; - fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) - add support for BMP version 5 (more ignored fields) - 1.38 (2014-06-06) - suppress MSVC warnings on integer casts truncating values - fix accidental rename of 'skip' field of I/O - 1.37 (2014-06-04) - remove duplicate typedef - 1.36 (2014-06-03) - convert to header file single-file library - if de-iphone isn't set, load iphone images color-swapped instead of returning NULL - 1.35 (2014-05-27) - various warnings - fix broken STBI_SIMD path - fix bug where stbi_load_from_file no longer left file pointer in correct place - fix broken non-easy path for 32-bit BMP (possibly never used) - TGA optimization by Arseny Kapoulkine - 1.34 (unknown) - use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case - 1.33 (2011-07-14) - make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements - 1.32 (2011-07-13) - support for "info" function for all supported filetypes (SpartanJ) - 1.31 (2011-06-20) - a few more leak fixes, bug in PNG handling (SpartanJ) - 1.30 (2011-06-11) - added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) - removed deprecated format-specific test/load functions - removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway - error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) - fix inefficiency in decoding 32-bit BMP (David Woo) - 1.29 (2010-08-16) - various warning fixes from Aurelien Pocheville - 1.28 (2010-08-01) - fix bug in GIF palette transparency (SpartanJ) - 1.27 (2010-08-01) - cast-to-stbi_uc to fix warnings - 1.26 (2010-07-24) - fix bug in file buffering for PNG reported by SpartanJ - 1.25 (2010-07-17) - refix trans_data warning (Won Chun) - 1.24 (2010-07-12) - perf improvements reading from files on platforms with lock-heavy fgetc() - minor perf improvements for jpeg - deprecated type-specific functions so we'll get feedback if they're needed - attempt to fix trans_data warning (Won Chun) - 1.23 fixed bug in iPhone support - 1.22 (2010-07-10) - removed image *writing* support - stbi_info support from Jetro Lauha - GIF support from Jean-Marc Lienher - iPhone PNG-extensions from James Brown - warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) - 1.21 fix use of 'stbi_uc' in header (reported by jon blow) - 1.20 added support for Softimage PIC, by Tom Seddon - 1.19 bug in interlaced PNG corruption check (found by ryg) - 1.18 (2008-08-02) - fix a threading bug (local mutable static) - 1.17 support interlaced PNG - 1.16 major bugfix - stbi__convert_format converted one too many pixels - 1.15 initialize some fields for thread safety - 1.14 fix threadsafe conversion bug - header-file-only version (#define STBI_HEADER_FILE_ONLY before including) - 1.13 threadsafe - 1.12 const qualifiers in the API - 1.11 Support installable IDCT, colorspace conversion routines - 1.10 Fixes for 64-bit (don't use "unsigned long") - optimized upsampling by Fabian "ryg" Giesen - 1.09 Fix format-conversion for PSD code (bad global variables!) - 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz - 1.07 attempt to fix C++ warning/errors again - 1.06 attempt to fix C++ warning/errors again - 1.05 fix TGA loading to return correct *comp and use good luminance calc - 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free - 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR - 1.02 support for (subset of) HDR files, float interface for preferred access to them - 1.01 fix bug: possible bug in handling right-side up bmps... not sure - fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all - 1.00 interface to zlib that skips zlib header - 0.99 correct handling of alpha in palette - 0.98 TGA loader by lonesock; dynamically add loaders (untested) - 0.97 jpeg errors on too large a file; also catch another malloc failure - 0.96 fix detection of invalid v value - particleman@mollyrocket forum - 0.95 during header scan, seek to markers in case of padding - 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same - 0.93 handle jpegtran output; verbose errors - 0.92 read 4,8,16,24,32-bit BMP files of several formats - 0.91 output 24-bit Windows 3.0 BMP files - 0.90 fix a few more warnings; bump version number to approach 1.0 - 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd - 0.60 fix compiling as c++ - 0.59 fix warnings: merge Dave Moore's -Wall fixes - 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian - 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available - 0.56 fix bug: zlib uncompressed mode len vs. nlen - 0.55 fix bug: restart_interval not initialized to 0 - 0.54 allow NULL for 'int *comp' - 0.53 fix bug in png 3->4; speedup png decoding - 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments - 0.51 obey req_comp requests, 1-component jpegs return as 1-component, - on 'test' only check type, not whether we support this variant - 0.50 (2006-11-19) - first released version -*/ - - -/* ------------------------------------------------------------------------------- -This software is available under 2 licenses -- choose whichever you prefer. ------------------------------------------------------------------------------- -ALTERNATIVE A - MIT License -Copyright (c) 2017 Sean Barrett -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. ------------------------------------------------------------------------------- -ALTERNATIVE B - Public Domain (www.unlicense.org) -This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, -commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to -this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------- -*/ diff --git a/vim/syntax/fart.vim b/vim/syntax/fart.vim deleted file mode 100644 index 15e1a0e..0000000 --- a/vim/syntax/fart.vim +++ /dev/null @@ -1,27 +0,0 @@ -" Vim syntax file - -" Setup -if version >= 600 - " Quit when a syntax file was already loaded - if exists("b:current_syntax") - finish - endif -endif - -syn case match - -syn keyword fartKeywords ambient ambient_occlusion color define diffuse exposure height jitter look_at material max_depth multisample ngon offset polygon position radius reflectance refraction rotate scale shininess size specular texture translate transparency union up vfov width -syn keyword fartObjects box camera cyl extrude intersect light options plane scene shape sphere subtract union -syn keyword fartControl for while if else elsif local -syn match fartNumber "\(^\|\W\)\@<=[+-]\=\(\d\+\)\=\.\=\d\+\([eE][+-]\=\d\+\)\=" -syn match fartComment "#.*" -syn match fartIdentifier "\$[a-zA-Z_][a-zA-Z_0-9]*" - -hi def link fartKeywords Operator -hi def link fartObjects Type -hi def link fartNumber Number -hi def link fartComment Comment -hi def link fartControl Special -hi def link fartIdentifier Identifier - -let b:current_syntax = "fart" diff --git a/vim/vimrc b/vim/vimrc deleted file mode 100644 index a9ee86f..0000000 --- a/vim/vimrc +++ /dev/null @@ -1,3 +0,0 @@ -if has("autocmd") - autocmd BufRead *.fart set syntax=fart -endif " has("autocmd")