Skip to content

Commit

Permalink
Release version 1.0.0 [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis committed Feb 17, 2015
2 parents 22d2401 + 21339ee commit e1252a4
Show file tree
Hide file tree
Showing 30 changed files with 643 additions and 195 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
language: java
jdk: oraclejdk8

# Pre-install Maven dependencies
install: mvn dependency:go-offline
# Do something so that Gradle isn't run
install: echo "Gradle run suppressed, using Maven instead"

# Compile and test source
script: mvn clean -DbuildNumber=$TRAVIS_BUILD_NUMBER -DciSystem=travis -Dcommit=${TRAVIS_COMMIT:0:7}
script: mvn clean install -DbuildNumber=$TRAVIS_BUILD_NUMBER -DciSystem=travis -Dcommit=${TRAVIS_COMMIT:0:7}

# Fetch resources, run deployment goal/task, and generate Javadocs and reports
after_success:
Expand Down Expand Up @@ -45,4 +45,4 @@ env:
- secure: "VFecbQ+pXBMbLfEDZDmT4Hsh7BP5vxQPzL3uyjKpB6ZnUw1rAkjwyTLfXT/ONdu8683gDUgbf6DawQ2TkAQBGRQjEDZL2fKp2oXw8mX0t0WKpLjL6uqC8QuRwKLOk9rWuOTiuk8IU6gNTHeD+wFatnMxKrwIc54IY+deK/Wo0PE="
- secure: "RtHTH8NllkaVBFHpX8+54Vlao8FEuRCDuTkCyYq5EN+hOXTQ64lQhhQneE+L7XwFj8hP7VYEckLLZ/whkj6hXJVZw5EtYJ+WnB9OvoRa+hI48PTzCXeNd8dafNQhu32A2iIKyVdc0UmjsM/rchrLBDovdVpVzfzfnACoCNVYOlM="
- secure: "bKD7Z1RbmfTRQHZ05c75a/X05QFnS51ejhCp+mpk7t9NIlWgV3xE9xhlKWS3x+A6xv8xYIrsQctex0zYxuKwZNjtb9rfeF5Yuf3PADAlDjaUykupo27jAp4Vi2SrTouMSlOmlnkDZ8b+RHI4v8Cb/Q01p1manZMAeouBtcms0tg="
- secure: "Z43e9QaVLJN2v+of2K3p5NwYvn9TSG6bV4R7aLwJvMBIbDJ07LIdPGwWOJ1D2MxjhGOT/GVoyWO1ri/fO7uxAziIqes6xjoQALZOl3jlhU7VG1qEsoCtlEUZcX/CUgeKX9CK1Xg143AmrcOPLdYx7d2kXJOt/gMRToXsiUaY/x8="
- secure: "YpuIE54CJ0s3lcGn0eBUxiMy2OJWBBCk+s+q9cMGixVZEt262+Ek2y1aZ02cx7moedYwnFlmr8oZt6X4l1LKKPO7O+woL10OWtS2iZTZk49V1MO4getIn8NRjQ/NGqgr2FOobIU6ygrp5RND662slO+07CN+hxTExVHuedfvJ9E="
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Caustic [![License](http://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat)][License] [![Flattr this](http://img.shields.io/badge/flattr-donate-lightgrey.svg?style=flat)][Donate] [![Build Status](http://img.shields.io/travis/flow/caustic/develop.svg?style=flat)](https://travis-ci.org/flow/caustic) [![Coverage Status](http://img.shields.io/coveralls/flow/caustic/develop.svg?style=flat)](https://coveralls.io/r/flow/caustic)


OpenGL rendering API and library, with support for LWJGL.

## Getting Started
* [Examples and code snippets](https://github.com/flow/examples/tree/master/caustic)
Expand All @@ -15,6 +15,13 @@ The latest and greatest source can be found here on [GitHub](https://github.com/

Or download the latest [development archive](https://github.com/flow/caustic/archive/develop.zip) or the latest [stable archive](https://github.com/flow/caustic/archive/master.zip).

## Dependencies
We love open-source libraries! This project uses are few of them to make things easier. If you aren't using Maven or Gradle, you'll need these!
* [com.flowpowered:flow-math](https://oss.sonatype.org/#nexus-search;gav~com.flowpowered~flow-math~~~)
* [net.sf.trove4j:trove4j](https://oss.sonatype.org/#nexus-search;gav~net.sf.trove4j~trove4j~~~)
* [org.lwjgl.lwjgl:lwjgl](https://oss.sonatype.org/#nexus-search;gav~org.lwjgl.lwjgl~lwjgl~~~)
* [org.lwjgl.lwjgl:lwjgl_util](https://oss.sonatype.org/#nexus-search;gav~org.lwjgl.lwjgl~lwjgl_util~~~)

## Test Dependencies
The following dependencies are only needed if you compiling the tests included with this project. Gotta test 'em all!
* [junit:junit](https://oss.sonatype.org/#nexus-search;gav~junit~junit~~~)
Expand Down Expand Up @@ -43,7 +50,7 @@ If you're using [Maven](https://maven.apache.org/download.html) to manage projec
<dependency>
<groupId>com.flowpowered</groupId>
<artifactId>caustic</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>

If you're using [Gradle](https://www.gradle.org/) to manage project dependencies, simply include the following in your `build.gradle` file:
Expand All @@ -52,7 +59,7 @@ If you're using [Gradle](https://www.gradle.org/) to manage project dependencies
mavenCentral()
}
dependencies {
compile 'com.flowpowered:caustic:1.0.0-SNAPSHOT'
compile 'com.flowpowered:caustic:1.0.0'
}

If you plan on using snapshots and do not already have the snapshot repo in your repository list, you will need to add this as well:
Expand Down
38 changes: 0 additions & 38 deletions android/pom.xml

This file was deleted.

This file was deleted.

11 changes: 11 additions & 0 deletions api/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Project information
ext.projectName = 'Caustic API'
archivesBaseName = 'caustic-api'
ext.packaging = 'jar'
ext.description = 'API for the Caustic OpenGL rendering library.'

// Project dependencies
dependencies {
compile 'net.sf.trove4j:trove4j:3.0.3'
compile 'com.flowpowered:flow-math:1.0.0'
}
5 changes: 2 additions & 3 deletions api/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- Project information -->
Expand All @@ -12,7 +11,7 @@
<parent>
<groupId>com.flowpowered</groupId>
<artifactId>caustic</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>

<!-- Build properties -->
Expand Down
6 changes: 6 additions & 0 deletions api/src/main/java/com/flowpowered/caustic/api/gl/Context.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ public void destroy() {
*/
public abstract void setWindowTitle(String title);

/**
* Sets if the window can be re-sized.
* @param resizable Whether or not the window can be re-sized
*/
public abstract void setResizable(boolean resizable);

/**
* Sets the window size.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.flowpowered.math.GenericMath;
import com.flowpowered.math.vector.Vector2f;
import com.flowpowered.math.vector.Vector4f;

import gnu.trove.impl.Constants;
import gnu.trove.list.TFloatList;
import gnu.trove.list.TIntList;
Expand All @@ -49,6 +45,10 @@
import gnu.trove.map.hash.TCharIntHashMap;
import gnu.trove.map.hash.TIntObjectHashMap;

import com.flowpowered.math.GenericMath;
import com.flowpowered.math.vector.Vector2f;
import com.flowpowered.math.vector.Vector4f;

import com.flowpowered.caustic.api.Material;
import com.flowpowered.caustic.api.data.VertexAttribute;
import com.flowpowered.caustic.api.data.VertexAttribute.DataType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
*/
package com.flowpowered.caustic.api.util;

import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
Expand All @@ -31,14 +37,6 @@
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

import com.flowpowered.math.vector.Vector3i;

import gnu.trove.list.TFloatList;
import gnu.trove.list.TIntList;
Expand All @@ -52,6 +50,8 @@
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;

import com.flowpowered.math.vector.Vector3i;

/**
* A static loading class for the COLLADA file format (.dae). This class has the capability to load mesh data such as positions, texture coordinates, and normals. All models should be triangulated.
* Apart from geometry, the COLLADA file format also allows for joint descriptions as well as animation descriptions. COLLADA also allows for physical properties to be assigned to a model which can be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
import java.util.List;
import java.util.Set;

import gnu.trove.list.TFloatList;
import gnu.trove.list.TIntList;
import gnu.trove.list.array.TFloatArrayList;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TObjectIntHashMap;

import com.flowpowered.math.GenericMath;
import com.flowpowered.math.TrigMath;
import com.flowpowered.math.matrix.Matrix3f;
Expand All @@ -37,12 +43,6 @@
import com.flowpowered.math.vector.Vector3f;
import com.flowpowered.math.vector.Vector4i;

import gnu.trove.list.TFloatList;
import gnu.trove.list.TIntList;
import gnu.trove.list.array.TFloatArrayList;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TObjectIntHashMap;

import com.flowpowered.caustic.api.data.VertexAttribute;
import com.flowpowered.caustic.api.data.VertexAttribute.DataType;
import com.flowpowered.caustic.api.data.VertexData;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
import java.io.InputStream;
import java.util.Scanner;

import com.flowpowered.math.vector.Vector3i;

import gnu.trove.list.TFloatList;
import gnu.trove.list.TIntList;
import gnu.trove.list.array.TFloatArrayList;
import gnu.trove.list.array.TIntArrayList;

import com.flowpowered.math.vector.Vector3i;

/**
* A static loading class for standard .obj model files. This class will load positions, normals can texture coordinates. Missing normals are not calculated. Normals are expected to be of unit length.
* Models should be triangulated.
Expand Down
Loading

0 comments on commit e1252a4

Please sign in to comment.