Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on Aug 23, 2016

• Added newlines, otherwise the shader compiler can't parse the shaders!

  samizzo

  committed
  a954c67

  Copy full SHA for a954c67

• Put default shaders init/deinit in a class.

  Show description for 39aa9d5
  samizzo

  committed
  39aa9d5

  Copy full SHA for 39aa9d5

• Moved default shaders into SFML.

  samizzo

  committed
  2d91b99

  Copy full SHA for 2d91b99

Commits on Aug 17, 2016

• Added override for setUniformArray with vec3 and location int.

  samizzo

  committed
  6279c3a

  Copy full SHA for 6279c3a

Commits on Aug 4, 2016

• Disabled all this auto release pool guff - seems to be causing a crash on exit and doesn't seem necessary since NSApplicationMain gives us an autorelease pool.

  samizzo

  committed
  1659688

  Copy full SHA for 1659688

• Don't try to create menu bar or launch if a menu bar already exists (it means the app already launched).

  samizzo

  committed
  7655204

  Copy full SHA for 7655204

Commits on Aug 2, 2016

• Optionally only do the apply stuff and don't set any other state.

  samizzo

  committed
  38eb863

  Copy full SHA for 38eb863

• Only set the colour uniform if the colour or shader have changed.

  samizzo

  committed
  a1acacd

  Copy full SHA for a1acacd

Commits on Jul 28, 2016

• Don't switch shaders unless the shader has changed.

  samizzo

  committed
  fb572f0

  Copy full SHA for fb572f0

Commits on Jul 6, 2016

• Fixed assert for mac.

  samizzo

  committed
  619bb2b

  Copy full SHA for 619bb2b

Commits on Jul 5, 2016

• Use the proper debug define so it works on all platforms.

  samizzo

  committed
  e09a78f

  Copy full SHA for e09a78f

• Fixed gcc compile error.

  samizzo

  committed
  4978c7f

  Copy full SHA for 4978c7f

• Added a reserve method to VertexArray.

  samizzo

  committed
  cf2e360

  Copy full SHA for cf2e360

Commits on Jun 29, 2016

• Cache the last used vbo state so we don't always bind.

  samizzo

  committed
  1d3a8fa

  Copy full SHA for 1d3a8fa

• Don't call glDrawArrays if we already drew with a VBO!

  samizzo

  committed
  4b30554

  Copy full SHA for 4b30554

• Merge branch 'master' of https://github.com/samizzo/SFML

  samizzo

  committed
  2dd7fa3

  Copy full SHA for 2dd7fa3

• Updated gitignore.

  samizzo

  committed
  53ca36a

  Copy full SHA for 53ca36a

• Also delete the VBOs.

  samizzo

  committed
  e6b78d1

  Copy full SHA for e6b78d1

Commits on Jun 28, 2016

• Sprites now use a single VBO (actually there is one per-render target).

  samizzo

  committed
  20a1e3f

  Copy full SHA for 20a1e3f

• Use a single static state cache because otherwise the cache isn't in sync with OpenGL state.

  samizzo

  committed
  7fc60f2

  Copy full SHA for 7fc60f2

• Removed setting of vertex colours for sprites; colour is passed in as a uniform instead.

  Show description for ade13f7
  samizzo

  committed
  ade13f7

  Copy full SHA for ade13f7

Commits on Jun 23, 2016

• Don't warn when caching m_colorLocation.

  Show description for 30e1d36
  samizzo

  committed
  30e1d36

  Copy full SHA for 30e1d36

• Added a comment to clarify this function.

  samizzo

  committed
  93b3935

  Copy full SHA for 93b3935

• Apply shader after setting the uniform. Don't set colour for now (wip).

  Show description for abb7a3f
  samizzo

  committed
  abb7a3f

  Copy full SHA for abb7a3f

• Only use the colour if something requests it, otherwise set it to white.

  samizzo

  committed
  3742396

  Copy full SHA for 3742396

Commits on Jun 22, 2016

• Use a default shader when no shader is set.

  Show description for a47de6c
  samizzo

  committed
  a47de6c

  Copy full SHA for a47de6c

• WIP set colour via uniform instead of modifying vertices.

  samizzo

  committed
  027609f

  Copy full SHA for 027609f

• Also set the verts to a unit square and apply a transform instead.

  samizzo

  committed
  97e83f1

  Copy full SHA for 97e83f1

• Sprites now create a texture matrix transform and use square unit UVs instead of updating each vertex (preparation for switching to VBOs).

  samizzo

  committed
  12e61dc

  Copy full SHA for 12e61dc

Commits on Jun 21, 2016

• Custom static assert for Linux, because the gcc we use doesn't support it without enabling some flags and I don't want to mess around with cmake.

  samizzo

  committed
  dce1ab4

  Copy full SHA for dce1ab4

Commits on Jun 16, 2016

• Ensure the shader is bound if always binding is enabled for the new setUniform overrides.

  samizzo

  committed
  2619e95

  Copy full SHA for 2619e95

• Added float override of setUniform.

  samizzo

  committed
  cf10b53

  Copy full SHA for cf10b53

• Don't assert since the other variants of these functions don't.

  samizzo

  committed
  894bf8d

  Copy full SHA for 894bf8d

• Added override for current texture type.

  samizzo

  committed
  f5f4c63

  Copy full SHA for f5f4c63

• Added setUniform for vec2 and texture that takes a uniform location.

  samizzo

  committed
  f708bf3

  Copy full SHA for f708bf3