diff options
| author | Dan Gudmundsson <[email protected]> | 2015-12-04 12:13:50 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-12-04 12:13:50 +0100 |
| commit | 8fa96128d4a02019463d566e635f774e3fca7c67 (patch) | |
| tree | 7fd5088d21b5b85edf4e278af785832dd1315433 /lib/wx/src/gen/glu.erl | |
| parent | 2c2c82d71dd038b347674c31e6b117bc0fec8e2b (diff) | |
| parent | 7a13283ac6f4a7738dbe2a2ccfce392a820dca2a (diff) | |
| download | otp-8fa96128d4a02019463d566e635f774e3fca7c67.tar.gz otp-8fa96128d4a02019463d566e635f774e3fca7c67.tar.bz2 otp-8fa96128d4a02019463d566e635f774e3fca7c67.zip | |
Merge branch 'maint'
* maint:
wx: Fix some function specifications
wx: Remove call to disconnect_impl from server
wx: Add a command queue check after event sent to erlang
wx: Make wxPostScriptDC optional
wx: Add wxOverlay
wx: Use only one ring buffer for command queue
Diffstat (limited to 'lib/wx/src/gen/glu.erl')
| -rw-r--r-- | lib/wx/src/gen/glu.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/wx/src/gen/glu.erl b/lib/wx/src/gen/glu.erl index 6a6e20b3e4..5faba48930 100644 --- a/lib/wx/src/gen/glu.erl +++ b/lib/wx/src/gen/glu.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2015. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -51,10 +51,14 @@ -define(GLint64,64/native-signed). -type vertex() :: {float(), float(), float()}. -type enum() :: non_neg_integer(). %% See wx/include/gl.hrl or glu.hrl --type matrix() :: {float(),float(),float(),float(), +-type matrix12() :: {float(),float(),float(),float(), + float(),float(),float(),float(), + float(),float(),float(),float()}. +-type matrix16() :: {float(),float(),float(),float(), float(),float(),float(),float(), float(),float(),float(),float(), float(),float(),float(),float()}. +-type matrix() :: matrix12() | matrix16(). -type mem() :: binary() | tuple(). %% Memory block -export([tesselate/2,build1DMipmapLevels/9,build1DMipmaps/6,build2DMipmapLevels/10, |