mirror of https://github.com/mosra/magnum.git
Browse Source
Conflicts: modules/FindCorrade.cmake src/Math/Test/MatrixTest.cpp src/Platform/AbstractXApplication.cpp src/Platform/AbstractXApplication.h src/Platform/GlxApplication.h src/Platform/Implementation/AbstractContextHandler.h src/Platform/Implementation/GlxContextHandler.h src/Platform/XEglApplication.h src/Test/SwizzleTest.cpp
Vladimír Vondruš
13 years ago
134 changed files with 3196 additions and 1594 deletions
@ -0,0 +1,37 @@
|
||||
# Author: mosra <mosra@centrum.cz> |
||||
pkgname=emscripten-magnum |
||||
pkgver=dev |
||||
pkgrel=1 |
||||
pkgdesc="C++11 and OpenGL 2D/3D graphics engine (Emscripten)" |
||||
arch=('any') |
||||
url="http://mosra.cz/blog/magnum.php" |
||||
license=('MIT') |
||||
depends=('emscripten-corrade') |
||||
makedepends=('cmake') |
||||
options=(!strip !buildflags) |
||||
|
||||
build() { |
||||
if [ ! -d "$startdir/build-emscripten" ] ; then |
||||
mkdir "$startdir/build-emscripten" |
||||
cd "$startdir/build-emscripten" |
||||
|
||||
cmake .. \ |
||||
-DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ |
||||
-DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/Emscripten.cmake" \ |
||||
-DWITH_AUDIO=OFF |
||||
fi |
||||
|
||||
cd "$startdir/build-emscripten" |
||||
|
||||
cmake .. \ |
||||
-DCMAKE_BUILD_TYPE=Release \ |
||||
-DCMAKE_INSTALL_PREFIX=/usr/emscripten/system \ |
||||
-DWITH_AUDIO=OFF \ |
||||
-DWITH_SDL2APPLICATION=ON |
||||
make |
||||
} |
||||
|
||||
package() { |
||||
cd "$startdir/build-emscripten" |
||||
make DESTDIR="$pkgdir/" install |
||||
} |
||||
@ -0,0 +1,44 @@
|
||||
var Module = { |
||||
preRun: [], |
||||
postRun: [], |
||||
|
||||
printErr: function(message) { |
||||
console.error(Array.prototype.slice.call(arguments).join(' ')); |
||||
}, |
||||
|
||||
print: function(message) { |
||||
console.log(Array.prototype.slice.call(arguments).join(' ')); |
||||
}, |
||||
|
||||
canvas: document.getElementById('module'), |
||||
|
||||
setStatus: function(message) { |
||||
var status = document.getElementById('status'); |
||||
if(status) status.innerHTML = message; |
||||
}, |
||||
|
||||
setStatusDescription: function(message) { |
||||
var statusDescription = document.getElementById('statusDescription'); |
||||
if(statusDescription) statusDescription.innerHTML = message; |
||||
}, |
||||
|
||||
totalDependencies: 0, |
||||
|
||||
monitorRunDependencies: function(left) { |
||||
this.totalDependencies = Math.max(this.totalDependencies, left); |
||||
|
||||
if(left) { |
||||
Module.setStatus('Downloading...'); |
||||
Module.setStatusDescription((this.totalDependencies - left) + '/' + this.totalDependencies); |
||||
} else { |
||||
Module.setStatus('Download complete'); |
||||
Module.setStatusDescription(''); |
||||
} |
||||
} |
||||
}; |
||||
|
||||
Module.setStatus('Downloading...'); |
||||
|
||||
Module.canvas.addEventListener('contextmenu', function(event) { |
||||
event.preventDefault(); |
||||
}, true); |
||||
@ -0,0 +1,35 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
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. |
||||
*/ |
||||
|
||||
#include "GlxApplication.h" |
||||
|
||||
#include "Platform/Implementation/GlxContextHandler.h" |
||||
|
||||
namespace Magnum { namespace Platform { |
||||
|
||||
GlxApplication::GlxApplication(const Arguments& arguments, const Configuration& configuration): AbstractXApplication(new Implementation::GlxContextHandler, arguments, configuration) {} |
||||
|
||||
GlxApplication::GlxApplication(const Arguments& arguments, std::nullptr_t): AbstractXApplication(new Implementation::GlxContextHandler, arguments, nullptr) {} |
||||
|
||||
}} |
||||
@ -0,0 +1,35 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
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. |
||||
*/ |
||||
|
||||
#include "XEglApplication.h" |
||||
|
||||
#include "Platform/Implementation/EglContextHandler.h" |
||||
|
||||
namespace Magnum { namespace Platform { |
||||
|
||||
XEglApplication::XEglApplication(const Arguments& arguments, const Configuration& configuration): AbstractXApplication(new Implementation::EglContextHandler, arguments, configuration) {} |
||||
|
||||
XEglApplication::XEglApplication(const Arguments& arguments, std::nullptr_t): AbstractXApplication(new Implementation::EglContextHandler, arguments, nullptr) {} |
||||
|
||||
}} |
||||
@ -1,41 +1,41 @@
|
||||
<!DOCTYPE html> |
||||
<html> |
||||
<head> |
||||
<title>Magnum Info</title> |
||||
<meta charset="utf-8" /> |
||||
<link rel="stylesheet" href="NaClApplication.css" /> |
||||
<style type="text/css"> |
||||
#module { |
||||
<html xmlns="http://www.w3.org/1999/xhtml"> |
||||
<head> |
||||
<title>Magnum Info</title> |
||||
<meta charset="utf-8" /> |
||||
<link rel="stylesheet" href="WebApplication.css" /> |
||||
<style type="text/css"> |
||||
#module { |
||||
position: absolute; |
||||
visibility: hidden; /* The module doesn't display anything */ |
||||
} |
||||
} |
||||
|
||||
#info { |
||||
#info { |
||||
width: 640px; |
||||
height: 480px; |
||||
overflow: auto; |
||||
font-family: monospace; |
||||
white-space: pre-wrap; |
||||
} |
||||
</style> |
||||
</head> |
||||
<body> |
||||
<h1>Magnum Info</h1> |
||||
<div id="listener"> |
||||
<script type="text/javascript" src="NaClApplication.js"></script> |
||||
<script type="text/javascript"> |
||||
function messageReceived(message) { |
||||
} |
||||
</style> |
||||
</head> |
||||
<body> |
||||
<h1>Magnum Info</h1> |
||||
<div id="listener"> |
||||
<embed id="module" type="application/x-nacl" src="magnum-info.nmf" /> |
||||
<div id="status">Initialization...</div> |
||||
<div id="statusDescription" /> |
||||
<div id="info" /> |
||||
<script src="NaClApplication.js"></script> |
||||
<script type="text/javascript"> |
||||
function messageReceived(message) { |
||||
var info = document.getElementById('info'); |
||||
info.innerHTML += message.data; |
||||
} |
||||
} |
||||
|
||||
var listener = document.getElementById('listener'); |
||||
listener.addEventListener('message', messageReceived, true); |
||||
</script> |
||||
<embed id="module" type="application/x-nacl" src="magnum-info.nmf" /> |
||||
<div id="status">Initialization...</div> |
||||
<div id="statusDescription"></div> |
||||
<div id="info"></div> |
||||
</div> |
||||
</body> |
||||
var listener = document.getElementById('listener'); |
||||
listener.addEventListener('message', messageReceived, true); |
||||
</script> |
||||
</div> |
||||
</body> |
||||
</html> |
||||
|
||||
@ -0,0 +1,142 @@
|
||||
#ifndef Magnum_SceneGraph_AbstractTranslation_h |
||||
#define Magnum_SceneGraph_AbstractTranslation_h |
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
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. |
||||
*/ |
||||
|
||||
/** @file
|
||||
* @brief Class @ref Magnum::SceneGraph::AbstractTranslation, alias @ref Magnum::SceneGraph::AbstractBasicTranslation2D, @ref Magnum::SceneGraph::AbstractBasicTranslation3D, typedef @ref Magnum::SceneGraph::AbstractTranslation2D, @ref Magnum::SceneGraph::AbstractBasicTranslation3D |
||||
*/ |
||||
|
||||
#include "Math/Vector3.h" |
||||
#include "DimensionTraits.h" |
||||
#include "SceneGraph/AbstractTransformation.h" |
||||
|
||||
namespace Magnum { namespace SceneGraph { |
||||
|
||||
/**
|
||||
@brief Base transformation for two-dimensional scenes supporting translation |
||||
|
||||
By default the translation is stored with the same underlying type as resulting |
||||
transformation matrix, but it's possible to store translation in e.g. integral |
||||
coordinates while having floating-point transformation matrix. |
||||
|
||||
@see @ref AbstractBasicTranslation2D, @ref AbstractBasicTranslation3D, |
||||
@ref AbstractTranslation2D, @ref AbstractTranslation3D, @ref scenegraph |
||||
*/ |
||||
#ifdef DOXYGEN_GENERATING_OUTPUT |
||||
template<UnsignedInt dimensions, class T, class TranslationType = T> |
||||
#else |
||||
template<UnsignedInt dimensions, class T, class TranslationType> |
||||
#endif |
||||
class AbstractTranslation: public AbstractTransformation<dimensions, T> { |
||||
public: |
||||
explicit AbstractTranslation() = default; |
||||
|
||||
/**
|
||||
* @brief Translate object |
||||
* @param vector Translation vector |
||||
* @param type Transformation type |
||||
* @return Reference to self (for method chaining) |
||||
* |
||||
* @see @ref Vector2::xAxis(), @ref Vector2::yAxis(), @ref Vector3::xAxis(), |
||||
* @ref Vector3::yAxis(), @ref Vector3::zAxis() |
||||
*/ |
||||
AbstractTranslation<dimensions, T>& translate(const typename DimensionTraits<dimensions, TranslationType>::VectorType& vector, TransformationType type = TransformationType::Global) { |
||||
doTranslate(vector, type); |
||||
return *this; |
||||
} |
||||
|
||||
protected: |
||||
~AbstractTranslation() = default; |
||||
|
||||
#ifdef DOXYGEN_GENERATING_OUTPUT |
||||
protected: |
||||
#else |
||||
private: |
||||
#endif |
||||
/** @brief Polymorphic implementation for translate() */ |
||||
virtual void doTranslate(const typename DimensionTraits<dimensions, TranslationType>::VectorType& vector, TransformationType type) = 0; |
||||
}; |
||||
|
||||
#ifndef CORRADE_GCC46_COMPATIBILITY |
||||
/**
|
||||
@brief Base transformation for two-dimensional scenes supporting translation |
||||
|
||||
Convenience alternative to <tt>%AbstractTranslation<2, T, TranslationType></tt>. |
||||
See @ref AbstractTranslation for more information. |
||||
@note Not available on GCC < 4.7. Use <tt>%AbstractTranslation<2, T, TranslationType></tt> |
||||
instead. |
||||
@see @ref AbstractTranslation2D, @ref AbstractBasicTranslation3D |
||||
*/ |
||||
#ifdef DOXYGEN_GENERATING_OUTPUT |
||||
template<class T, class TranslationType = T> |
||||
#else |
||||
template<class T, class TranslationType> |
||||
#endif |
||||
using AbstractBasicTranslation2D = AbstractTranslation<2, T, TranslationType>; |
||||
#endif |
||||
|
||||
/**
|
||||
@brief Base transformation for two-dimensional float scenes supporting translation |
||||
|
||||
@see @ref AbstractTranslation3D |
||||
*/ |
||||
#ifndef CORRADE_GCC46_COMPATIBILITY |
||||
typedef AbstractBasicTranslation2D<Float> AbstractTranslation2D; |
||||
#else |
||||
typedef AbstractTranslation<2, Float> AbstractTranslation2D; |
||||
#endif |
||||
|
||||
#ifndef CORRADE_GCC46_COMPATIBILITY |
||||
/**
|
||||
@brief Base transformation for three-dimensional scenes supporting translation |
||||
|
||||
Convenience alternative to <tt>%AbstractTranslation<3, T, TranslationType></tt>. |
||||
See @ref AbstractTranslation for more information. |
||||
@note Not available on GCC < 4.7. Use <tt>%AbstractTranslation<3, T, TranslationType></tt> |
||||
instead. |
||||
@see @ref AbstractTranslation3D, @ref AbstractBasicTranslation2D |
||||
*/ |
||||
#ifdef DOXYGEN_GENERATING_OUTPUT |
||||
template<class T, class TranslationType = T> |
||||
#else |
||||
template<class T, class TranslationType> |
||||
#endif |
||||
using AbstractBasicTranslation3D = AbstractTranslation<3, T, TranslationType>; |
||||
#endif |
||||
|
||||
/**
|
||||
@brief Base transformation for three-dimensional float scenes supporting translation |
||||
|
||||
@see @ref AbstractTranslation2D |
||||
*/ |
||||
#ifndef CORRADE_GCC46_COMPATIBILITY |
||||
typedef AbstractBasicTranslation3D<Float> AbstractTranslation3D; |
||||
#else |
||||
typedef AbstractTranslation<3, Float> AbstractTranslation3D; |
||||
#endif |
||||
|
||||
}} |
||||
|
||||
#endif |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue