Added qtm support + example.

diff --git a/examples/qtm/Makefile b/examples/qtm/Makefile
new file mode 100644 (file)
index 0000000..1ed1097
--- /dev/null
+++ b/examples/qtm/Makefile
@@ -0,0 +1,175 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+TOPDIR ?= $(CURDIR)
+include $(DEVKITARM)/3ds_rules
+
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#
+# NO_SMDH: if set to anything, no SMDH file is generated.
+# APP_TITLE is the name of the app stored in the SMDH file (Optional)
+# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional)
+# APP_AUTHOR is the author of the app stored in the SMDH file (Optional)
+# ICON is the filename of the icon (.png), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.png
+#     - icon.png
+#     - <libctru folder>/default_icon.png
+#---------------------------------------------------------------------------------
+TARGET         :=      $(notdir $(CURDIR))
+BUILD          :=      build
+SOURCES                :=      source
+DATA           :=      data
+INCLUDES       :=      include
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH   :=      -march=armv6k -mtune=mpcore -mfloat-abi=softfp
+
+CFLAGS :=      -g -Wall -O2 -mword-relocations \
+                       -fomit-frame-pointer -ffast-math \
+                       $(ARCH)
+
+CFLAGS +=      $(INCLUDE) -DARM11 -D_3DS
+
+CXXFLAGS       := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+
+ASFLAGS        :=      -g $(ARCH)
+LDFLAGS        =       -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+
+LIBS   := -lctru -lm
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS        := $(CTRULIB)
+
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT  :=      $(CURDIR)/$(TARGET)
+export TOPDIR  :=      $(CURDIR)
+
+export VPATH   :=      $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+                       $(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR :=      $(CURDIR)/$(BUILD)
+
+CFILES         :=      $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES       :=      $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES         :=      $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES       :=      $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+       export LD       :=      $(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+       export LD       :=      $(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES  :=      $(addsuffix .o,$(BINFILES)) \
+                       $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+
+export INCLUDE :=      $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+                       $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+                       -I$(CURDIR)/$(BUILD)
+
+export LIBPATHS        :=      $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+ifeq ($(strip $(ICON)),)
+       icons := $(wildcard *.png)
+       ifneq (,$(findstring $(TARGET).png,$(icons)))
+               export APP_ICON := $(TOPDIR)/$(TARGET).png
+       else
+               ifneq (,$(findstring icon.png,$(icons)))
+                       export APP_ICON := $(TOPDIR)/icon.png
+               endif
+       endif
+else
+       export APP_ICON := $(TOPDIR)/$(ICON)
+endif
+
+ifeq ($(strip $(NO_SMDH)),)
+       export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+$(BUILD):
+       @[ -d $@ ] || mkdir -p $@
+       @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
+clean:
+       @echo clean ...
+       @rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf
+
+
+#---------------------------------------------------------------------------------
+else
+
+DEPENDS        :=      $(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(NO_SMDH)),)
+$(OUTPUT).3dsx :       $(OUTPUT).elf $(OUTPUT).smdh
+else
+$(OUTPUT).3dsx :       $(OUTPUT).elf
+endif
+
+$(OUTPUT).elf  :       $(OFILES)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o        :       %.bin
+#---------------------------------------------------------------------------------
+       @echo $(notdir $<)
+       @$(bin2o)
+
+# WARNING: This is not the right way to do this! TODO: Do it right!
+#---------------------------------------------------------------------------------
+%.vsh.o        :       %.vsh
+#---------------------------------------------------------------------------------
+       @echo $(notdir $<)
+       @python $(AEMSTRO)/aemstro_as.py $< ../$(notdir $<).shbin
+       @bin2s ../$(notdir $<).shbin | $(PREFIX)as -o $@
+       @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h
+       @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h
+       @echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h
+       @rm ../$(notdir $<).shbin
+
+-include $(DEPENDS)
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------

diff --git a/examples/qtm/README.md b/examples/qtm/README.md
new file mode 100644 (file)
index 0000000..2ad4cc6
--- /dev/null
+++ b/examples/qtm/README.md
@@ -0,0 +1,6 @@
+# qtm
+
+This is an example for using New3DS QTM for head-tracking.
+
+This is currently not usable from the homebrew launcher.
+

diff --git a/examples/qtm/source/main.c b/examples/qtm/source/main.c
new file mode 100644 (file)
index 0000000..5464a42
--- /dev/null
+++ b/examples/qtm/source/main.c
@@ -0,0 +1,92 @@
+#include <string.h>
+#include <stdio.h>
+#include <3ds.h>
+
+int main()
+{
+       u32 pos;
+       u32 x, y;
+       Result ret;
+       bool qtm_usable;
+       qtmHeadtrackingInfo qtminfo;
+       u32 colors[4] = {0x0000FF, 0x00FF00, 0xFF0000, 0xFFFFFF};
+
+       // Initialize services
+       srvInit();
+       aptInit();
+       hidInit(NULL);
+       gfxInit();
+       //gfxSet3D(true); // uncomment if using stereoscopic 3D
+
+       qtmInit();
+
+       consoleInit(GFX_BOTTOM, NULL);
+
+       printf("qtm example\n");
+
+       qtm_usable = qtmCheckInitialized();
+       if(!qtm_usable)printf("QTM is not usable, therefore this example won't do anything with QTM.\n");
+
+       // Main loop
+       while (aptMainLoop())
+       {
+               gspWaitForVBlank();
+               hidScanInput();
+
+               u32 kDown = hidKeysDown();
+               if (kDown & KEY_START)
+                       break; // break in order to return to hbmenu
+
+               if(qtm_usable)
+               {
+                       u8* fb = gfxGetFramebuffer(GFX_TOP, GFX_LEFT, NULL, NULL);
+                       memset(fb, 0, 400*240*3);
+
+                       ret = qtmGetHeadtrackingInfo(0, &qtminfo);
+                       if(ret==0)
+                       {
+                               consoleClear();
+
+                               for(pos=0; pos<5; pos++)
+                               {
+                                       printf("flags[%x]=0x%x", (unsigned int)pos, qtminfo.flags[pos]);
+                                       if(pos<4)printf(", ");
+                               }
+
+                               printf("\nfloatdata_x08: %f\n", qtminfo.floatdata_x08);
+
+                               printf("coords0: ");
+                               for(pos=0; pos<4; pos++)
+                               {
+                                       printf("[%x].x=%f, y=%f", (unsigned int)pos, qtminfo.coords0[pos].x, qtminfo.coords0[pos].y);
+                                       if(pos<3)printf(", ");
+                               }
+
+                               printf("\n");
+
+                               if(qtmCheckHeadFullyDetected(&qtminfo))
+                               {
+                                       for(pos=0; pos<4; pos++)
+                                       {
+                                               ret = qtmConvertCoordToScreen(&qtminfo.coords0[pos], NULL, NULL, &x, &y);
+
+                                               if(ret==0)memcpy(&fb[(x*240 + y) * 3], &colors[pos], 3);
+                                       }
+                               }
+                       }
+               }
+
+               // Flush and swap framebuffers
+               gfxFlushBuffers();
+               gfxSwapBuffers();
+       }
+
+       // Exit services
+       qtmExit();
+       gfxExit();
+       hidExit();
+       aptExit();
+       srvExit();
+       return 0;
+}
+

diff --git a/libctru/include/3ds.h b/libctru/include/3ds.h
index 73734069b5395b247f0a1cb7b281777c8ae1a765..3366a846c1e019061180366b8f238dff5b7a19cc 100644 (file)
--- a/libctru/include/3ds.h
+++ b/libctru/include/3ds.h
@@ -29,6 +29,7 @@ extern "C" {
 #include <3ds/services/soc.h>
 #include <3ds/services/mic.h>
 #include <3ds/services/mvd.h>
+#include <3ds/services/qtm.h>
 
 #include <3ds/gpu/gx.h>
 #include <3ds/gpu/gpu.h>

diff --git a/libctru/include/3ds/services/qtm.h b/libctru/include/3ds/services/qtm.h
new file mode 100644 (file)
index 0000000..931195e
--- /dev/null
+++ b/libctru/include/3ds/services/qtm.h
@@ -0,0 +1,25 @@
+#pragma once
+
+//See also: http://3dbrew.org/wiki/QTM_Services
+
+typedef struct {
+       float x;
+       float y;
+} qtmHeadtrackingInfoCoord;
+
+typedef struct {
+       u8 flags[5];
+       u8 padding[3];
+       float floatdata_x08;//"not used by System_Settings."
+       qtmHeadtrackingInfoCoord coords0[4];
+       u32 unk_x2c[5];//"Not used by System_Settings."
+} qtmHeadtrackingInfo;
+
+Result qtmInit();
+void qtmExit();
+bool qtmCheckInitialized();
+
+Result qtmGetHeadtrackingInfo(u64 val, qtmHeadtrackingInfo *out);//val is normally 0.
+bool qtmCheckHeadFullyDetected(qtmHeadtrackingInfo *info);
+Result qtmConvertCoordToScreen(qtmHeadtrackingInfoCoord *coord, float *screen_width, float *screen_height, u32 *x, u32 *y);//screen_* can be NULL to use the default values for the top-screen.
+

diff --git a/libctru/source/services/qtm.c b/libctru/source/services/qtm.c
new file mode 100644 (file)
index 0000000..95a78e1
--- /dev/null
+++ b/libctru/source/services/qtm.c
@@ -0,0 +1,87 @@
+/*
+  qtm.c - New3DS head-tracking
+*/
+#include <stdlib.h>
+#include <string.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/services/qtm.h>
+
+Handle qtmHandle;
+
+static bool qtmInitialized = false;
+
+Result qtmInit()
+{
+       Result ret=0;
+
+       if(qtmInitialized)return 0;
+
+       if((ret=srvGetServiceHandle(&qtmHandle, "qtm:u")))return ret;
+
+       qtmInitialized = true;
+
+       return 0;
+}
+
+void qtmExit()
+{
+       if(!qtmInitialized)return;
+
+       svcCloseHandle(qtmHandle);
+       qtmInitialized = false;
+}
+
+bool qtmCheckInitialized()
+{
+       return qtmInitialized;
+}
+
+Result qtmGetHeadtrackingInfo(u64 val, qtmHeadtrackingInfo *out)
+{
+       u32* cmdbuf=getThreadCommandBuffer();
+
+       if(!qtmInitialized)return -1;
+
+       cmdbuf[0]=0x00020080; //request header code
+       memcpy(&cmdbuf[1], &val, 8);
+
+       Result ret=0;
+       if((ret=svcSendSyncRequest(qtmHandle)))return ret;
+
+       ret = (Result)cmdbuf[1];
+       if(ret!=0)return ret;
+
+       if(out)memcpy(out, &cmdbuf[2], sizeof(qtmHeadtrackingInfo));
+
+       return 0;
+}
+
+bool qtmCheckHeadFullyDetected(qtmHeadtrackingInfo *info)
+{
+       if(info==NULL)return false;
+
+       if(info->flags[0] && info->flags[1] && info->flags[2])return true;
+       return false;
+}
+
+Result qtmConvertCoordToScreen(qtmHeadtrackingInfoCoord *coord, float *screen_width, float *screen_height, u32 *x, u32 *y)
+{
+       float width = 200.0f;
+       float height = 160.0f;
+
+       if(coord==NULL || x==NULL || y==NULL)return -1;
+
+       if(screen_width)width = (*screen_width) / 2;
+       if(screen_height)height = (*screen_height) / 2;
+
+       if(coord->x > 1.0f || coord->x < -1.0f)return -2;
+       if(coord->y > 1.0f || coord->y < -1.0f)return -2;
+
+       *x = (u32)((coord->x * width) + width);
+       *y = (u32)((coord->y * height) + height);
+
+       return 0;
+}
+