テキスト比較

2 つのテキストファイルの違いを見つける

リアルタイムdiff

統一diff

行を折りたたむ

変更をハイライト

シンタックスハイライト

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 6 years agoDiff never expires

行
合計
削除

単語
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

88 行

行
合計
追加

単語
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

#version 450

#define WIDTH 800

#define HEIGHT 600

#define WORKGROUP_SIZE 32

layout (local_size_x = WORKGROUP_SIZE, local_size_y = WORKGROUP_SIZE, local_size_z = 1) in;

layout(binding = 0) readonly buffer buf1 {

int data[WIDTH][HEIGHT];

int data[HEIGHT][WIDTH];

} previousBoard;

layout(binding = 1) buffer buf2 {

int data[WIDTH][HEIGHT];

int data[HEIGHT][WIDTH];

} nextBoard;

void main() {

int x = int(gl_GlobalInvocationID.x);

int y = int(gl_GlobalInvocationID.y);

if(x >= WIDTH || y >= HEIGHT)

return;

uint countNeighboors = 0;

if (y > 0)

{

if (x > 0)

{

// x - 1 ; y - 1

countNeighboors += previousBoard.data[x - 1][y - 1];

countNeighboors += previousBoard.data[y - 1][x - 1];

}

// x ; y - 1

countNeighboors += previousBoard.data[x][y - 1];

countNeighboors += previousBoard.data[y - 1][x];

if(x < 799)

{

// x + 1 ; y - 1

countNeighboors += previousBoard.data[x + 1][y - 1];

countNeighboors += previousBoard.data[y - 1][x + 1];

}

if (x > 0)

{

// x - 1 ; y

countNeighboors += previousBoard.data[x - 1][y];

countNeighboors += previousBoard.data[y][x - 1];

}

if(x < 799)

{

// x + 1 ; y

countNeighboors += previousBoard.data[x + 1][y];

countNeighboors += previousBoard.data[y][x + 1];

}

if (y < 599)

{

if (x > 0)

{

// x - 1 ; y + 1

countNeighboors += previousBoard.data[x - 1][y + 1];

countNeighboors += previousBoard.data[y + 1][x - 1];

}

// x ; y + 1

countNeighboors += previousBoard.data[x][y + 1];

countNeighboors += previousBoard.data[y + 1][x];

if(x < 799)

{

// x + 1 ; y + 1

countNeighboors += previousBoard.data[x + 1][y + 1];

countNeighboors += previousBoard.data[y + 1][x + 1];

}

if(countNeighboors == 3)

{

nextBoard.data[x][y] = 1;

nextBoard.data[y][x] = 1;

}

else if (countNeighboors == 2)

{

nextBoard.data[x][y] = previousBoard.data[x][y];

nextBoard.data[y][x] = previousBoard.data[y][x];

}

else

{

nextBoard.data[x][y] = 0;

nextBoard.data[y][x] = 0;

}

保存された差分

原文

ファイルを開く

#version 450

#define WIDTH 800
#define HEIGHT 600
#define WORKGROUP_SIZE 32

layout (local_size_x = WORKGROUP_SIZE, local_size_y = WORKGROUP_SIZE, local_size_z = 1) in;

layout(binding = 0) readonly buffer buf1 {
   int data[WIDTH][HEIGHT];
} previousBoard;

layout(binding = 1) buffer buf2 {
   int data[WIDTH][HEIGHT];
} nextBoard;

void main() {

int x = int(gl_GlobalInvocationID.x);
  int y = int(gl_GlobalInvocationID.y);

if(x >= WIDTH || y >= HEIGHT)
  	return;
  	
  uint countNeighboors = 0;
  
  if (y > 0)
  {
    if (x > 0)
    {
      // x - 1 ; y - 1
      countNeighboors += previousBoard.data[x - 1][y - 1];
    }
    
    // x ; y - 1
    countNeighboors += previousBoard.data[x][y - 1];
    
    if(x < 799)
    {
      // x + 1 ; y - 1
      countNeighboors += previousBoard.data[x + 1][y - 1];
    }
  }
  
  if (x > 0)
  {
  	// x - 1 ; y
  	countNeighboors += previousBoard.data[x - 1][y];
  }
  
  if(x < 799)
  {
    // x + 1 ; y
    countNeighboors += previousBoard.data[x + 1][y];
  }
  
  if (y < 599)
  {
    if (x > 0)
    {
      // x - 1 ; y + 1
      countNeighboors += previousBoard.data[x - 1][y + 1];
    }
    
    // x ; y + 1
    countNeighboors += previousBoard.data[x][y + 1];
    
    if(x < 799)
    {
      // x + 1 ; y + 1
      countNeighboors += previousBoard.data[x + 1][y + 1];
    }
  }
  
  if(countNeighboors == 3)
  {
  	nextBoard.data[x][y] = 1;
  } 
  else if (countNeighboors == 2)
  {
  	nextBoard.data[x][y] = previousBoard.data[x][y];
  }
  else 
  {
  	nextBoard.data[x][y] = 0;
  }
}

変更されたテキスト

ファイルを開く

#version 450

#define WIDTH 800
#define HEIGHT 600
#define WORKGROUP_SIZE 32

layout (local_size_x = WORKGROUP_SIZE, local_size_y = WORKGROUP_SIZE, local_size_z = 1) in;

layout(binding = 0) readonly buffer buf1 {
   int data[HEIGHT][WIDTH];
} previousBoard;

layout(binding = 1) buffer buf2 {
   int data[HEIGHT][WIDTH];
} nextBoard;

void main() {

int x = int(gl_GlobalInvocationID.x);
  int y = int(gl_GlobalInvocationID.y);

if(x >= WIDTH || y >= HEIGHT)
  	return;
  	
  uint countNeighboors = 0;
  
  if (y > 0)
  {
    if (x > 0)
    {
      // x - 1 ; y - 1
      countNeighboors += previousBoard.data[y - 1][x - 1];
    }
    
    // x ; y - 1
    countNeighboors += previousBoard.data[y - 1][x];
    
    if(x < 799)
    {
      // x + 1 ; y - 1
      countNeighboors += previousBoard.data[y - 1][x + 1];
    }
  }
  
  if (x > 0)
  {
  	// x - 1 ; y
  	countNeighboors += previousBoard.data[y][x - 1];
  }
  
  if(x < 799)
  {
    // x + 1 ; y
    countNeighboors += previousBoard.data[y][x + 1];
  }
  
  if (y < 599)
  {
    if (x > 0)
    {
      // x - 1 ; y + 1
      countNeighboors += previousBoard.data[y + 1][x - 1];
    }
    
    // x ; y + 1
    countNeighboors += previousBoard.data[y + 1][x];
    
    if(x < 799)
    {
      // x + 1 ; y + 1
      countNeighboors += previousBoard.data[y + 1][x + 1];
    }
  }
  
  if(countNeighboors == 3)
  {
  	nextBoard.data[y][x] = 1;
  } 
  else if (countNeighboors == 2)
  {
  	nextBoard.data[y][x] = previousBoard.data[y][x];
  }
  else 
  {
  	nextBoard.data[y][x] = 0;
  }
}