Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PrimeSense/Sensor
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: PointCloudLibrary/Sensor
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: stable-pointclouds
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
9 contributors

Commits on Nov 3, 2013

  1. Fix types 

    taken from https://github.com/avin2/SensorKinect
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    346f36e View commit details

  2. Changed 25Hz support to 5_1 since 5_1_6 works good 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    ca3d8d5 View commit details

  3. Don't try to register callback for a 5.0 device 

    taken from https://github.com/avin2/SensorKinect
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    d7f031e View commit details

  4. Disable setting USB interface 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    037587f View commit details

  5. Add support for vendor id in Enumerate() USB devices 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    b20b6a8 View commit details

  6. Add support for XN sensor version 2 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    2e3bd56 View commit details

  7. Add support for Kinect product id 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    1c90b85 View commit details

  8. Add support for different frame rates and high resolution 

    taken from https://github.com/avin2/SensorKinect
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    8268d74 View commit details

  9. Test for y value in registration 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    459a699 View commit details

  10. Change host protocol 

    taken from https://github.com/avin2/SensorKinect
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    ef4cf74 View commit details

  11. Add and enable (uncompressed) Bayer modes 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    b85d50d View commit details

  12. Add ROS code for improved Bayer Pattern to RGB conversion 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    16a9a60 View commit details

  13. Disable SSE 

    Disable error when no SSE optimization is selected and disables SSE as
well to get clean CFLAGS.
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    15a941a View commit details

  14. Don't write log file upon OpenNI invocation

    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    9c8099a View commit details

  15. Fix parallel build 

    taken from https://kforge.ros.org/openni/drivers
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    ef94ca7 View commit details

  16. Add SONAME to libraries

    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    70eaa2d View commit details

  17. Use system wide libjpeg

    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    4b95235 View commit details

  18. Fix include dirs

    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    e83885d View commit details

  19. Remove call to XnLockedServerStreamsHash 

    taken from https://github.com/rbrusu/Sensor
    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    0854b77 View commit details

  20. Move XnSensorServer to /usr/lib/libopenni-sensor-primesense0

    @jspricke
    jspricke committed Nov 3, 2013
    Copy the full SHA
    06dc417 View commit details

Commits on Jan 8, 2014

  1. Add support for powerpc

    @stigge @jspricke
    stigge authored and jspricke committed Jan 8, 2014
    Copy the full SHA
    728867e View commit details

Commits on May 5, 2014

  1. Fix Kinect USB product ID

    @jspricke
    jspricke committed May 5, 2014
    Copy the full SHA
    b57edb8 View commit details

Commits on Jun 6, 2015

  1. Add ARMhf support.

    @jspricke
    Joe Burmeister authored and jspricke committed Jun 6, 2015
    Copy the full SHA
    a9b5a6b View commit details

Commits on Jun 8, 2015

  1. Add Arm64 support (thanks Edmund Grimley Evans)

    @jspricke
    jspricke committed Jun 8, 2015
    Copy the full SHA
    f98567d View commit details

Commits on Aug 4, 2016

  1. Add support for 1d27:0609 (Thanks to Kei Okada)

    @jspricke
    jspricke committed Aug 4, 2016
    Copy the full SHA
    0df7290 View commit details

Commits on Dec 17, 2016

  1. Sort list of source files for deterministic linking order

    @reinerh @jspricke
    reinerh authored and jspricke committed Dec 17, 2016
    Copy the full SHA
    80f1e0f View commit details

Commits on Feb 10, 2017

  1. Add mips support

    @jspricke
    Daniel Knezevic authored and jspricke committed Feb 10, 2017
    Copy the full SHA
    1615161 View commit details

Commits on Sep 26, 2017

  1. Add fix to handle ppc64 and ppc64el architectures

    @frediz @jspricke
    frediz authored and jspricke committed Sep 26, 2017
    Copy the full SHA
    584b8d1 View commit details

Commits on Jul 11, 2022

  1. Support riscv64

    @yuzibo @jspricke
    yuzibo authored and jspricke committed Jul 11, 2022
    Copy the full SHA
    7253220 View commit details

Commits on Dec 11, 2023

  1. Add support for LoongArch 

    Taken from:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057632
    @loongson-zjl @jspricke
    loongson-zjl authored and jspricke committed Dec 11, 2023
    Copy the full SHA
    7600b22 View commit details
Showing with 1,351 additions and 135 deletions.
  1. +1 −1 Data/GlobalDefaults.ini
  2. +2 −2 Platform/Linux/Build/Common/CommonCppMakefile
  3. +11 −1 Platform/Linux/Build/Common/CommonDefs.mak
  4. +9 −0 Platform/Linux/Build/Common/Platform.AArch64
  5. +1 −1 Platform/Linux/Build/Common/Platform.Arm
  6. +12 −0 Platform/Linux/Build/Common/Platform.LoongArch64
  7. +9 −0 Platform/Linux/Build/Common/Platform.Mips
  8. +9 −0 Platform/Linux/Build/Common/Platform.Powerpc
  9. +12 −0 Platform/Linux/Build/Common/Platform.Riscv64
  10. +1 −3 Platform/Linux/Build/Common/Platform.x86
  11. +1 −1 Platform/Linux/Build/EngineLibMakefile
  12. +1 −1 Platform/Linux/Build/Utils/EngineUtilMakefile
  13. +8 −3 Platform/Linux/Build/XnFormats/Makefile
  14. +13 −1 Platform/Linux/CreateRedist/RedistMaker
  15. +1 −1 Source/Utils/XnSensorServer/SensorServer.cpp
  16. +1,166 −65 Source/XnDeviceSensorV2/Bayer.cpp
  17. +17 −2 Source/XnDeviceSensorV2/Registration.cpp
  18. +1 −1 Source/XnDeviceSensorV2/XnDataProcessor.h
  19. +24 −13 Source/XnDeviceSensorV2/XnDeviceSensorIO.cpp
  20. +1 −1 Source/XnDeviceSensorV2/XnDeviceSensorInit.h
  21. +2 −1 Source/XnDeviceSensorV2/XnDeviceSensorProtocol.h
  22. +0 −12 Source/XnDeviceSensorV2/XnFirmwareStreams.cpp
  23. +2 −2 Source/XnDeviceSensorV2/XnHostProtocol.h
  24. +2 −2 Source/XnDeviceSensorV2/XnSensorClient.cpp
  25. +1 −0 Source/XnDeviceSensorV2/XnSensorDepthStream.cpp
  26. +3 −3 Source/XnDeviceSensorV2/XnSensorDepthStream.h
  27. +0 −4 Source/XnDeviceSensorV2/XnSensorFirmwareParams.cpp
  28. +2 −0 Source/XnDeviceSensorV2/XnSensorIRStream.cpp
  29. +34 −2 Source/XnDeviceSensorV2/XnSensorImageStream.cpp
  30. +3 −3 Source/XnDeviceSensorV2/XnSensorImageStream.h
  31. +1 −8 Source/XnDeviceSensorV2/XnServerSensorInvoker.h
  32. +1 −1 Source/XnFormats/XnStreamCompression.h
2 changes: 1 addition & 1 deletion Data/GlobalDefaults.ini
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ LogMasks=ALL
; 0 - No (default), 1 - Yes
;LogWriteToConsole=1
; 0 - No (default), 1 - Yes
LogWriteToFile=1
;LogWriteToFile=1
; 0 - No (default), 1 - Yes
;LogWriteLineInfo=0
; leave empty for nothing (default). ALL - all masks
4 changes: 2 additions & 2 deletions Platform/Linux/Build/Common/CommonCppMakefile
View file
Original file line number Diff line number Diff line change
@@ -77,8 +77,8 @@ ifneq "$(LIB_NAME)" ""
CFLAGS += -fPIC -fvisibility=hidden
ifneq ("$(OSTYPE)","Darwin")
LDFLAGS += -Wl,--no-undefined
OUTPUT_NAME = lib$(LIB_NAME).so
OUTPUT_COMMAND = $(CXX) -o $(OUTPUT_FILE) $(OBJ_FILES) $(LDFLAGS) -shared
OUTPUT_NAME = lib$(LIB_NAME).so.0
OUTPUT_COMMAND = $(CXX) -o $(OUTPUT_FILE) $(OBJ_FILES) $(LDFLAGS) -shared -Wl,-soname,${OUTPUT_NAME} && cd ${OUT_DIR} && ln -fs ${OUTPUT_NAME} lib${LIB_NAME}.so
else
LDFLAGS += -undefined error
OUTPUT_NAME = lib$(LIB_NAME).dylib
12 changes: 11 additions & 1 deletion Platform/Linux/Build/Common/CommonDefs.mak
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,16 @@ else ifneq (,$(findstring i386,$(MACHINE)))
HOST_PLATFORM = x86
else ifneq (,$(findstring arm,$(MACHINE)))
HOST_PLATFORM = Arm
else ifneq (,$(findstring aarch64,$(MACHINE)))
HOST_PLATFORM = AArch64
else ifneq (,$(findstring ppc,$(MACHINE)))
HOST_PLATFORM = Powerpc
else ifneq (,$(findstring mips,$(MACHINE)))
HOST_PLATFORM = Mips
else ifneq (,$(findstring riscv64,$(MACHINE)))
HOST_PLATFORM = Riscv64
else ifneq (,$(findstring loongarch64,$(MACHINE)))
HOST_PLATFORM = LoongArch64
else
DUMMY:=$(error Can't determine host platform)
endif
@@ -36,7 +46,7 @@ else
endif

# expand file list
SRC_FILES_LIST = $(wildcard $(SRC_FILES))
SRC_FILES_LIST = $(sort $(wildcard $(SRC_FILES)))

# define the intermediate directory
INT_DIR = $(PLATFORM)-$(CFG)
9 changes: 9 additions & 0 deletions Platform/Linux/Build/Common/Platform.AArch64
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ifeq "$(CFG)" "Release"

# Optimization level, minus currently buggy optimizing methods (which break bit-exact)
CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing

# More optimization flags
CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant

endif
2 changes: 1 addition & 1 deletion Platform/Linux/Build/Common/Platform.Arm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ifeq "$(CFG)" "Release"

# Hardware specifying flags
CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-mcpu=cortex-a8
CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon #-mcpu=cortex-a8

# Optimization level, minus currently buggy optimizing methods (which break bit-exact)
CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
12 changes: 12 additions & 0 deletions Platform/Linux/Build/Common/Platform.LoongArch64
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export GLUT_SUPPORTED=1

ifeq "$(CFG)" "Release"

# Optimization level, minus currently buggy optimizing methods (which break bit-exact)
CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing

# More optimization flags
CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant

endif

9 changes: 9 additions & 0 deletions Platform/Linux/Build/Common/Platform.Mips
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ifeq "$(CFG)" "Release"

# Optimization level, minus currently buggy optimizing methods (which break bit-exact)
CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing

# More optimization flags
CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant

endif
9 changes: 9 additions & 0 deletions Platform/Linux/Build/Common/Platform.Powerpc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ifeq "$(CFG)" "Release"

# Optimization level, minus currently buggy optimizing methods (which break bit-exact)
CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing

# More optimization flags
CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant

endif
12 changes: 12 additions & 0 deletions Platform/Linux/Build/Common/Platform.Riscv64
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export GLUT_SUPPORTED=1

ifeq "$(CFG)" "Release"

# Optimization level, minus currently buggy optimizing methods (which break bit-exact)
CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing

# More optimization flags
CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant

endif

4 changes: 1 addition & 3 deletions Platform/Linux/Build/Common/Platform.x86
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
export GLUT_SUPPORTED=1

ifndef SSE_GENERATION
SSE_GENERATION = 3
SSE_GENERATION = 0
endif

ifeq ("$(OSTYPE)","Darwin")
@@ -19,7 +19,5 @@ else
ifeq ($(SSSE3_ENABLED), 1)
CFLAGS += -mssse3
endif
else
DUMMY:=($error "Only SSE2 and SSE3 are supported")
endif
endif
2 changes: 1 addition & 1 deletion Platform/Linux/Build/EngineLibMakefile
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
#############################################################################

INC_DIRS += \
=/usr/include/ni \
/usr/include/ni \
../../../../Include \
../../../../Source \
../../../../Source/XnCommon
2 changes: 1 addition & 1 deletion Platform/Linux/Build/Utils/EngineUtilMakefile
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
#############################################################################

INC_DIRS += \
=/usr/include/ni \
/usr/include/ni \
../../../../../Include \
../../../../../Source \
../../../../../Source/XnCommon
11 changes: 8 additions & 3 deletions Platform/Linux/Build/XnFormats/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
SRC_FILES = \
../../../../Source/XnFormats/*.cpp \
../../../../Source/External/LibJPEG/*.c
../../../../Source/XnFormats/*.cpp

LIB_NAME = XnFormats
USED_LIBS = XnCore OpenNI
DEFINES = XN_FORMATS_EXPORTS
INC_DIRS = ../../../../Source/External/LibJPEG

ifeq ($(shell ld -ljpeg -o /dev/null 1>&2 2> /dev/null; echo $$?), 0)
USED_LIBS += jpeg
else
INC_DIRS += ../../../../Source/External/LibJPEG
SRC_FILES += ../../../../Source/External/LibJPEG/*.c
endif

include ../EngineLibMakefile
14 changes: 13 additions & 1 deletion Platform/Linux/CreateRedist/RedistMaker
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,18 @@ else
PLATFORM="x64" ;;
arm)
PLATFORM="Arm" ;;
aarch64)
PLATFORM="AArch64" ;;
ppc*)
PLATFORM="Powerpc" ;;
arm*)
PLATFORM="Arm" ;;
mips*)
PLATFORM="Mips" ;;
riscv64)
PLATFORM="Riscv64" ;;
loongarch64)
PLATFORM="LoongArch64" ;;
*)
echo "Unknown machine type: $MACHINE_TYPE"
exit 1
@@ -67,7 +79,7 @@ rm -rf ../$REDIST_DIR
# Build Engine
echo "Building..."
make -C ../Build clean > /dev/null
make -j$(calc_jobs_number) -C ../Build
make -C ../Build

# create redist folder structure
echo "Creating redist folder..."
2 changes: 1 addition & 1 deletion Source/Utils/XnSensorServer/SensorServer.cpp
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ int main(int argc, char* argv[])
nRetVal = XnSensorServerGetGlobalConfigFile(strConfigDir, strConfigFile, XN_FILE_MAX_PATH);
XN_CHECK_RC(nRetVal, "Resolving global config file");

#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX)
#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_AARCH64 || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX || XN_PLATFORM == XN_PLATFORM_LINUX_MIPS || XN_PLATFORM == XN_PLATFORM_LINUX_RISCV64 || XN_PLATFORM == XN_PLATFORM_LINUX_LOONGARCH64)
xnLogSetOutputFolder("/var/log/primesense/XnSensorServer/");
#endif

Loading