Skip to content

Commit

Permalink
switch freetype dep
Browse files Browse the repository at this point in the history
  • Loading branch information
structuresound committed Aug 31, 2015
1 parent 82ec007 commit 9ba398d
Show file tree
Hide file tree
Showing 495 changed files with 1,187 additions and 188,639 deletions.
125 changes: 62 additions & 63 deletions NodeKittenX.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,67 +27,68 @@ s.subspec "freetypegl" do |freetypegl|
freetypegl.source_files = "deps/leif/freetype-gl/*.{h,c,cpp}"

freetypegl.subspec "freetype" do |freetype|
freetype.osx.source_files = "deps/miguel/freetype/src/base/*.{h,c}"
freetype.ios.source_files = "deps/miguel/freetype/src/base/ftadvanc.c",
"deps/miguel/freetype/src/base/ftadvanc.c",
"deps/miguel/freetype/src/base/ftbbox.c",
"deps/miguel/freetype/src/base/ftbitmap.c",
"deps/miguel/freetype/src/base/ftcalc.c",
"deps/miguel/freetype/src/base/ftcid.c",
"deps/miguel/freetype/src/base/ftdbgmem.c",
"deps/miguel/freetype/src/base/ftfstype.c",
"deps/miguel/freetype/src/base/ftgasp.c",
"deps/miguel/freetype/src/base/ftgloadr.c",
"deps/miguel/freetype/src/base/ftglyph.c",
"deps/miguel/freetype/src/base/ftgxval.c",
"deps/miguel/freetype/src/base/ftinit.c",
"deps/miguel/freetype/src/base/ftlcdfil.c",
"deps/miguel/freetype/src/base/ftmm.c",
"deps/miguel/freetype/src/base/ftobjs.c",
"deps/miguel/freetype/src/base/ftotval.c",
"deps/miguel/freetype/src/base/ftoutln.c",
"deps/miguel/freetype/src/base/ftpatent.c",
"deps/miguel/freetype/src/base/ftpfr.c",
"deps/miguel/freetype/src/base/ftrfork.c",
"deps/miguel/freetype/src/base/ftsnames.c",
"deps/miguel/freetype/src/base/ftstream.c",
"deps/miguel/freetype/src/base/ftstroke.c",
"deps/miguel/freetype/src/base/ftsynth.c",
"deps/miguel/freetype/src/base/ftsystem.c",
"deps/miguel/freetype/src/base/fttrigon.c",
"deps/miguel/freetype/src/base/fttype1.c",
"deps/miguel/freetype/src/base/ftutil.c",
"deps/miguel/freetype/src/base/ftwinfnt.c",
"deps/miguel/freetype/src/base/ftxf86.c"
freetype.source_files = "deps/leif/freetype/src/base/ftadvanc.c",
"deps/leif/freetype/src/base/ftadvanc.c",
"deps/leif/freetype/src/base/ftbbox.c",
"deps/leif/freetype/src/base/ftbitmap.c",
"deps/leif/freetype/src/base/ftcalc.c",
"deps/leif/freetype/src/base/ftcid.c",
"deps/leif/freetype/src/base/ftdbgmem.c",
"deps/leif/freetype/src/base/ftfstype.c",
"deps/leif/freetype/src/base/ftgasp.c",
"deps/leif/freetype/src/base/ftgloadr.c",
"deps/leif/freetype/src/base/ftglyph.c",
"deps/leif/freetype/src/base/ftgxval.c",
"deps/leif/freetype/src/base/ftinit.c",
"deps/leif/freetype/src/base/ftlcdfil.c",
"deps/leif/freetype/src/base/ftmm.c",
"deps/leif/freetype/src/base/ftobjs.c",
"deps/leif/freetype/src/base/ftotval.c",
"deps/leif/freetype/src/base/ftoutln.c",
"deps/leif/freetype/src/base/ftpatent.c",
"deps/leif/freetype/src/base/ftpfr.c",
"deps/leif/freetype/src/base/ftrfork.c",
"deps/leif/freetype/src/base/ftsnames.c",
"deps/leif/freetype/src/base/ftstream.c",
"deps/leif/freetype/src/base/ftstroke.c",
"deps/leif/freetype/src/base/ftsynth.c",
"deps/leif/freetype/src/base/ftsystem.c",
"deps/leif/freetype/src/base/fttrigon.c",
"deps/leif/freetype/src/base/fttype1.c",
"deps/leif/freetype/src/base/ftutil.c",
"deps/leif/freetype/src/base/ftwinfnt.c",
"deps/leif/freetype/src/base/ftxf86.c",

"deps/leif/freetype/include/*.h",
"deps/leif/freetype/src/truetype/*.h",
"deps/leif/freetype/src/sfnt/*.h",
"deps/leif/freetype/src/autofit/*.h",
"deps/leif/freetype/src/smooth/*.h",
"deps/leif/freetype/src/raster/*.h",
"deps/leif/freetype/src/psaux/*.h",
"deps/leif/freetype/src/psnames/*.h",
"deps/leif/freetype/src/autofit/autofit.{h,c}",
"deps/leif/freetype/src/bdf/bdf.{h,c}",
"deps/leif/freetype/src/cff/cff.{h,c}",
"deps/leif/freetype/src/cid/type1cid.{h,c}",
"deps/leif/freetype/src/gzip/ftgzip.{h,c}",
"deps/leif/freetype/src/lzw/ftlzw.{h,c}",
"deps/leif/freetype/src/pcf/pcf.{h,c}",
"deps/leif/freetype/src/pfr/pfr.{h,c}",
"deps/leif/freetype/src/psaux/psaux.{h,c}",
"deps/leif/freetype/src/pshinter/pshinter.{h,c}",
"deps/leif/freetype/src/psnames/psmodule.{h,c}",
"deps/leif/freetype/src/raster/raster.{h,c}",
"deps/leif/freetype/src/sfnt/sfnt.{h,c}",
"deps/leif/freetype/src/smooth/smooth.{h,c}",
"deps/leif/freetype/src/truetype/truetype.{h,c}",
"deps/leif/freetype/src/type1/type1.{h,c}",
"deps/leif/freetype/src/type42/type42.{h,c}",
"deps/leif/freetype/src/winfonts/winfnt.{h,c}"

freetype.source_files = "deps/miguel/freetype/include/**/*.h",
"deps/miguel/freetype/src/truetype/*.h",
"deps/miguel/freetype/src/sfnt/*.h",
"deps/miguel/freetype/src/autofit/*.h",
"deps/miguel/freetype/src/smooth/*.h",
"deps/miguel/freetype/src/raster/*.h",
"deps/miguel/freetype/src/psaux/*.h",
"deps/miguel/freetype/src/psnames/*.h",
"deps/miguel/freetype/src/autofit/autofit.{h,c}",
"deps/miguel/freetype/src/bdf/bdf.{h,c}",
"deps/miguel/freetype/src/cff/cff.{h,c}",
"deps/miguel/freetype/src/cid/type1cid.{h,c}",
"deps/miguel/freetype/src/gzip/ftgzip.{h,c}",
"deps/miguel/freetype/src/lzw/ftlzw.{h,c}",
"deps/miguel/freetype/src/pcf/pcf.{h,c}",
"deps/miguel/freetype/src/pfr/pfr.{h,c}",
"deps/miguel/freetype/src/psaux/psaux.{h,c}",
"deps/miguel/freetype/src/pshinter/pshinter.{h,c}",
"deps/miguel/freetype/src/psnames/psmodule.{h,c}",
"deps/miguel/freetype/src/raster/raster.{h,c}",
"deps/miguel/freetype/src/sfnt/sfnt.{h,c}",
"deps/miguel/freetype/src/smooth/smooth.{h,c}",
"deps/miguel/freetype/src/truetype/truetype.{h,c}",
"deps/miguel/freetype/src/type1/type1.{h,c}",
"deps/miguel/freetype/src/type42/type42.{h,c}",
"deps/miguel/freetype/src/winfonts/winfnt.{h,c}"
freetype.compiler_flags = '-DFT2_BUILD_LIBRARY=1 -DDARWIN_NO_CARBON -DFT_CONFIG_OPTION_SYSTEM_ZLIB=1'
freetype.xcconfig = { "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/deps/miguel/freetype/include" }
freetype.xcconfig = { "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/deps/leif/freetype/include" }
freetype.libraries = "z"
end
end

Expand All @@ -108,15 +109,13 @@ end

s.subspec "png" do |png|
png.source_files = "deps/leif/png/*.{h,c}"
png.subspec "zlib" do |zlib|
zlib.source_files = "deps/leif/zlib/*.{h,c}"
end
png.libraries = "z"
end

s.ios.frameworks = "UIKit", "OpenGLES"
s.osx.frameworks = "AppKit", "OpenGL"

s.resources = "blocks/leif/NodeKittenX/Examples/Assets/*.{png,jpg}",
s.resources = "blocks/leif/NodeKittenX/Examples/Assets/*.{png,jpg,ttf}",
"deps/leif/freetype-gl/fonts/*.ttf",
"deps/leif/freetype-gl/shaders/*.{vert,frag}"

Expand Down
3 changes: 2 additions & 1 deletion blocks/leif/NodeKittenX/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,9 @@ message(STATUS "Copying data files to build and bin dirs ")

file(GLOB PNG RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Examples/Assets/*.png *.jpg)
file(GLOB JPEG RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Examples/Assets/*.jpg)
file(GLOB FONTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Examples/Assets/*.ttf)

set(Assets ${PNG} ${JPEG})
set(Assets ${PNG} ${JPEG} ${FONTS})

if (APPLE)
foreach(file ${Assets})
Expand Down
6 changes: 3 additions & 3 deletions blocks/leif/NodeKittenX/Examples/DrawingExample.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ void DrawingExample::handleUXEvent(shared_ptr<UXEvent> event){
canvas->removeAllChildren();
cache->removeAllChildren();
}
else if (event->phase == UXEventPhaseBegin){
else if (event->phase() == UXEventPhaseBegin){
addControlPointWithUXEvent(event);
}
else if (event->phase == UXEventPhaseDrag){
else if (event->phase() == UXEventPhaseDrag){
addControlPointWithUXEvent(event);
smoothLastPointForLayer(event->referenceNode->child());
}
else if (event->phase == UXEventPhaseEnd){
else if (event->phase() == UXEventPhaseEnd){
addControlPointWithUXEvent(event);
smoothPointsForLayer((event->referenceNode)->child());
addToCache(event->referenceNode);
Expand Down
9 changes: 4 additions & 5 deletions blocks/leif/NodeKittenX/Generic/Drawable.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#ifndef __Drawable__
#define __Drawable__
#pragma once

#include "GLState.h"

template <class Derived, class ColorType>
class Drawable {
Expand Down Expand Up @@ -73,6 +74,4 @@ class Drawable {
private:
Derived& self() { return *static_cast<Derived*>(this); }
const Derived& self() const { return *static_cast<const Derived*>(this); }
};

#endif
};
14 changes: 2 additions & 12 deletions blocks/leif/NodeKittenX/Generic/Generic.h
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
#ifndef __Generic__
#define __Generic__
#pragma once

#include "Reactive.h"
#include "Transformable.h"
#include "Drawable.h"
#include "Nodal.h"
#include "Layout.h"

namespace _n {
template <typename P, typename C>
void addUniquePtr(P& parent, C& child) {
parent->addChild(unique_ptr_cast<P>(child));
}
}

template <class T>
class CountedClass
{
Expand All @@ -33,6 +25,4 @@ template<typename T>
unsigned int CountedClass<T>::createdObjects = 0;

template<typename T>
unsigned int CountedClass<T>::destroyedObjects = 0;

#endif /* defined(__Generic__) */
unsigned int CountedClass<T>::destroyedObjects = 0;
7 changes: 2 additions & 5 deletions blocks/leif/NodeKittenX/Generic/Layout.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef __Layout__
#define __Layout__
#pragma once

#include "Reactive.h"
#include "kiwi.h"
Expand Down Expand Up @@ -204,6 +203,4 @@ namespace Layout {

};

}

#endif
}
7 changes: 2 additions & 5 deletions blocks/leif/NodeKittenX/Generic/Nodal.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef __Nodal__
#define __Nodal__
#pragma once

template <class T>
class Nodal {
Expand Down Expand Up @@ -173,6 +172,4 @@ class Nodal {
return this;
}

};

#endif /* defined(__Nodal__) */
};
Loading

0 comments on commit 9ba398d

Please sign in to comment.