Skip to content

STL ascii import support #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2729f96
A preliminary stl loader. Does not yet read the number of facets on t…
eliasbakken Nov 10, 2014
c755ce3
Trying to figure out shaders.
eliasbakken Nov 11, 2014
32f8319
fixed the data shit
eliasbakken Nov 12, 2014
dca8b19
A crude implementation of an -STL loader
eliasbakken Nov 13, 2014
eceb8b6
Applied the patch from Robert
eliasbakken Nov 13, 2014
320df34
Set backface culling
eliasbakken Nov 20, 2014
28b8ac6
Added the depth function
eliasbakken Nov 26, 2014
0e0ade7
Added support for binary STL files.
eliasbakken Jul 14, 2015
4dae4d4
Added the debian folder to git
eliasbakken Jul 14, 2015
fe0cf8b
I think I've fixed the unix/Windows bug
eliasbakken Jul 15, 2015
daeec43
Hopefully a fix for the unloaded normals
eliasbakken Jul 15, 2015
8a1d422
Added support for binary STLs that also start with 'solid'
eliasbakken Dec 30, 2015
6284ada
Open STL files regardless of upper lower case
eliasbakken Dec 31, 2015
72b9966
pushing before an upstream fetch
eliasbakken Mar 25, 2016
5ff409e
Merge remote-tracking branch 'upstream/master'
eliasbakken Mar 25, 2016
168df2c
gid is deprecated, using pointer to object instead
eliasbakken Mar 26, 2016
589e795
Fixed missing surface normals in STL importer and moved to snippets i…
eliasbakken Aug 31, 2016
33f5d10
Updated debian files
eliasbakken Aug 31, 2016
2736c30
Updating to 0.3
eliasbakken Sep 1, 2016
6fb5331
Bumped to 0.3 and added function for getting z min and max
eliasbakken Sep 7, 2016
291e5c9
Wrong return value from z_min
eliasbakken Sep 8, 2016
22b452e
Removed Toggle lib and moved the functions into Mash. The helper func…
eliasbakken Sep 9, 2016
a49206f
Added Depth testing to the models
eliasbakken Sep 9, 2016
52ef5a7
fixed scanner library search path
eliasbakken Jan 12, 2018
b6de8cb
Needs abs path
eliasbakken Jan 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@
*.la
*.lo
*.o
*~
116 changes: 92 additions & 24 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
Installation Instructions
*************************

Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
Inc.

This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved. This file is offered as-is,
without warranty of any kind.

Basic Installation
==================

Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
Briefly, the shell command `./configure && make && make install'
should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.

The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
Expand Down Expand Up @@ -42,7 +48,7 @@ may remove or edit it.
you want to change it or regenerate `configure' using a newer version
of `autoconf'.

The simplest way to compile this package is:
The simplest way to compile this package is:

1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
Expand All @@ -53,12 +59,22 @@ The simplest way to compile this package is:
2. Type `make' to compile the package.

3. Optionally, type `make check' to run any self-tests that come with
the package.
the package, generally using the just-built uninstalled binaries.

4. Type `make install' to install the programs and any data files and
documentation.

5. You can remove the program binaries and object files from the
documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
user, and only the `make install' phase executed with root
privileges.

5. Optionally, type `make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
regular user, particularly if the prior `make install' required
root privileges, verifies that the installation completed
correctly.

6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
Expand All @@ -67,8 +83,15 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.

6. Often, you can also type `make uninstall' to remove the installed
files again.
7. Often, you can also type `make uninstall' to remove the installed
files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.

8. Some packages, particularly those that use Automake, provide `make
distcheck', which can by used by developers to test that all other
targets like `make install' and `make uninstall' work correctly.
This target is generally not run by end users.

Compilers and Options
=====================
Expand All @@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
source code in the directory that `configure' is in and in `..'. This
is known as a "VPATH" build.

With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
Expand All @@ -120,7 +144,8 @@ Installation Names
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
`configure' the option `--prefix=PREFIX', where PREFIX must be an
absolute file name.

You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
Expand All @@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
you can set and what kinds of files go in them. In general, the
default for these options is expressed in terms of `${prefix}', so that
specifying just `--prefix' will affect all of the other directory
specifications that were not explicitly provided.

The most portable way to affect installation locations is to pass the
correct locations to `configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
`make install' command line to change installation locations without
having to reconfigure or recompile.

The first method involves providing an override variable for each
affected directory. For example, `make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
`${prefix}'. Any directories that were specified during `configure',
but not in terms of `${prefix}', must each be overridden at install
time for the entire installation to be relocated. The approach of
makefile variable overrides for each directory variable is required by
the GNU Coding Standards, and ideally causes no recompilation.
However, some platforms have known limitations with the semantics of
shared libraries that end up requiring recompilation when using this
method, particularly noticeable in packages that use GNU Libtool.

The second method involves providing the `DESTDIR' variable. For
example, `make install DESTDIR=/alternate/directory' will prepend
`/alternate/directory' before all installation names. The approach of
`DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
when some directory options were not specified in terms of `${prefix}'
at `configure' time.

Optional Features
=================

If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.

Optional Features
=================

Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
Expand All @@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.

Some packages offer the ability to configure how verbose the
execution of `make' will be. For these packages, running `./configure
--enable-silent-rules' sets the default to minimal output, which can be
overridden with `make V=1'; while running `./configure
--disable-silent-rules' sets the default to verbose, which can be
overridden with `make V=0'.

Particular systems
==================

Expand All @@ -163,6 +226,11 @@ order to use an ANSI C compiler:

and if that doesn't work, install pre-built binaries of GCC for HP-UX.

HP-UX `make' updates targets which have the same time stamps as
their prerequisites, which makes it generally unusable when shipped
generated files such as `configure' are involved. Use GNU `make'
instead.

On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
Expand Down Expand Up @@ -241,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).

Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
an Autoconf limitation. Until the limitation is lifted, you can use
this workaround:

CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash

`configure' Invocation
======================
Expand Down Expand Up @@ -288,7 +357,7 @@ operates.
`configure' can determine that directory automatically.

`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.

Expand All @@ -299,4 +368,3 @@ operates.

`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS = mash examples docs
SUBDIRS = mash docs

ACLOCAL_AMFLAGS = -I m4

Expand Down
10 changes: 10 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Note: During compiling, if you get the error
"libmash-0.2.la: file not recognized: File format not recognized"
search for --library in mash/Makefile and change it to
mash-0.2

To make a debian package:
dpkg-buildpackage -b -nc

./configure --prefix=/usr --libdir=/usr/lib/arm-linux-gnueabihf

Mash - README
===============================================================================

Expand Down
5 changes: 3 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dnl 1.0.0 release). The micro is odd numbered between releases. Only
dnl on the commit that contains a release should it be an even number.

m4_define([mash_major_version], [0])
m4_define([mash_minor_version], [2])
m4_define([mash_minor_version], [3])
m4_define([mash_micro_version], [1])
m4_define([mash_version],
[mash_major_version.mash_minor_version.mash_micro_version])
Expand Down Expand Up @@ -35,7 +35,7 @@ AC_CONFIG_SRCDIR([mash/mash.h])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])

AM_INIT_AUTOMAKE([1.9])
AM_INIT_AUTOMAKE([1.14])

m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

Expand Down Expand Up @@ -105,6 +105,7 @@ AC_CONFIG_FILES([
Makefile
mash/Makefile
mash/rply/Makefile
mash/rstl/Makefile
examples/Makefile
docs/Makefile
docs/reference/Makefile
Expand Down
12 changes: 12 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
mash (0.3.0-1) UNRELEASED; urgency=medium

* Added shader with progress

-- Elias Bakken <[email protected]> Wed, 31 Aug 2016 14:19:39 +0000


mash (0.2.0-1) UNRELEASED; urgency=medium

* Initial release for Replicape

-- Elias Bakken <[email protected]> Mon, 13 Apr 2015 14:19:39 +0000
1 change: 1 addition & 0 deletions debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
66 changes: 66 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
Source: mash
Section: libs
Priority: optional
Maintainer: Elias Bakken <[email protected]>
Build-Depends: autoconf,
automake,
autotools-dev,
cdbs (>= 0.4.93~),
debhelper (>= 9),
dh-autoreconf,
gir1.2-clutter-1.0,
gir1.2-json-1.0,
gobject-introspection (>= 0.10.0),
libclutter-1.0-dev,
libdbus-glib-1-dev,
libgirepository1.0-dev (>= 0.10.0),
libtool,
Standards-Version: 3.9.5
Homepage: http://www.clutter-project.org/

Package: libmash-0.3-0
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}
Multi-Arch: same
Description: Mash is a small library for using real 3D models within a Clutter
scene. Models can be exported from Blender or other 3D modelling
software as PLY files and then used as actors. It also supports a
lighting model with animatable lights.

Package: libmash-dev
Section: libdevel
Architecture: any
Depends: autotools-dev,
gir1.2-mash-0.3-0 (= ${binary:Version}),
libclutter-1.0-dev,
libmash-0.3-0 (= ${binary:Version}),
${misc:Depends}
Description: Mash is a small library for using real 3D models within a Clutter
scene. Models can be exported from Blender or other 3D modelling
software as PLY files and then used as actors. It also supports a
lighting model with animatable lights.
.
This package contains the development files.

Package: libmash-0.3-0-dbg
Architecture: any
Section: debug
Priority: extra
Depends: libmash-0.3-0 (=${binary:Version}), ${misc:Depends}
Multi-Arch: same
Description: Mash is a small library for using real 3D models within a Clutter
scene. Models can be exported from Blender or other 3D modelling
software as PLY files and then used as actors. It also supports a
lighting model with animatable lights.
.
This package contains the debug symbols

Package: gir1.2-mash-0.3-0
Architecture: any
Section: introspection
Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: GObject introspection data for the libmash library
This package can be used by other packages using the GIRepository format
to generate dynamic bindings for libmash.
5 changes: 5 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mash
Upstream-Contact: Emmanuele Bassi <[email protected]>
Thomas Wood <[email protected]>
Source: http://source.clutter-project.org/sources/mash
1 change: 1 addition & 0 deletions debian/gir1.2-mash-0.2-0.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/*/girepository-1.0/ usr/lib/
1 change: 1 addition & 0 deletions debian/gir1.2-mash-0.3-0.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/*/girepository-1.0/ usr/lib/
1 change: 1 addition & 0 deletions debian/libmash-0.2-0.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/arm-linux-gnueabihf/*.so.*
1 change: 1 addition & 0 deletions debian/libmash-0.3-0.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/arm-linux-gnueabihf/*.so.*
4 changes: 4 additions & 0 deletions debian/libmash-dev.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
usr/include/
usr/lib/arm-linux-gnueabihf/*.so
usr/lib/arm-linux-gnueabihf/pkgconfig/*.pc
usr/share/gir-1.0/
Loading