Skip to content

Commit

Permalink
add some necessary dependecies
Browse files Browse the repository at this point in the history
  • Loading branch information
FangGet committed Mar 27, 2016
1 parent 5bc6d28 commit 0d9da55
Show file tree
Hide file tree
Showing 13,747 changed files with 3,296,829 additions and 2 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions ORB_SLAM2_Android/.classpath
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
54 changes: 54 additions & 0 deletions ORB_SLAM2_Android/.cproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="com.android.toolchain.gcc.678125027">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.678125027" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.autotools.core.ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.android.toolchain.gcc.678125027" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="com.android.toolchain.gcc.678125027.1770531638" name="/" resourcePath="">
<toolChain id="com.android.toolchain.gcc.635154680" name="Android GCC" superClass="com.android.toolchain.gcc">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.132446173" isAbstract="false" superClass="com.android.targetPlatform"/>
<builder id="com.android.builder.157280964" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
</outputEntries>
</builder>
<tool id="com.android.gcc.compiler.170470533" name="Android GCC Compiler" superClass="com.android.gcc.compiler">
<inputType id="com.android.gcc.inputType.962795971" superClass="com.android.gcc.inputType"/>
</tool>
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni"/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="ORB_SLAM2_Android.null.1944920017" name="ORB_SLAM2_Android"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.678125027;com.android.toolchain.gcc.678125027.1770531638;com.android.gcc.compiler.170470533;com.android.gcc.inputType.962795971">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.android.AndroidPerProjectProfile"/>
</scannerConfigBuildInfo>
</storageModule>
</cproject>
16 changes: 16 additions & 0 deletions ORB_SLAM2_Android/.project
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
Expand All @@ -25,9 +31,19 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
</projectDescription>
59 changes: 59 additions & 0 deletions ORB_SLAM2_Android/jni/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
LOCAL_PATH:= $(call my-dir)

#include $(CLEAR_VARS)
#OPENCV_LIB_TYPE:=STATIC
#ifeq ("$(wildcard $(OPENCV_MK_PATH))","")
##try to load OpenCV.mk from default install location
#include C:\Users\213\workspace\OpenCV-2.4.9-android-sdk\sdk\native\jni\OpenCV.mk
#else
#include $(OPENCV_MK_PATH)
#endif
#LOCAL_MODULE := ImgFun
#LOCAL_SRC_FILES := ImgFun.cpp
#include $(BUILD_SHARED_LIBRARY)

#include $(CLEAR_VARS)
#LOCAL_MODULE:= testlapack
#LOCAL_SRC_FILES:= testclapack.cpp
#LOCAL_STATIC_LIBRARIES := lapack
#include $(BUILD_SHARED_LIBRARY)

#include $(CLEAR_VARS)
#MAIN_DIR:=$(LOCAL_PATH)
#include $(LOCAL_PATH)/Thirdparty/g2o/Android.mk
#LOCAL_PATH:=$(MAIN_DIR)
#
#include $(CLEAR_VARS)
#MAIN_DIR:=$(LOCAL_PATH)
#include $(LOCAL_PATH)/Thirdparty/opencv/Android.mk
#LOCAL_PATH:=$(MAIN_DIR)
#
#include $(CLEAR_VARS)
#
#include $(LOCAL_PATH)/Thirdparty/DBoW2/Android.mk


include $(CLEAR_VARS)

#OPENCV_LIB_TYPE:=STATIC
#ifeq ("$(wildcard $(OPENCV_MK_PATH))","")
#include $(LOCAL_PATH)/Thirdparty/opencv/OpenCV.mk
#else
#include $(OPENCV_MK_PATH)
#endif
LOCAL_SRC_FILES:=test.cpp
LOCAL_MODULE := opencv
include $(BUILD_SHARED_LIBRARY)

include $(CLEAR_VARS)
include $(LOCAL_PATH)/Thirdparty/DBoW2/Android.mk

include $(CLEAR_VARS)

LOCAL_MODULE:=ORB_SLAM2
#LOCAL_SHARED_LIBRARIES :=g2o
#LOCAL_SHARED_LIBRARIES +=DBoW2

#LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog

include $(BUILD_SHARED_LIBRARY)
7 changes: 7 additions & 0 deletions ORB_SLAM2_Android/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -fexceptions -mfloat-abi=softfp -mfpu=neon -std=gnu++0x -Wno-deprecated \
-ftree-vectorize -ffast-math -fsingle-precision-constant
APP_ABI := armeabi armeabi-v7a
APP_OPTIM := release
APP_SHORT_COMMANDS := true

57 changes: 57 additions & 0 deletions ORB_SLAM2_Android/jni/ORB_SLAM2/include/Converter.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/**
* This file is part of ORB-SLAM2.
*
* Copyright (C) 2014-2016 Raúl Mur-Artal <raulmur at unizar dot es> (University of Zaragoza)
* For more information see <https://github.com/raulmur/ORB_SLAM2>
*
* ORB-SLAM2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ORB-SLAM2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with ORB-SLAM2. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef CONVERTER_H
#define CONVERTER_H

#include<opencv2/core/core.hpp>

#include<Eigen/Dense>
#include"Thirdparty/g2o/g2o/types/types_six_dof_expmap.h"
#include"Thirdparty/g2o/g2o/types/types_seven_dof_expmap.h"

namespace ORB_SLAM2
{

class Converter
{
public:
static std::vector<cv::Mat> toDescriptorVector(const cv::Mat &Descriptors);

static g2o::SE3Quat toSE3Quat(const cv::Mat &cvT);
static g2o::SE3Quat toSE3Quat(const g2o::Sim3 &gSim3);

static cv::Mat toCvMat(const g2o::SE3Quat &SE3);
static cv::Mat toCvMat(const g2o::Sim3 &Sim3);
static cv::Mat toCvMat(const Eigen::Matrix<double,4,4> &m);
static cv::Mat toCvMat(const Eigen::Matrix3d &m);
static cv::Mat toCvMat(const Eigen::Matrix<double,3,1> &m);
static cv::Mat toCvSE3(const Eigen::Matrix<double,3,3> &R, const Eigen::Matrix<double,3,1> &t);

static Eigen::Matrix<double,3,1> toVector3d(const cv::Mat &cvVector);
static Eigen::Matrix<double,3,1> toVector3d(const cv::Point3f &cvPoint);
static Eigen::Matrix<double,3,3> toMatrix3d(const cv::Mat &cvMat3);

static std::vector<float> toQuaternion(const cv::Mat &M);
};

}// namespace ORB_SLAM

#endif // CONVERTER_H
Loading

0 comments on commit 0d9da55

Please sign in to comment.