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: aestesis/flutter.alib.tess
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.1
Choose a base ref
...
head repository: aestesis/flutter.alib.tess
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Oct 5, 2023

  1. in progress

    renanyoy committed Oct 5, 2023
    Copy the full SHA
    bb3a472 View commit details

Commits on Oct 6, 2023

  1. podspec

    renanyoy committed Oct 6, 2023
    Copy the full SHA
    96e8099 View commit details

Commits on Oct 7, 2023

  1. v1.0.4

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    c9d3af0 View commit details
  2. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    4b6f8fc View commit details
  3. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    26f434f View commit details
  4. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    83491a3 View commit details
  5. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    d03ace9 View commit details
  6. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    a6d214f View commit details
  7. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    786f0d9 View commit details
  8. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    597ec71 View commit details
  9. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    c6e01a0 View commit details
  10. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    b0cf4ef View commit details
  11. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    6834c53 View commit details
  12. plop

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    614363a View commit details
  13. prototypes ok

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    48f11f1 View commit details
  14. rename

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    03bd149 View commit details
  15. rename

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    397f29a View commit details
  16. version 1.0.16

    renanyoy committed Oct 7, 2023
    Copy the full SHA
    9baf0da View commit details

Commits on Oct 8, 2023

  1. better

    renanyoy committed Oct 8, 2023
    Copy the full SHA
    bf00349 View commit details
  2. podspec

    renanyoy committed Oct 8, 2023
    Copy the full SHA
    380ef96 View commit details

Commits on Feb 9, 2024

  1. Copy the full SHA
    8ca50ff View commit details
  2. v1.0.20

    renanyoy committed Feb 9, 2024
    Copy the full SHA
    d6c5088 View commit details
  3. plop

    renanyoy committed Feb 9, 2024
    Copy the full SHA
    dc4534b View commit details
  4. v 1.0.22

    renanyoy committed Feb 9, 2024
    Copy the full SHA
    ee634b9 View commit details
  5. 1.0.23

    renanyoy committed Feb 9, 2024
    Copy the full SHA
    9d4621f View commit details
  6. plop

    renanyoy committed Feb 9, 2024
    Copy the full SHA
    2f47024 View commit details
42 changes: 42 additions & 0 deletions AestesisTess.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

# https://stackoverflow.com/questions/31445691/making-a-cocoapod-from-an-existing-xcode-project
# https://github.com/CocoaPods/Xcodeproj


require 'xcodeproj'

project = Xcodeproj::Project.open('LibTess.xcodeproj')
targetIOS = project.targets.select { |target| target.name == 'tessIOS' }.first
targetOSX = project.targets.select { |target| target.name == 'tessOSX' }.first

def self.relative_file_paths(build_phase)
folder_path_length = __dir__.length + 1 # add '/' to the end
paths = build_phase.files_references.map{ |f| f.real_path.to_s[folder_path_length..-1] }
puts build_phase, paths
return paths
end

Pod::Spec.new do |s|
s.name = "AestesisTess"
s.version = "1.0.24"
s.summary = "libtess cocoa pod"
s.description = <<-DESC
libtess cocoa pod framework
DESC
s.homepage = "https://github.com/aestesis/flutter.alib.tess"
s.license = "MIT"
s.author = { "aestesis" => "renan@aestesis.org" }
s.source = { :git => "https://github.com/aestesis/flutter.alib.tess.git", :tag => "v" + s.version.to_s }

s.osx.deployment_target = "12.0"
s.ios.deployment_target = "12.0"
s.requires_arc = true

headers = ['glu/include/GL/glext.h', 'glu/src/libtess.exclude/priorityq-heap.c.h']
headersIOS = (self.relative_file_paths targetIOS.headers_build_phase)
headersOSX = (self.relative_file_paths targetOSX.headers_build_phase)
s.ios.source_files = (self.relative_file_paths targetIOS.source_build_phase) + headersIOS + headers
s.osx.source_files = (self.relative_file_paths targetOSX.source_build_phase) + headersOSX + headers
s.public_header_files = ['shared/export.h']
s.swift_version = '5.0'
end
18 changes: 14 additions & 4 deletions LibTess.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -88,6 +88,12 @@
063C12DD1CAE965900393021 /* export.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D91CAE965400393021 /* export.h */; settings = {ATTRIBUTES = (Public, ); }; };
063C12DE1CAE965A00393021 /* export.c in Sources */ = {isa = PBXBuildFile; fileRef = 063C12D81CAE965400393021 /* export.c */; };
063C12DF1CAE965A00393021 /* export.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D91CAE965400393021 /* export.h */; settings = {ATTRIBUTES = (Public, ); }; };
066A1BDA2AD23616009AF72D /* gluos.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D61CAE963500393021 /* gluos.h */; };
066A1BDB2AD2363D009AF72D /* glu.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D31CAE962700393021 /* glu.h */; };
066A1BDC2AD23641009AF72D /* gl.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D21CAE962700393021 /* gl.h */; };
066A1BDD2AD23661009AF72D /* gluos.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D61CAE963500393021 /* gluos.h */; };
066A1BDE2AD23665009AF72D /* gl.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D21CAE962700393021 /* gl.h */; };
066A1BDF2AD23668009AF72D /* glu.h in Headers */ = {isa = PBXBuildFile; fileRef = 063C12D31CAE962700393021 /* glu.h */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
@@ -111,7 +117,6 @@
063C127C1CAE960400393021 /* mesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mesh.h; path = glu/src/libtess/mesh.h; sourceTree = "<group>"; };
063C127D1CAE960400393021 /* normal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = normal.c; path = glu/src/libtess/normal.c; sourceTree = "<group>"; };
063C127E1CAE960400393021 /* normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = normal.h; path = glu/src/libtess/normal.h; sourceTree = "<group>"; };
063C127F1CAE960400393021 /* priorityq-heap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "priorityq-heap.c"; path = "glu/src/libtess/priorityq-heap.c"; sourceTree = "<group>"; };
063C12801CAE960400393021 /* priorityq-heap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "priorityq-heap.h"; path = "glu/src/libtess/priorityq-heap.h"; sourceTree = "<group>"; };
063C12811CAE960400393021 /* priorityq-sort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "priorityq-sort.h"; path = "glu/src/libtess/priorityq-sort.h"; sourceTree = "<group>"; };
063C12821CAE960400393021 /* priorityq.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = priorityq.c; path = glu/src/libtess/priorityq.c; sourceTree = "<group>"; };
@@ -229,7 +234,6 @@
063C127C1CAE960400393021 /* mesh.h */,
063C127D1CAE960400393021 /* normal.c */,
063C127E1CAE960400393021 /* normal.h */,
063C127F1CAE960400393021 /* priorityq-heap.c */,
063C12801CAE960400393021 /* priorityq-heap.h */,
063C12811CAE960400393021 /* priorityq-sort.h */,
063C12821CAE960400393021 /* priorityq.c */,
@@ -288,13 +292,16 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
066A1BDE2AD23665009AF72D /* gl.h in Headers */,
063C12C31CAE961200393021 /* tess.h in Headers */,
063C12AE1CAE960D00393021 /* normal.h in Headers */,
066A1BDF2AD23668009AF72D /* glu.h in Headers */,
063C12AA1CAE960D00393021 /* memalloc.h in Headers */,
063C12A81CAE960D00393021 /* geom.h in Headers */,
063C12A41CAE960D00393021 /* dict-list.h in Headers */,
063C12BA1CAE961200393021 /* priorityq-heap.h in Headers */,
063C12C51CAE961200393021 /* tessmono.h in Headers */,
066A1BDD2AD23661009AF72D /* gluos.h in Headers */,
063C12DD1CAE965900393021 /* export.h in Headers */,
063C12BF1CAE961200393021 /* render.h in Headers */,
063C12BB1CAE961200393021 /* priorityq-sort.h in Headers */,
@@ -313,10 +320,13 @@
063C12CF1CAE961300393021 /* tess.h in Headers */,
063C12B91CAE960E00393021 /* normal.h in Headers */,
063C12B51CAE960E00393021 /* memalloc.h in Headers */,
066A1BDC2AD23641009AF72D /* gl.h in Headers */,
063C12B31CAE960E00393021 /* geom.h in Headers */,
063C12AF1CAE960E00393021 /* dict-list.h in Headers */,
063C12C61CAE961300393021 /* priorityq-heap.h in Headers */,
066A1BDB2AD2363D009AF72D /* glu.h in Headers */,
063C12D11CAE961300393021 /* tessmono.h in Headers */,
066A1BDA2AD23616009AF72D /* gluos.h in Headers */,
063C12DF1CAE965A00393021 /* export.h in Headers */,
063C12CB1CAE961300393021 /* render.h in Headers */,
063C12C71CAE961300393021 /* priorityq-sort.h in Headers */,
@@ -856,7 +866,7 @@
INFOPLIST_FILE = tessOSX/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = net.aestesis.tessOSX;
@@ -911,7 +921,7 @@
INFOPLIST_FILE = tessOSX/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = net.aestesis.tessOSX;
25 changes: 0 additions & 25 deletions flutter.alib.tess.podspec

This file was deleted.

Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@

#include <stddef.h>
#include <assert.h>
#include "priorityq-heap.h"
#include "../libtess/priorityq-heap.h"
#include "memalloc.h"
#include <limits.h>

6 changes: 4 additions & 2 deletions glu/src/libtess/mesh.c
Original file line number Diff line number Diff line change
@@ -45,16 +45,17 @@
#define FALSE 0
#endif

static GLUvertex *allocVertex()
static GLUvertex *allocVertex(void)
{
return (GLUvertex *)memAlloc( sizeof( GLUvertex ));
}

static GLUface *allocFace()
static GLUface *allocFace(void)
{
return (GLUface *)memAlloc( sizeof( GLUface ));
}


/************************ Utility Routines ************************/

/* Allocate and free half-edges in pairs for efficiency.
@@ -796,3 +797,4 @@ void __gl_meshCheckMesh( GLUmesh *mesh )
}

#endif

2 changes: 1 addition & 1 deletion glu/src/libtess/priorityq.c
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@

/* Include all the code for the regular heap-based queue here. */

#include "priorityq-heap.c"
#include "../libtess.exclude/priorityq-heap.c.h"

/* Now redefine all the function names to map to their "Sort" versions. */

5 changes: 3 additions & 2 deletions shared/export.h
Original file line number Diff line number Diff line change
@@ -17,10 +17,11 @@ typedef void (TessDraw)(void*);
typedef void (TessEnd)(void);

typedef struct {
double x;
double x; // SIMD3 aligned/packed as SIMD4
double y;
double z;
double u;
double w;
double u; // SIMD2 aligned/packed as SIMD2
double v;
} TessVertex;