From 245bc166897a8b035220cf1853c223ac146deccd Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Thu, 22 May 2008 10:27:36 +0000 Subject: [PATCH] Changed "Free" to "Open", Java build configs, port directory added, intellij idea5.1 project file added git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@26 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- port/jAssimp/assimp.iml | 15 ++++++ port/jAssimp/src/assimp/Importer.java | 72 +++++++++++++++++++++++++++ port/jAssimp/src/assimp/Logger.java | 11 ++++ workspaces/vc8/assimp.sln | 2 + 4 files changed, 100 insertions(+) create mode 100644 port/jAssimp/assimp.iml create mode 100644 port/jAssimp/src/assimp/Importer.java create mode 100644 port/jAssimp/src/assimp/Logger.java diff --git a/port/jAssimp/assimp.iml b/port/jAssimp/assimp.iml new file mode 100644 index 000000000..d079e1581 --- /dev/null +++ b/port/jAssimp/assimp.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/port/jAssimp/src/assimp/Importer.java b/port/jAssimp/src/assimp/Importer.java new file mode 100644 index 000000000..f232d470c --- /dev/null +++ b/port/jAssimp/src/assimp/Importer.java @@ -0,0 +1,72 @@ +/* +--------------------------------------------------------------------------- +Free Asset Import Library (ASSIMP) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2008, ASSIMP Development Team + +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: + +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +* Neither the name of the ASSIMP team, nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of the ASSIMP Development Team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------------- +*/ + + +package assimp; + +/** + * + */ +public class Importer { + + public Importer() { + /** try to load the jassimp library. First try to load the + * x64 version, in case of failure the x86 version + */ + try { + System.loadLibrary("jassimp_x64"); + } + catch (UnsatisfiedLinkError exc) { + try { + System.loadLibrary("jassimp_x86"); + } + catch (UnsatisfiedLinkError exc2) { + + /** Seems we're definitely unable to load the assimp library + * This doesn't make life easier btw ... + */ + + } + } + } + + +} diff --git a/port/jAssimp/src/assimp/Logger.java b/port/jAssimp/src/assimp/Logger.java new file mode 100644 index 000000000..8650ab38a --- /dev/null +++ b/port/jAssimp/src/assimp/Logger.java @@ -0,0 +1,11 @@ +package assimp; + +/** + * Created by IntelliJ IDEA. + * User: Alex + * Date: 21.05.2008 + * Time: 19:31:28 + * To change this template use File | Settings | File Templates. + */ +public interface Logger { +} diff --git a/workspaces/vc8/assimp.sln b/workspaces/vc8/assimp.sln index 797b37559..89d6a927e 100644 --- a/workspaces/vc8/assimp.sln +++ b/workspaces/vc8/assimp.sln @@ -29,11 +29,13 @@ Global {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL_Java|Win32.ActiveCfg = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL_Java|Win32.Build.0 = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.ActiveCfg = Debug|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug_DLL|Win32.Build.0 = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|Win32.ActiveCfg = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Debug|Win32.Build.0 = Debug|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL_Java|Win32.ActiveCfg = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL_Java|Win32.Build.0 = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.ActiveCfg = Release|Win32 + {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release_DLL|Win32.Build.0 = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|Win32.ActiveCfg = Release|Win32 {B17B959B-BB8A-4596-AF0F-A8C8DBBC3C5E}.Release|Win32.Build.0 = Release|Win32 {5691E159-2D9B-407F-971F-EA5C592DC524}.Debug_DLL_Java|Win32.ActiveCfg = Debug_DLL_Java|Win32